2037 files changed, 134 insertions, 133 deletions

diff --git a/Makefile b/Makefile
index 07636d831df..be220b962be 100644
--- a/Makefile
+++ b/Makefile
@@ -7,16 +7,16 @@
 #
 # **********************************************************************
 
-SUBDIRS			= cpp java js py rb php
-CLEAN_SUBDIRS	= js java py rb php cpp
-DEPEND_SUBDIRS	= cpp py rb php
-INSTALL_SUBDIRS	= cpp java py rb php js
+SUBDIRS			= cpp java js python ruby php
+CLEAN_SUBDIRS	= js java python ruby php cpp
+DEPEND_SUBDIRS	= cpp python ruby php
+INSTALL_SUBDIRS	= cpp java python ruby php js
 
 ifeq ($(shell uname),Darwin)
-SUBDIRS			+= objc
-CLEAN_SUBDIRS	+= objc
-DEPEND_SUBDIRS	+= objc
-INSTALL_SUBDIRS	+= objc
+SUBDIRS			+= objective-c
+CLEAN_SUBDIRS	+= objective-c
+DEPEND_SUBDIRS	+= objective-c
+INSTALL_SUBDIRS	+= objective-c
 endif
 
 all::
@@ -66,13 +66,13 @@ cs::
 	echo "making all in cs";
 	( cd cs && $(MAKE) all ) || exit 1;
 
-py::
-	echo "making all in py";
-	( cd py && $(MAKE) all ) || exit 1;
+python::
+	echo "making all in python";
+	( cd python && $(MAKE) all ) || exit 1;
 
-rb::
-	echo "making all in rb";
-	( cd rb && $(MAKE) all ) || exit 1;
+ruby::
+	echo "making all in ruby";
+	( cd ruby && $(MAKE) all ) || exit 1;
 
 php::
 	echo "making all in php";
diff --git a/Makefile.mak b/Makefile.mak
index a7637b55caa..7bc9017aa4e 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -12,22 +12,22 @@ top_srcdir = cpp
 
 
 !if "$(CPP_COMPILER)" == "VC100"
-SUBDIRS			= cpp py
-CLEAN_SUBDIRS		= py cpp
-DEPEND_SUBDIRS		= cpp py
-INSTALL_SUBDIRS		= cpp py
-TEST_SUBDIRS		= cpp py
+SUBDIRS			= cpp python
+CLEAN_SUBDIRS		= cpp python
+DEPEND_SUBDIRS		= cpp python
+INSTALL_SUBDIRS		= cpp python
+TEST_SUBDIRS		= cpp python
 !else
-SUBDIRS			= cpp java js cs  vsaddin
-CLEAN_SUBDIRS		= vsaddin cs js java cpp
-DEPEND_SUBDIRS		= cpp java js cs
-INSTALL_SUBDIRS		= cpp java js cs
-TEST_SUBDIRS		= cpp java js cs
+SUBDIRS			= cpp java js csharp vsaddin
+CLEAN_SUBDIRS		= cpp java js csharp vsaddin
+DEPEND_SUBDIRS		= cpp java js csharp
+INSTALL_SUBDIRS		= cpp java js csharp
+TEST_SUBDIRS		= cpp java js csharp
 !endif
 
 !if "$(CPP_COMPILER)" == "VC110"
 SUBDIRS			= $(SUBDIRS) php
-CLEAN_SUBDIRS		= php $(SUBDIRS)
+CLEAN_SUBDIRS		= $(SUBDIRS) php
 DEPEND_SUBDIRS		= $(SUBDIRS) php
 INSTALL_SUBDIRS		= $(SUBDIRS) php
 TEST_SUBDIRS		= $(SUBDIRS) php
@@ -66,13 +66,13 @@ java::
 	@echo "making all in java" && \
 	cmd /c "cd java && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1
 
-cs::
-	@echo "making all in cs" && \
-	cmd /c "cd cs && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1
+csharp::
+	@echo "making all in csharp" && \
+	cmd /c "cd csharp && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1
 
-py::
-	@echo "making all in py" && \
-	cmd /c "cd py && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1
+python::
+	@echo "making all in python" && \
+	cmd /c "cd python && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1
 
 php::
 	@echo "making all in php" && \
diff --git a/README.md b/README.md
index c46fc3cb14c..f511aee0537 100644
--- a/README.md
+++ b/README.md
@@ -27,18 +27,19 @@ About this Source Distribution
 This archive contains the source code for Ice language mappings and
 components in the following subdirectories:
 
-Directory | Language
---------- | --------
-android   | Android sample programs and test suite
-cpp       | C++ language mapping
-cs        | C# language mapping
-eclipse   | Eclipse plug-in
-java      | Java language mapping
-js        | JavaScript language mapping
-php       | PHP language mapping
-py        | Python language mapping
-rb        | Ruby language mapping
-vsaddin   | Visual Studio add-in
+Directory    | Language
+---------    | --------
+cpp          | C++ language mapping
+csharp       | C# language mapping
+java         | Java language mapping
+js           | JavaScript language mapping
+php          | PHP language mapping
+python       | Python language mapping
+ruby         | Ruby language mapping
+objective-c  | Objective-c language mapping
+android      | Android sample programs and test suite
+eclipse      | Eclipse plug-in
+vsaddin      | Visual Studio add-in
 
 
 Documentation
diff --git a/allTests.py b/allTests.py
index bde2bbdba85..d2e4e2c6161 100755
--- a/allTests.py
+++ b/allTests.py
@@ -15,9 +15,9 @@ import TestUtil
 
 testGroups = []
 
-languages = [ "cpp", "java", "cs", "py", "rb", "php", "js" ]
+languages = [ "cpp", "java", "csharp", "python", "ruby", "php", "js" ]
 if TestUtil.isDarwin():
-    languages.append("objc")
+    languages.append("objective-c")
 
 for d in languages:
 
diff --git a/config/makeprops.py b/config/makeprops.py
index 5d10cfc76cf..58bf20f1639 100755
--- a/config/makeprops.py
+++ b/config/makeprops.py
@@ -521,7 +521,7 @@ class CSPropertyHandler(PropertyHandler):
         self.srcFile.write("\n")
 
     def moveFiles(self, location):
-        dest = os.path.join(location, "cs", "src", "Ice")
+        dest = os.path.join(location, "csharp", "src", "Ice")
         if os.path.exists(os.path.join(dest, self.className + ".cs")):
             os.remove(os.path.join(dest, self.className + ".cs"))
         shutil.move(self.className + ".cs", dest)
@@ -677,8 +677,8 @@ def main():
             lang = "cpp"
         elif option == "--java":
             lang = "java"
-        elif option == "--cs":
-            lang = "cs"
+        elif option == "--csharp":
+            lang = "csharp"
         elif option == "--js":
             lang = "js"
         elif option in ["-h", "--help", "-?"]:
@@ -702,7 +702,7 @@ def main():
             contentHandler = CppPropertyHandler(infile, className)
         elif lang == "java":
             contentHandler = JavaPropertyHandler(infile, className)
-        elif lang == "cs":
+        elif lang == "csharp":
             contentHandler = CSPropertyHandler(infile, className)
         elif lang == "js":
             contentHandler = JSPropertyHandler(infile, className)
diff --git a/cs/Assemblies/.gitignore b/csharp/Assemblies/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/Assemblies/.gitignore
+++ b/csharp/Assemblies/.gitignore
diff --git a/cs/Assemblies/cf/.gitignore b/csharp/Assemblies/cf/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/Assemblies/cf/.gitignore
+++ b/csharp/Assemblies/cf/.gitignore
diff --git a/cs/Assemblies/sl/.gitignore b/csharp/Assemblies/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/Assemblies/sl/.gitignore
+++ b/csharp/Assemblies/sl/.gitignore
diff --git a/cs/Makefile b/csharp/Makefile
index d20e336353e..d20e336353e 100644
--- a/cs/Makefile
+++ b/csharp/Makefile
diff --git a/cs/Makefile.mak b/csharp/Makefile.mak
index 34f80eee045..34f80eee045 100644
--- a/cs/Makefile.mak
+++ b/csharp/Makefile.mak
diff --git a/cs/allTests.py b/csharp/allTests.py
index 7ca1ac71f49..7ca1ac71f49 100755
--- a/cs/allTests.py
+++ b/csharp/allTests.py
diff --git a/cs/bin/.gitignore b/csharp/bin/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/bin/.gitignore
+++ b/csharp/bin/.gitignore
diff --git a/cs/bin/cf/.gitignore b/csharp/bin/cf/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/bin/cf/.gitignore
+++ b/csharp/bin/cf/.gitignore
diff --git a/cs/bin/sl/.gitignore b/csharp/bin/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/bin/sl/.gitignore
+++ b/csharp/bin/sl/.gitignore
diff --git a/cs/config/.gitignore b/csharp/config/.gitignore
index 34b0092a41c..34b0092a41c 100644
--- a/cs/config/.gitignore
+++ b/csharp/config/.gitignore
diff --git a/cs/config/Make.rules.cs b/csharp/config/Make.rules.cs
index b90ed220591..b90ed220591 100644
--- a/cs/config/Make.rules.cs
+++ b/csharp/config/Make.rules.cs
diff --git a/cs/config/Make.rules.mak.cs b/csharp/config/Make.rules.mak.cs
index fe6be1a7746..fe6be1a7746 100644
--- a/cs/config/Make.rules.mak.cs
+++ b/csharp/config/Make.rules.mak.cs
diff --git a/cs/config/Makefile.mak b/csharp/config/Makefile.mak
index 34fbb1ae1a7..34fbb1ae1a7 100644
--- a/cs/config/Makefile.mak
+++ b/csharp/config/Makefile.mak
diff --git a/cs/config/PolicyResponse.xml b/csharp/config/PolicyResponse.xml
index b140dcbe8d1..b140dcbe8d1 100644
--- a/cs/config/PolicyResponse.xml
+++ b/csharp/config/PolicyResponse.xml
diff --git a/cs/lib/.gitignore b/csharp/lib/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/lib/.gitignore
+++ b/csharp/lib/.gitignore
diff --git a/cs/lib/pkgconfig/Glacier2.pc b/csharp/lib/pkgconfig/Glacier2.pc
index 3b7eabb8137..3b7eabb8137 100644
--- a/cs/lib/pkgconfig/Glacier2.pc
+++ b/csharp/lib/pkgconfig/Glacier2.pc
diff --git a/cs/lib/pkgconfig/Ice.pc b/csharp/lib/pkgconfig/Ice.pc
index df14bb6f575..df14bb6f575 100644
--- a/cs/lib/pkgconfig/Ice.pc
+++ b/csharp/lib/pkgconfig/Ice.pc
diff --git a/cs/lib/pkgconfig/IceBox.pc b/csharp/lib/pkgconfig/IceBox.pc
index 892122e136e..892122e136e 100644
--- a/cs/lib/pkgconfig/IceBox.pc
+++ b/csharp/lib/pkgconfig/IceBox.pc
diff --git a/cs/lib/pkgconfig/IceGrid.pc b/csharp/lib/pkgconfig/IceGrid.pc
index 5e782ab579f..5e782ab579f 100644
--- a/cs/lib/pkgconfig/IceGrid.pc
+++ b/csharp/lib/pkgconfig/IceGrid.pc
diff --git a/cs/lib/pkgconfig/IcePatch2.pc b/csharp/lib/pkgconfig/IcePatch2.pc
index a0189b82a39..a0189b82a39 100644
--- a/cs/lib/pkgconfig/IcePatch2.pc
+++ b/csharp/lib/pkgconfig/IcePatch2.pc
diff --git a/cs/lib/pkgconfig/IceStorm.pc b/csharp/lib/pkgconfig/IceStorm.pc
index 7b4bfd31586..7b4bfd31586 100644
--- a/cs/lib/pkgconfig/IceStorm.pc
+++ b/csharp/lib/pkgconfig/IceStorm.pc
diff --git a/cs/src/Glacier2/.depend.mak b/csharp/src/Glacier2/.depend.mak
index a29c2fa8ecb..a29c2fa8ecb 100644
--- a/cs/src/Glacier2/.depend.mak
+++ b/csharp/src/Glacier2/.depend.mak
diff --git a/cs/src/Glacier2/Application.cs b/csharp/src/Glacier2/Application.cs
index b5d4aa604c2..b5d4aa604c2 100644
--- a/cs/src/Glacier2/Application.cs
+++ b/csharp/src/Glacier2/Application.cs
diff --git a/cs/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs
index 661acc6d7e8..661acc6d7e8 100644
--- a/cs/src/Glacier2/AssemblyInfo.cs
+++ b/csharp/src/Glacier2/AssemblyInfo.cs
diff --git a/cs/src/Glacier2/Makefile b/csharp/src/Glacier2/Makefile
index e54132c9f6f..e54132c9f6f 100644
--- a/cs/src/Glacier2/Makefile
+++ b/csharp/src/Glacier2/Makefile
diff --git a/cs/src/Glacier2/Makefile.mak b/csharp/src/Glacier2/Makefile.mak
index 950fca5125a..950fca5125a 100755
--- a/cs/src/Glacier2/Makefile.mak
+++ b/csharp/src/Glacier2/Makefile.mak
diff --git a/cs/src/Glacier2/SessionCallback.cs b/csharp/src/Glacier2/SessionCallback.cs
index 55dc238be05..55dc238be05 100644
--- a/cs/src/Glacier2/SessionCallback.cs
+++ b/csharp/src/Glacier2/SessionCallback.cs
diff --git a/cs/src/Glacier2/SessionFactoryHelper.cs b/csharp/src/Glacier2/SessionFactoryHelper.cs
index c37aff27581..c37aff27581 100644
--- a/cs/src/Glacier2/SessionFactoryHelper.cs
+++ b/csharp/src/Glacier2/SessionFactoryHelper.cs
diff --git a/cs/src/Glacier2/SessionHelper.cs b/csharp/src/Glacier2/SessionHelper.cs
index f9432d6003f..f9432d6003f 100644
--- a/cs/src/Glacier2/SessionHelper.cs
+++ b/csharp/src/Glacier2/SessionHelper.cs
diff --git a/cs/src/Glacier2/generated/.gitignore b/csharp/src/Glacier2/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/Glacier2/generated/.gitignore
+++ b/csharp/src/Glacier2/generated/.gitignore
diff --git a/cs/src/Ice/.depend.mak b/csharp/src/Ice/.depend.mak
index 48e527e7f4a..48e527e7f4a 100644
--- a/cs/src/Ice/.depend.mak
+++ b/csharp/src/Ice/.depend.mak
diff --git a/cs/src/Ice/ACM.cs b/csharp/src/Ice/ACM.cs
index 33936b81907..33936b81907 100644
--- a/cs/src/Ice/ACM.cs
+++ b/csharp/src/Ice/ACM.cs
diff --git a/cs/src/Ice/AMDCallback.cs b/csharp/src/Ice/AMDCallback.cs
index b4b9889c350..b4b9889c350 100644
--- a/cs/src/Ice/AMDCallback.cs
+++ b/csharp/src/Ice/AMDCallback.cs
diff --git a/cs/src/Ice/Acceptor.cs b/csharp/src/Ice/Acceptor.cs
index 33cef1e1548..33cef1e1548 100644
--- a/cs/src/Ice/Acceptor.cs
+++ b/csharp/src/Ice/Acceptor.cs
diff --git a/cs/src/Ice/Application.cs b/csharp/src/Ice/Application.cs
index 937d5e7f801..937d5e7f801 100644
--- a/cs/src/Ice/Application.cs
+++ b/csharp/src/Ice/Application.cs
diff --git a/cs/src/Ice/Arrays.cs b/csharp/src/Ice/Arrays.cs
index de6485c54d9..de6485c54d9 100644
--- a/cs/src/Ice/Arrays.cs
+++ b/csharp/src/Ice/Arrays.cs
diff --git a/cs/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs
index d3280805a75..d3280805a75 100644
--- a/cs/src/Ice/AssemblyInfo.cs
+++ b/csharp/src/Ice/AssemblyInfo.cs
diff --git a/cs/src/Ice/AssemblyUtil.cs b/csharp/src/Ice/AssemblyUtil.cs
index 0d97f9a9970..0d97f9a9970 100644
--- a/cs/src/Ice/AssemblyUtil.cs
+++ b/csharp/src/Ice/AssemblyUtil.cs
diff --git a/cs/src/Ice/AsyncIOThread.cs b/csharp/src/Ice/AsyncIOThread.cs
index 4b4ae5428f2..4b4ae5428f2 100644
--- a/cs/src/Ice/AsyncIOThread.cs
+++ b/csharp/src/Ice/AsyncIOThread.cs
diff --git a/cs/src/Ice/AsyncResult.cs b/csharp/src/Ice/AsyncResult.cs
index 3e48d72a418..3e48d72a418 100644
--- a/cs/src/Ice/AsyncResult.cs
+++ b/csharp/src/Ice/AsyncResult.cs
diff --git a/cs/src/Ice/Base64.cs b/csharp/src/Ice/Base64.cs
index c60b800425a..c60b800425a 100644
--- a/cs/src/Ice/Base64.cs
+++ b/csharp/src/Ice/Base64.cs
diff --git a/cs/src/Ice/BasicStream.cs b/csharp/src/Ice/BasicStream.cs
index 3160a355bab..3160a355bab 100644
--- a/cs/src/Ice/BasicStream.cs
+++ b/csharp/src/Ice/BasicStream.cs
diff --git a/cs/src/Ice/BatchRequestInterceptor.cs b/csharp/src/Ice/BatchRequestInterceptor.cs
index 7cd79d63991..7cd79d63991 100644
--- a/cs/src/Ice/BatchRequestInterceptor.cs
+++ b/csharp/src/Ice/BatchRequestInterceptor.cs
diff --git a/cs/src/Ice/BatchRequestQueue.cs b/csharp/src/Ice/BatchRequestQueue.cs
index 2973c6fae12..2973c6fae12 100644
--- a/cs/src/Ice/BatchRequestQueue.cs
+++ b/csharp/src/Ice/BatchRequestQueue.cs
diff --git a/cs/src/Ice/Buffer.cs b/csharp/src/Ice/Buffer.cs
index c0d1747a103..c0d1747a103 100644
--- a/cs/src/Ice/Buffer.cs
+++ b/csharp/src/Ice/Buffer.cs
diff --git a/cs/src/Ice/ByteBuffer.cs b/csharp/src/Ice/ByteBuffer.cs
index a736c01679d..a736c01679d 100644
--- a/cs/src/Ice/ByteBuffer.cs
+++ b/csharp/src/Ice/ByteBuffer.cs
diff --git a/cs/src/Ice/CollectionBase.cs b/csharp/src/Ice/CollectionBase.cs
index 3c505f58ee6..3c505f58ee6 100644
--- a/cs/src/Ice/CollectionBase.cs
+++ b/csharp/src/Ice/CollectionBase.cs
diff --git a/cs/src/Ice/Collections.cs b/csharp/src/Ice/Collections.cs
index 65db2114791..65db2114791 100644
--- a/cs/src/Ice/Collections.cs
+++ b/csharp/src/Ice/Collections.cs
diff --git a/cs/src/Ice/CollocatedRequestHandler.cs b/csharp/src/Ice/CollocatedRequestHandler.cs
index 4fcd670003c..4fcd670003c 100644
--- a/cs/src/Ice/CollocatedRequestHandler.cs
+++ b/csharp/src/Ice/CollocatedRequestHandler.cs
diff --git a/cs/src/Ice/CommunicatorI.cs b/csharp/src/Ice/CommunicatorI.cs
index 915709fb641..915709fb641 100644
--- a/cs/src/Ice/CommunicatorI.cs
+++ b/csharp/src/Ice/CommunicatorI.cs
diff --git a/cs/src/Ice/Compare.cs b/csharp/src/Ice/Compare.cs
index 750ad9d940e..750ad9d940e 100644
--- a/cs/src/Ice/Compare.cs
+++ b/csharp/src/Ice/Compare.cs
diff --git a/cs/src/Ice/ConnectRequestHandler.cs b/csharp/src/Ice/ConnectRequestHandler.cs
index 67ff6629605..67ff6629605 100644
--- a/cs/src/Ice/ConnectRequestHandler.cs
+++ b/csharp/src/Ice/ConnectRequestHandler.cs
diff --git a/cs/src/Ice/ConnectionFactory.cs b/csharp/src/Ice/ConnectionFactory.cs
index 215b64322b1..215b64322b1 100644
--- a/cs/src/Ice/ConnectionFactory.cs
+++ b/csharp/src/Ice/ConnectionFactory.cs
diff --git a/cs/src/Ice/ConnectionI.cs b/csharp/src/Ice/ConnectionI.cs
index 581536eade7..581536eade7 100644
--- a/cs/src/Ice/ConnectionI.cs
+++ b/csharp/src/Ice/ConnectionI.cs
diff --git a/cs/src/Ice/ConnectionRequestHandler.cs b/csharp/src/Ice/ConnectionRequestHandler.cs
index 8ddcca74e02..8ddcca74e02 100644
--- a/cs/src/Ice/ConnectionRequestHandler.cs
+++ b/csharp/src/Ice/ConnectionRequestHandler.cs
diff --git a/cs/src/Ice/Connector.cs b/csharp/src/Ice/Connector.cs
index 84046ad4dcd..84046ad4dcd 100644
--- a/cs/src/Ice/Connector.cs
+++ b/csharp/src/Ice/Connector.cs
diff --git a/cs/src/Ice/DefaultsAndOverrides.cs b/csharp/src/Ice/DefaultsAndOverrides.cs
index cfe64b77076..cfe64b77076 100644
--- a/cs/src/Ice/DefaultsAndOverrides.cs
+++ b/csharp/src/Ice/DefaultsAndOverrides.cs
diff --git a/cs/src/Ice/DictionaryBase.cs b/csharp/src/Ice/DictionaryBase.cs
index ed3b8f28d1a..ed3b8f28d1a 100644
--- a/cs/src/Ice/DictionaryBase.cs
+++ b/csharp/src/Ice/DictionaryBase.cs
diff --git a/cs/src/Ice/DispatchInterceptor.cs b/csharp/src/Ice/DispatchInterceptor.cs
index d5a1cc9260f..d5a1cc9260f 100644
--- a/cs/src/Ice/DispatchInterceptor.cs
+++ b/csharp/src/Ice/DispatchInterceptor.cs
diff --git a/cs/src/Ice/EndpointFactory.cs b/csharp/src/Ice/EndpointFactory.cs
index d1fd14312fa..d1fd14312fa 100644
--- a/cs/src/Ice/EndpointFactory.cs
+++ b/csharp/src/Ice/EndpointFactory.cs
diff --git a/cs/src/Ice/EndpointFactoryManager.cs b/csharp/src/Ice/EndpointFactoryManager.cs
index 1f52ffeb605..1f52ffeb605 100644
--- a/cs/src/Ice/EndpointFactoryManager.cs
+++ b/csharp/src/Ice/EndpointFactoryManager.cs
diff --git a/cs/src/Ice/EndpointHostResolver.cs b/csharp/src/Ice/EndpointHostResolver.cs
index d34edbed66a..d34edbed66a 100644
--- a/cs/src/Ice/EndpointHostResolver.cs
+++ b/csharp/src/Ice/EndpointHostResolver.cs
diff --git a/cs/src/Ice/EndpointI.cs b/csharp/src/Ice/EndpointI.cs
index 4f02c43daa4..4f02c43daa4 100644
--- a/cs/src/Ice/EndpointI.cs
+++ b/csharp/src/Ice/EndpointI.cs
diff --git a/cs/src/Ice/EventHandler.cs b/csharp/src/Ice/EventHandler.cs
index 8cb8371df40..8cb8371df40 100644
--- a/cs/src/Ice/EventHandler.cs
+++ b/csharp/src/Ice/EventHandler.cs
diff --git a/cs/src/Ice/Exception.cs b/csharp/src/Ice/Exception.cs
index 34612f73722..34612f73722 100644
--- a/cs/src/Ice/Exception.cs
+++ b/csharp/src/Ice/Exception.cs
diff --git a/cs/src/Ice/FormatType.cs b/csharp/src/Ice/FormatType.cs
index f4cb664b793..f4cb664b793 100644
--- a/cs/src/Ice/FormatType.cs
+++ b/csharp/src/Ice/FormatType.cs
diff --git a/cs/src/Ice/HashSet.cs b/csharp/src/Ice/HashSet.cs
index 813633d69b7..813633d69b7 100644
--- a/cs/src/Ice/HashSet.cs
+++ b/csharp/src/Ice/HashSet.cs
diff --git a/cs/src/Ice/HttpParser.cs b/csharp/src/Ice/HttpParser.cs
index 32399400e34..32399400e34 100644
--- a/cs/src/Ice/HttpParser.cs
+++ b/csharp/src/Ice/HttpParser.cs
diff --git a/cs/src/Ice/IPEndpointI.cs b/csharp/src/Ice/IPEndpointI.cs
index 7741670b615..7741670b615 100644
--- a/cs/src/Ice/IPEndpointI.cs
+++ b/csharp/src/Ice/IPEndpointI.cs
diff --git a/cs/src/Ice/Ice.dll.config b/csharp/src/Ice/Ice.dll.config
index 7cf597f8b6f..7cf597f8b6f 100644
--- a/cs/src/Ice/Ice.dll.config
+++ b/csharp/src/Ice/Ice.dll.config
diff --git a/cs/src/Ice/ImplicitContextI.cs b/csharp/src/Ice/ImplicitContextI.cs
index ba830f89115..ba830f89115 100644
--- a/cs/src/Ice/ImplicitContextI.cs
+++ b/csharp/src/Ice/ImplicitContextI.cs
diff --git a/cs/src/Ice/Incoming.cs b/csharp/src/Ice/Incoming.cs
index 1033b0a9083..1033b0a9083 100644
--- a/cs/src/Ice/Incoming.cs
+++ b/csharp/src/Ice/Incoming.cs
diff --git a/cs/src/Ice/IncomingAsync.cs b/csharp/src/Ice/IncomingAsync.cs
index 5f9205c027e..5f9205c027e 100644
--- a/cs/src/Ice/IncomingAsync.cs
+++ b/csharp/src/Ice/IncomingAsync.cs
diff --git a/cs/src/Ice/Instance.cs b/csharp/src/Ice/Instance.cs
index 8dd99f3860f..8dd99f3860f 100644
--- a/cs/src/Ice/Instance.cs
+++ b/csharp/src/Ice/Instance.cs
diff --git a/cs/src/Ice/InstrumentationI.cs b/csharp/src/Ice/InstrumentationI.cs
index f49e832cd50..f49e832cd50 100644
--- a/cs/src/Ice/InstrumentationI.cs
+++ b/csharp/src/Ice/InstrumentationI.cs
diff --git a/cs/src/Ice/LocatorInfo.cs b/csharp/src/Ice/LocatorInfo.cs
index 1b3960df6d1..1b3960df6d1 100644
--- a/cs/src/Ice/LocatorInfo.cs
+++ b/csharp/src/Ice/LocatorInfo.cs
diff --git a/cs/src/Ice/LoggerAdminI.cs b/csharp/src/Ice/LoggerAdminI.cs
index e32b098c634..e32b098c634 100644
--- a/cs/src/Ice/LoggerAdminI.cs
+++ b/csharp/src/Ice/LoggerAdminI.cs
diff --git a/cs/src/Ice/LoggerAdminLoggerI.cs b/csharp/src/Ice/LoggerAdminLoggerI.cs
index 67647f33dc1..67647f33dc1 100644
--- a/cs/src/Ice/LoggerAdminLoggerI.cs
+++ b/csharp/src/Ice/LoggerAdminLoggerI.cs
diff --git a/cs/src/Ice/LoggerI.cs b/csharp/src/Ice/LoggerI.cs
index f0e59e0eadb..f0e59e0eadb 100644
--- a/cs/src/Ice/LoggerI.cs
+++ b/csharp/src/Ice/LoggerI.cs
diff --git a/cs/src/Ice/LoggerPlugin.cs b/csharp/src/Ice/LoggerPlugin.cs
index 942675580ea..942675580ea 100644
--- a/cs/src/Ice/LoggerPlugin.cs
+++ b/csharp/src/Ice/LoggerPlugin.cs
diff --git a/cs/src/Ice/Makefile b/csharp/src/Ice/Makefile
index ee868c8c3d6..ee868c8c3d6 100644
--- a/cs/src/Ice/Makefile
+++ b/csharp/src/Ice/Makefile
diff --git a/cs/src/Ice/Makefile.mak b/csharp/src/Ice/Makefile.mak
index f6c85328dc5..f6c85328dc5 100644
--- a/cs/src/Ice/Makefile.mak
+++ b/csharp/src/Ice/Makefile.mak
diff --git a/cs/src/Ice/MetricsAdminI.cs b/csharp/src/Ice/MetricsAdminI.cs
index d6f58e9de20..d6f58e9de20 100644
--- a/cs/src/Ice/MetricsAdminI.cs
+++ b/csharp/src/Ice/MetricsAdminI.cs
diff --git a/cs/src/Ice/MetricsObserverI.cs b/csharp/src/Ice/MetricsObserverI.cs
index 3681c185125..3681c185125 100644
--- a/cs/src/Ice/MetricsObserverI.cs
+++ b/csharp/src/Ice/MetricsObserverI.cs
diff --git a/cs/src/Ice/Network.cs b/csharp/src/Ice/Network.cs
index 413679340a4..413679340a4 100644
--- a/cs/src/Ice/Network.cs
+++ b/csharp/src/Ice/Network.cs
diff --git a/cs/src/Ice/NetworkProxy.cs b/csharp/src/Ice/NetworkProxy.cs
index 6e4a3ed9ffa..6e4a3ed9ffa 100644
--- a/cs/src/Ice/NetworkProxy.cs
+++ b/csharp/src/Ice/NetworkProxy.cs
diff --git a/cs/src/Ice/Object.cs b/csharp/src/Ice/Object.cs
index c2089e81f14..c2089e81f14 100644
--- a/cs/src/Ice/Object.cs
+++ b/csharp/src/Ice/Object.cs
diff --git a/cs/src/Ice/ObjectAdapterFactory.cs b/csharp/src/Ice/ObjectAdapterFactory.cs
index f9cfe278209..f9cfe278209 100644
--- a/cs/src/Ice/ObjectAdapterFactory.cs
+++ b/csharp/src/Ice/ObjectAdapterFactory.cs
diff --git a/cs/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs
index c6794a1a4db..c6794a1a4db 100644
--- a/cs/src/Ice/ObjectAdapterI.cs
+++ b/csharp/src/Ice/ObjectAdapterI.cs
diff --git a/cs/src/Ice/ObjectFactoryManager.cs b/csharp/src/Ice/ObjectFactoryManager.cs
index e211713ed55..e211713ed55 100644
--- a/cs/src/Ice/ObjectFactoryManager.cs
+++ b/csharp/src/Ice/ObjectFactoryManager.cs
diff --git a/cs/src/Ice/ObserverHelper.cs b/csharp/src/Ice/ObserverHelper.cs
index 82067242da7..82067242da7 100644
--- a/cs/src/Ice/ObserverHelper.cs
+++ b/csharp/src/Ice/ObserverHelper.cs
diff --git a/cs/src/Ice/OpaqueEndpointI.cs b/csharp/src/Ice/OpaqueEndpointI.cs
index 2bf92073e34..2bf92073e34 100644
--- a/cs/src/Ice/OpaqueEndpointI.cs
+++ b/csharp/src/Ice/OpaqueEndpointI.cs
diff --git a/cs/src/Ice/Optional.cs b/csharp/src/Ice/Optional.cs
index 8527f87ccf9..8527f87ccf9 100644
--- a/cs/src/Ice/Optional.cs
+++ b/csharp/src/Ice/Optional.cs
diff --git a/cs/src/Ice/Options.cs b/csharp/src/Ice/Options.cs
index 8303758c928..8303758c928 100644
--- a/cs/src/Ice/Options.cs
+++ b/csharp/src/Ice/Options.cs
diff --git a/cs/src/Ice/OutgoingAsync.cs b/csharp/src/Ice/OutgoingAsync.cs
index 8b71e65c81f..8b71e65c81f 100644
--- a/cs/src/Ice/OutgoingAsync.cs
+++ b/csharp/src/Ice/OutgoingAsync.cs
diff --git a/cs/src/Ice/OutputBase.cs b/csharp/src/Ice/OutputBase.cs
index a7b74985cd4..a7b74985cd4 100644
--- a/cs/src/Ice/OutputBase.cs
+++ b/csharp/src/Ice/OutputBase.cs
diff --git a/cs/src/Ice/Patcher.cs b/csharp/src/Ice/Patcher.cs
index ae53b6a4692..ae53b6a4692 100644
--- a/cs/src/Ice/Patcher.cs
+++ b/csharp/src/Ice/Patcher.cs
diff --git a/cs/src/Ice/PluginManagerI.cs b/csharp/src/Ice/PluginManagerI.cs
index 3069c1e1488..3069c1e1488 100644
--- a/cs/src/Ice/PluginManagerI.cs
+++ b/csharp/src/Ice/PluginManagerI.cs
diff --git a/cs/src/Ice/ProcessI.cs b/csharp/src/Ice/ProcessI.cs
index a4e2b9f6300..a4e2b9f6300 100644
--- a/cs/src/Ice/ProcessI.cs
+++ b/csharp/src/Ice/ProcessI.cs
diff --git a/cs/src/Ice/PropertiesAdminI.cs b/csharp/src/Ice/PropertiesAdminI.cs
index 7578cf1938f..7578cf1938f 100644
--- a/cs/src/Ice/PropertiesAdminI.cs
+++ b/csharp/src/Ice/PropertiesAdminI.cs
diff --git a/cs/src/Ice/PropertiesI.cs b/csharp/src/Ice/PropertiesI.cs
index 0ca06bddd9e..0ca06bddd9e 100644
--- a/cs/src/Ice/PropertiesI.cs
+++ b/csharp/src/Ice/PropertiesI.cs
diff --git a/cs/src/Ice/Property.cs b/csharp/src/Ice/Property.cs
index 0363bd2e446..0363bd2e446 100644
--- a/cs/src/Ice/Property.cs
+++ b/csharp/src/Ice/Property.cs
diff --git a/cs/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index 279d5cb0ff2..279d5cb0ff2 100644
--- a/cs/src/Ice/PropertyNames.cs
+++ b/csharp/src/Ice/PropertyNames.cs
diff --git a/cs/src/Ice/Protocol.cs b/csharp/src/Ice/Protocol.cs
index f4d8823369a..f4d8823369a 100644
--- a/cs/src/Ice/Protocol.cs
+++ b/csharp/src/Ice/Protocol.cs
diff --git a/cs/src/Ice/ProtocolInstance.cs b/csharp/src/Ice/ProtocolInstance.cs
index 68c8d33e13f..68c8d33e13f 100644
--- a/cs/src/Ice/ProtocolInstance.cs
+++ b/csharp/src/Ice/ProtocolInstance.cs
diff --git a/cs/src/Ice/ProtocolPluginFacade.cs b/csharp/src/Ice/ProtocolPluginFacade.cs
index 3d924e4c186..3d924e4c186 100644
--- a/cs/src/Ice/ProtocolPluginFacade.cs
+++ b/csharp/src/Ice/ProtocolPluginFacade.cs
diff --git a/cs/src/Ice/Proxy.cs b/csharp/src/Ice/Proxy.cs
index 22ea3f51874..22ea3f51874 100644
--- a/cs/src/Ice/Proxy.cs
+++ b/csharp/src/Ice/Proxy.cs
diff --git a/cs/src/Ice/ProxyFactory.cs b/csharp/src/Ice/ProxyFactory.cs
index b9d964ad03f..b9d964ad03f 100644
--- a/cs/src/Ice/ProxyFactory.cs
+++ b/csharp/src/Ice/ProxyFactory.cs
diff --git a/cs/src/Ice/ProxyIdentityKey.cs b/csharp/src/Ice/ProxyIdentityKey.cs
index 3fbf481b439..3fbf481b439 100644
--- a/cs/src/Ice/ProxyIdentityKey.cs
+++ b/csharp/src/Ice/ProxyIdentityKey.cs
diff --git a/cs/src/Ice/Reference.cs b/csharp/src/Ice/Reference.cs
index 80e48608a5d..80e48608a5d 100644
--- a/cs/src/Ice/Reference.cs
+++ b/csharp/src/Ice/Reference.cs
diff --git a/cs/src/Ice/ReferenceFactory.cs b/csharp/src/Ice/ReferenceFactory.cs
index 3d8e23287a4..3d8e23287a4 100644
--- a/cs/src/Ice/ReferenceFactory.cs
+++ b/csharp/src/Ice/ReferenceFactory.cs
diff --git a/cs/src/Ice/ReplyStatus.cs b/csharp/src/Ice/ReplyStatus.cs
index 5ad5c6cb7fe..5ad5c6cb7fe 100644
--- a/cs/src/Ice/ReplyStatus.cs
+++ b/csharp/src/Ice/ReplyStatus.cs
diff --git a/cs/src/Ice/RequestHandler.cs b/csharp/src/Ice/RequestHandler.cs
index 4593fd35fe3..4593fd35fe3 100644
--- a/cs/src/Ice/RequestHandler.cs
+++ b/csharp/src/Ice/RequestHandler.cs
diff --git a/cs/src/Ice/RequestHandlerFactory.cs b/csharp/src/Ice/RequestHandlerFactory.cs
index cc611ccba47..cc611ccba47 100644
--- a/cs/src/Ice/RequestHandlerFactory.cs
+++ b/csharp/src/Ice/RequestHandlerFactory.cs
diff --git a/cs/src/Ice/ResponseHandler.cs b/csharp/src/Ice/ResponseHandler.cs
index e39fbfe5d64..e39fbfe5d64 100644
--- a/cs/src/Ice/ResponseHandler.cs
+++ b/csharp/src/Ice/ResponseHandler.cs
diff --git a/cs/src/Ice/RetryQueue.cs b/csharp/src/Ice/RetryQueue.cs
index 427bceb5f9e..427bceb5f9e 100644
--- a/cs/src/Ice/RetryQueue.cs
+++ b/csharp/src/Ice/RetryQueue.cs
diff --git a/cs/src/Ice/RouterInfo.cs b/csharp/src/Ice/RouterInfo.cs
index bac2c3e2e9b..bac2c3e2e9b 100644
--- a/cs/src/Ice/RouterInfo.cs
+++ b/csharp/src/Ice/RouterInfo.cs
diff --git a/cs/src/Ice/ServantManager.cs b/csharp/src/Ice/ServantManager.cs
index c96d23f9c88..c96d23f9c88 100644
--- a/cs/src/Ice/ServantManager.cs
+++ b/csharp/src/Ice/ServantManager.cs
diff --git a/cs/src/Ice/SliceChecksums.cs b/csharp/src/Ice/SliceChecksums.cs
index 9c600402643..9c600402643 100644
--- a/cs/src/Ice/SliceChecksums.cs
+++ b/csharp/src/Ice/SliceChecksums.cs
diff --git a/cs/src/Ice/SlicedData.cs b/csharp/src/Ice/SlicedData.cs
index 13ba4de17e2..13ba4de17e2 100644
--- a/cs/src/Ice/SlicedData.cs
+++ b/csharp/src/Ice/SlicedData.cs
diff --git a/cs/src/Ice/SocketOperation.cs b/csharp/src/Ice/SocketOperation.cs
index 51c71a6b351..51c71a6b351 100644
--- a/cs/src/Ice/SocketOperation.cs
+++ b/csharp/src/Ice/SocketOperation.cs
diff --git a/cs/src/Ice/Stream.cs b/csharp/src/Ice/Stream.cs
index 0802c0edcfe..0802c0edcfe 100644
--- a/cs/src/Ice/Stream.cs
+++ b/csharp/src/Ice/Stream.cs
diff --git a/cs/src/Ice/StreamI.cs b/csharp/src/Ice/StreamI.cs
index a9f528c8c8b..a9f528c8c8b 100644
--- a/cs/src/Ice/StreamI.cs
+++ b/csharp/src/Ice/StreamI.cs
diff --git a/cs/src/Ice/StreamSocket.cs b/csharp/src/Ice/StreamSocket.cs
index 10c1f6488dc..10c1f6488dc 100644
--- a/cs/src/Ice/StreamSocket.cs
+++ b/csharp/src/Ice/StreamSocket.cs
diff --git a/cs/src/Ice/StreamWrapper.cs b/csharp/src/Ice/StreamWrapper.cs
index 7ff9c8f3c97..7ff9c8f3c97 100644
--- a/cs/src/Ice/StreamWrapper.cs
+++ b/csharp/src/Ice/StreamWrapper.cs
diff --git a/cs/src/Ice/StringUtil.cs b/csharp/src/Ice/StringUtil.cs
index 32ce2d4b55e..32ce2d4b55e 100644
--- a/cs/src/Ice/StringUtil.cs
+++ b/csharp/src/Ice/StringUtil.cs
diff --git a/cs/src/Ice/SysLoggerI.cs b/csharp/src/Ice/SysLoggerI.cs
index b8cfa08df57..b8cfa08df57 100644
--- a/cs/src/Ice/SysLoggerI.cs
+++ b/csharp/src/Ice/SysLoggerI.cs
diff --git a/cs/src/Ice/TcpAcceptor.cs b/csharp/src/Ice/TcpAcceptor.cs
index d896d4367df..d896d4367df 100644
--- a/cs/src/Ice/TcpAcceptor.cs
+++ b/csharp/src/Ice/TcpAcceptor.cs
diff --git a/cs/src/Ice/TcpConnector.cs b/csharp/src/Ice/TcpConnector.cs
index c061171a9de..c061171a9de 100644
--- a/cs/src/Ice/TcpConnector.cs
+++ b/csharp/src/Ice/TcpConnector.cs
diff --git a/cs/src/Ice/TcpEndpointI.cs b/csharp/src/Ice/TcpEndpointI.cs
index fcfa84ab0c3..fcfa84ab0c3 100644
--- a/cs/src/Ice/TcpEndpointI.cs
+++ b/csharp/src/Ice/TcpEndpointI.cs
diff --git a/cs/src/Ice/TcpTransceiver.cs b/csharp/src/Ice/TcpTransceiver.cs
index 11f7fd49578..11f7fd49578 100644
--- a/cs/src/Ice/TcpTransceiver.cs
+++ b/csharp/src/Ice/TcpTransceiver.cs
diff --git a/cs/src/Ice/ThreadHookPlugin.cs b/csharp/src/Ice/ThreadHookPlugin.cs
index 35ca94759b5..35ca94759b5 100644
--- a/cs/src/Ice/ThreadHookPlugin.cs
+++ b/csharp/src/Ice/ThreadHookPlugin.cs
diff --git a/cs/src/Ice/ThreadPool.cs b/csharp/src/Ice/ThreadPool.cs
index 1690d8ccb5c..1690d8ccb5c 100644
--- a/cs/src/Ice/ThreadPool.cs
+++ b/csharp/src/Ice/ThreadPool.cs
diff --git a/cs/src/Ice/TieBase.cs b/csharp/src/Ice/TieBase.cs
index a88b301a913..a88b301a913 100644
--- a/cs/src/Ice/TieBase.cs
+++ b/csharp/src/Ice/TieBase.cs
diff --git a/cs/src/Ice/Time.cs b/csharp/src/Ice/Time.cs
index 85f68b438f3..85f68b438f3 100644
--- a/cs/src/Ice/Time.cs
+++ b/csharp/src/Ice/Time.cs
diff --git a/cs/src/Ice/Timer.cs b/csharp/src/Ice/Timer.cs
index 9c13bb67b7f..9c13bb67b7f 100644
--- a/cs/src/Ice/Timer.cs
+++ b/csharp/src/Ice/Timer.cs
diff --git a/cs/src/Ice/TraceLevels.cs b/csharp/src/Ice/TraceLevels.cs
index dd6b606dc3b..dd6b606dc3b 100644
--- a/cs/src/Ice/TraceLevels.cs
+++ b/csharp/src/Ice/TraceLevels.cs
diff --git a/cs/src/Ice/TraceUtil.cs b/csharp/src/Ice/TraceUtil.cs
index 70ba169698e..70ba169698e 100644
--- a/cs/src/Ice/TraceUtil.cs
+++ b/csharp/src/Ice/TraceUtil.cs
diff --git a/cs/src/Ice/Transceiver.cs b/csharp/src/Ice/Transceiver.cs
index 4208c96dfc1..4208c96dfc1 100644
--- a/cs/src/Ice/Transceiver.cs
+++ b/csharp/src/Ice/Transceiver.cs
diff --git a/cs/src/Ice/UdpConnector.cs b/csharp/src/Ice/UdpConnector.cs
index 7899a40d396..7899a40d396 100644
--- a/cs/src/Ice/UdpConnector.cs
+++ b/csharp/src/Ice/UdpConnector.cs
diff --git a/cs/src/Ice/UdpEndpointI.cs b/csharp/src/Ice/UdpEndpointI.cs
index 9d28b27c21b..9d28b27c21b 100644
--- a/cs/src/Ice/UdpEndpointI.cs
+++ b/csharp/src/Ice/UdpEndpointI.cs
diff --git a/cs/src/Ice/UdpTransceiver.cs b/csharp/src/Ice/UdpTransceiver.cs
index e9a7531340a..e9a7531340a 100644
--- a/cs/src/Ice/UdpTransceiver.cs
+++ b/csharp/src/Ice/UdpTransceiver.cs
diff --git a/cs/src/Ice/UnknownSlicedObject.cs b/csharp/src/Ice/UnknownSlicedObject.cs
index dcdc098280c..dcdc098280c 100644
--- a/cs/src/Ice/UnknownSlicedObject.cs
+++ b/csharp/src/Ice/UnknownSlicedObject.cs
diff --git a/cs/src/Ice/UserExceptionFactory.cs b/csharp/src/Ice/UserExceptionFactory.cs
index e8426a904a2..e8426a904a2 100644
--- a/cs/src/Ice/UserExceptionFactory.cs
+++ b/csharp/src/Ice/UserExceptionFactory.cs
diff --git a/cs/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index 3f97251a2ee..3f97251a2ee 100644
--- a/cs/src/Ice/Util.cs
+++ b/csharp/src/Ice/Util.cs
diff --git a/cs/src/Ice/ValueWriter.cs b/csharp/src/Ice/ValueWriter.cs
index 5e8ecbaa1eb..5e8ecbaa1eb 100644
--- a/cs/src/Ice/ValueWriter.cs
+++ b/csharp/src/Ice/ValueWriter.cs
diff --git a/cs/src/Ice/WSAcceptor.cs b/csharp/src/Ice/WSAcceptor.cs
index 68d2d526a9c..68d2d526a9c 100644
--- a/cs/src/Ice/WSAcceptor.cs
+++ b/csharp/src/Ice/WSAcceptor.cs
diff --git a/cs/src/Ice/WSConnector.cs b/csharp/src/Ice/WSConnector.cs
index 0661ab6fbf0..0661ab6fbf0 100644
--- a/cs/src/Ice/WSConnector.cs
+++ b/csharp/src/Ice/WSConnector.cs
diff --git a/cs/src/Ice/WSEndpoint.cs b/csharp/src/Ice/WSEndpoint.cs
index 27f7816d5e9..27f7816d5e9 100644
--- a/cs/src/Ice/WSEndpoint.cs
+++ b/csharp/src/Ice/WSEndpoint.cs
diff --git a/cs/src/Ice/WSTransceiver.cs b/csharp/src/Ice/WSTransceiver.cs
index 7218027bdc2..7218027bdc2 100644
--- a/cs/src/Ice/WSTransceiver.cs
+++ b/csharp/src/Ice/WSTransceiver.cs
diff --git a/cs/src/Ice/generated/.gitignore b/csharp/src/Ice/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/Ice/generated/.gitignore
+++ b/csharp/src/Ice/generated/.gitignore
diff --git a/cs/src/IceBox/.depend.mak b/csharp/src/IceBox/.depend.mak
index bf680c6be59..bf680c6be59 100644
--- a/cs/src/IceBox/.depend.mak
+++ b/csharp/src/IceBox/.depend.mak
diff --git a/cs/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs
index 8c3d6231872..8c3d6231872 100644
--- a/cs/src/IceBox/AssemblyInfo.cs
+++ b/csharp/src/IceBox/AssemblyInfo.cs
diff --git a/cs/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs
index 2cf942e95f3..2cf942e95f3 100644
--- a/cs/src/IceBox/AssemblyInfoExe.cs
+++ b/csharp/src/IceBox/AssemblyInfoExe.cs
diff --git a/cs/src/IceBox/Makefile b/csharp/src/IceBox/Makefile
index 23413be5626..23413be5626 100644
--- a/cs/src/IceBox/Makefile
+++ b/csharp/src/IceBox/Makefile
diff --git a/cs/src/IceBox/Makefile.mak b/csharp/src/IceBox/Makefile.mak
index 6633c7bdbf0..6633c7bdbf0 100644
--- a/cs/src/IceBox/Makefile.mak
+++ b/csharp/src/IceBox/Makefile.mak
diff --git a/cs/src/IceBox/Server.cs b/csharp/src/IceBox/Server.cs
index bdd9d048bf5..bdd9d048bf5 100644
--- a/cs/src/IceBox/Server.cs
+++ b/csharp/src/IceBox/Server.cs
diff --git a/cs/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs
index 658a0284b07..658a0284b07 100644
--- a/cs/src/IceBox/ServiceManagerI.cs
+++ b/csharp/src/IceBox/ServiceManagerI.cs
diff --git a/cs/src/IceBox/generated/.gitignore b/csharp/src/IceBox/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IceBox/generated/.gitignore
+++ b/csharp/src/IceBox/generated/.gitignore
diff --git a/cs/src/IceDiscovery/.depend.mak b/csharp/src/IceDiscovery/.depend.mak
index 0f34b397f12..0f34b397f12 100644
--- a/cs/src/IceDiscovery/.depend.mak
+++ b/csharp/src/IceDiscovery/.depend.mak
diff --git a/cs/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs
index 9fc80df085a..9fc80df085a 100644
--- a/cs/src/IceDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceDiscovery/AssemblyInfo.cs
diff --git a/cs/src/IceDiscovery/LocatorI.cs b/csharp/src/IceDiscovery/LocatorI.cs
index b0adf04ce90..b0adf04ce90 100644
--- a/cs/src/IceDiscovery/LocatorI.cs
+++ b/csharp/src/IceDiscovery/LocatorI.cs
diff --git a/cs/src/IceDiscovery/LookupI.cs b/csharp/src/IceDiscovery/LookupI.cs
index 27a143f3d9d..27a143f3d9d 100644
--- a/cs/src/IceDiscovery/LookupI.cs
+++ b/csharp/src/IceDiscovery/LookupI.cs
diff --git a/cs/src/IceDiscovery/Makefile b/csharp/src/IceDiscovery/Makefile
index 88581745332..88581745332 100644
--- a/cs/src/IceDiscovery/Makefile
+++ b/csharp/src/IceDiscovery/Makefile
diff --git a/cs/src/IceDiscovery/Makefile.mak b/csharp/src/IceDiscovery/Makefile.mak
index 0260afceba1..0260afceba1 100644
--- a/cs/src/IceDiscovery/Makefile.mak
+++ b/csharp/src/IceDiscovery/Makefile.mak
diff --git a/cs/src/IceDiscovery/PluginI.cs b/csharp/src/IceDiscovery/PluginI.cs
index ec846f016fd..ec846f016fd 100644
--- a/cs/src/IceDiscovery/PluginI.cs
+++ b/csharp/src/IceDiscovery/PluginI.cs
diff --git a/cs/src/IceDiscovery/generated/.gitignore b/csharp/src/IceDiscovery/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IceDiscovery/generated/.gitignore
+++ b/csharp/src/IceDiscovery/generated/.gitignore
diff --git a/cs/src/IceGrid/.depend.mak b/csharp/src/IceGrid/.depend.mak
index c88e67a088b..c88e67a088b 100644
--- a/cs/src/IceGrid/.depend.mak
+++ b/csharp/src/IceGrid/.depend.mak
diff --git a/cs/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs
index 55fe78eb54d..55fe78eb54d 100644
--- a/cs/src/IceGrid/AssemblyInfo.cs
+++ b/csharp/src/IceGrid/AssemblyInfo.cs
diff --git a/cs/src/IceGrid/Makefile b/csharp/src/IceGrid/Makefile
index ec40bcd8cb7..ec40bcd8cb7 100644
--- a/cs/src/IceGrid/Makefile
+++ b/csharp/src/IceGrid/Makefile
diff --git a/cs/src/IceGrid/Makefile.mak b/csharp/src/IceGrid/Makefile.mak
index f76a1370602..f76a1370602 100644
--- a/cs/src/IceGrid/Makefile.mak
+++ b/csharp/src/IceGrid/Makefile.mak
diff --git a/cs/src/IceGrid/generated/.gitignore b/csharp/src/IceGrid/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IceGrid/generated/.gitignore
+++ b/csharp/src/IceGrid/generated/.gitignore
diff --git a/cs/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
index 0e758129db3..0e758129db3 100644
--- a/cs/src/IceLocatorDiscovery/AssemblyInfo.cs
+++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs
diff --git a/cs/src/IceLocatorDiscovery/Makefile b/csharp/src/IceLocatorDiscovery/Makefile
index 1499c9cd80e..1499c9cd80e 100644
--- a/cs/src/IceLocatorDiscovery/Makefile
+++ b/csharp/src/IceLocatorDiscovery/Makefile
diff --git a/cs/src/IceLocatorDiscovery/Makefile.mak b/csharp/src/IceLocatorDiscovery/Makefile.mak
index bd0a9f729d2..bd0a9f729d2 100644
--- a/cs/src/IceLocatorDiscovery/Makefile.mak
+++ b/csharp/src/IceLocatorDiscovery/Makefile.mak
diff --git a/cs/src/IceLocatorDiscovery/PluginI.cs b/csharp/src/IceLocatorDiscovery/PluginI.cs
index ed000dc0d6c..ed000dc0d6c 100644
--- a/cs/src/IceLocatorDiscovery/PluginI.cs
+++ b/csharp/src/IceLocatorDiscovery/PluginI.cs
diff --git a/cs/src/IceLocatorDiscovery/generated/.gitignore b/csharp/src/IceLocatorDiscovery/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IceLocatorDiscovery/generated/.gitignore
+++ b/csharp/src/IceLocatorDiscovery/generated/.gitignore
diff --git a/cs/src/IcePatch2/.depend.mak b/csharp/src/IcePatch2/.depend.mak
index c73ea5657cb..c73ea5657cb 100644
--- a/cs/src/IcePatch2/.depend.mak
+++ b/csharp/src/IcePatch2/.depend.mak
diff --git a/cs/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs
index 8556d48518e..8556d48518e 100644
--- a/cs/src/IcePatch2/AssemblyInfo.cs
+++ b/csharp/src/IcePatch2/AssemblyInfo.cs
diff --git a/cs/src/IcePatch2/Makefile b/csharp/src/IcePatch2/Makefile
index 4b64dab84df..4b64dab84df 100644
--- a/cs/src/IcePatch2/Makefile
+++ b/csharp/src/IcePatch2/Makefile
diff --git a/cs/src/IcePatch2/Makefile.mak b/csharp/src/IcePatch2/Makefile.mak
index 2dd8c822309..2dd8c822309 100644
--- a/cs/src/IcePatch2/Makefile.mak
+++ b/csharp/src/IcePatch2/Makefile.mak
diff --git a/cs/src/IcePatch2/generated/.gitignore b/csharp/src/IcePatch2/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IcePatch2/generated/.gitignore
+++ b/csharp/src/IcePatch2/generated/.gitignore
diff --git a/cs/src/IceSSL/.depend.mak b/csharp/src/IceSSL/.depend.mak
index 96f75256468..96f75256468 100644
--- a/cs/src/IceSSL/.depend.mak
+++ b/csharp/src/IceSSL/.depend.mak
diff --git a/cs/src/IceSSL/AcceptorI.cs b/csharp/src/IceSSL/AcceptorI.cs
index 5ddc84ff337..5ddc84ff337 100644
--- a/cs/src/IceSSL/AcceptorI.cs
+++ b/csharp/src/IceSSL/AcceptorI.cs
diff --git a/cs/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs
index f75487dc2b1..f75487dc2b1 100644
--- a/cs/src/IceSSL/AssemblyInfo.cs
+++ b/csharp/src/IceSSL/AssemblyInfo.cs
diff --git a/cs/src/IceSSL/ConnectorI.cs b/csharp/src/IceSSL/ConnectorI.cs
index 7c8a7f4becb..7c8a7f4becb 100644
--- a/cs/src/IceSSL/ConnectorI.cs
+++ b/csharp/src/IceSSL/ConnectorI.cs
diff --git a/cs/src/IceSSL/EndpointI.cs b/csharp/src/IceSSL/EndpointI.cs
index edc04dd09d9..edc04dd09d9 100644
--- a/cs/src/IceSSL/EndpointI.cs
+++ b/csharp/src/IceSSL/EndpointI.cs
diff --git a/cs/src/IceSSL/Instance.cs b/csharp/src/IceSSL/Instance.cs
index 79b18435268..79b18435268 100644
--- a/cs/src/IceSSL/Instance.cs
+++ b/csharp/src/IceSSL/Instance.cs
diff --git a/cs/src/IceSSL/Makefile b/csharp/src/IceSSL/Makefile
index 0dd6b3cdd24..0dd6b3cdd24 100644
--- a/cs/src/IceSSL/Makefile
+++ b/csharp/src/IceSSL/Makefile
diff --git a/cs/src/IceSSL/Makefile.mak b/csharp/src/IceSSL/Makefile.mak
index 776891d49c1..776891d49c1 100644
--- a/cs/src/IceSSL/Makefile.mak
+++ b/csharp/src/IceSSL/Makefile.mak
diff --git a/cs/src/IceSSL/Plugin.cs b/csharp/src/IceSSL/Plugin.cs
index 89575747441..89575747441 100644
--- a/cs/src/IceSSL/Plugin.cs
+++ b/csharp/src/IceSSL/Plugin.cs
diff --git a/cs/src/IceSSL/PluginI.cs b/csharp/src/IceSSL/PluginI.cs
index cbe540123fb..cbe540123fb 100644
--- a/cs/src/IceSSL/PluginI.cs
+++ b/csharp/src/IceSSL/PluginI.cs
diff --git a/cs/src/IceSSL/RFC2253.cs b/csharp/src/IceSSL/RFC2253.cs
index 117ece7c955..117ece7c955 100644
--- a/cs/src/IceSSL/RFC2253.cs
+++ b/csharp/src/IceSSL/RFC2253.cs
diff --git a/cs/src/IceSSL/SSLEngine.cs b/csharp/src/IceSSL/SSLEngine.cs
index deac22369a3..deac22369a3 100644
--- a/cs/src/IceSSL/SSLEngine.cs
+++ b/csharp/src/IceSSL/SSLEngine.cs
diff --git a/cs/src/IceSSL/TransceiverI.cs b/csharp/src/IceSSL/TransceiverI.cs
index 84902367dc9..84902367dc9 100644
--- a/cs/src/IceSSL/TransceiverI.cs
+++ b/csharp/src/IceSSL/TransceiverI.cs
diff --git a/cs/src/IceSSL/TrustManager.cs b/csharp/src/IceSSL/TrustManager.cs
index 98bbd1ff59f..98bbd1ff59f 100644
--- a/cs/src/IceSSL/TrustManager.cs
+++ b/csharp/src/IceSSL/TrustManager.cs
diff --git a/cs/src/IceSSL/Util.cs b/csharp/src/IceSSL/Util.cs
index 9fa6b8d0142..9fa6b8d0142 100644
--- a/cs/src/IceSSL/Util.cs
+++ b/csharp/src/IceSSL/Util.cs
diff --git a/cs/src/IceSSL/generated/.gitignore b/csharp/src/IceSSL/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IceSSL/generated/.gitignore
+++ b/csharp/src/IceSSL/generated/.gitignore
diff --git a/cs/src/IceStorm/.depend.mak b/csharp/src/IceStorm/.depend.mak
index de028ef4015..de028ef4015 100644
--- a/cs/src/IceStorm/.depend.mak
+++ b/csharp/src/IceStorm/.depend.mak
diff --git a/cs/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs
index 3ee62207196..3ee62207196 100644
--- a/cs/src/IceStorm/AssemblyInfo.cs
+++ b/csharp/src/IceStorm/AssemblyInfo.cs
diff --git a/cs/src/IceStorm/Makefile b/csharp/src/IceStorm/Makefile
index 2a02bcef619..2a02bcef619 100644
--- a/cs/src/IceStorm/Makefile
+++ b/csharp/src/IceStorm/Makefile
diff --git a/cs/src/IceStorm/Makefile.mak b/csharp/src/IceStorm/Makefile.mak
index 7094b571653..7094b571653 100644
--- a/cs/src/IceStorm/Makefile.mak
+++ b/csharp/src/IceStorm/Makefile.mak
diff --git a/cs/src/IceStorm/generated/.gitignore b/csharp/src/IceStorm/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/src/IceStorm/generated/.gitignore
+++ b/csharp/src/IceStorm/generated/.gitignore
diff --git a/cs/src/Makefile b/csharp/src/Makefile
index 4b9a3e17400..4b9a3e17400 100644
--- a/cs/src/Makefile
+++ b/csharp/src/Makefile
diff --git a/cs/src/Makefile.mak b/csharp/src/Makefile.mak
index 1c73e5fd7ae..1c73e5fd7ae 100644
--- a/cs/src/Makefile.mak
+++ b/csharp/src/Makefile.mak
diff --git a/cs/src/PolicyServer/AssemblyInfo.cs b/csharp/src/PolicyServer/AssemblyInfo.cs
index 37d7139fc91..37d7139fc91 100644
--- a/cs/src/PolicyServer/AssemblyInfo.cs
+++ b/csharp/src/PolicyServer/AssemblyInfo.cs
diff --git a/cs/src/PolicyServer/Makefile b/csharp/src/PolicyServer/Makefile
index 244f1c54e0b..244f1c54e0b 100644
--- a/cs/src/PolicyServer/Makefile
+++ b/csharp/src/PolicyServer/Makefile
diff --git a/cs/src/PolicyServer/Makefile.mak b/csharp/src/PolicyServer/Makefile.mak
index 46c89d13b6c..46c89d13b6c 100644
--- a/cs/src/PolicyServer/Makefile.mak
+++ b/csharp/src/PolicyServer/Makefile.mak
diff --git a/cs/src/PolicyServer/PolicyServer.cs b/csharp/src/PolicyServer/PolicyServer.cs
index 153db23627d..153db23627d 100644
--- a/cs/src/PolicyServer/PolicyServer.cs
+++ b/csharp/src/PolicyServer/PolicyServer.cs
diff --git a/cs/test/Glacier2/Makefile b/csharp/test/Glacier2/Makefile
index 792666763a6..792666763a6 100644
--- a/cs/test/Glacier2/Makefile
+++ b/csharp/test/Glacier2/Makefile
diff --git a/cs/test/Glacier2/Makefile.mak b/csharp/test/Glacier2/Makefile.mak
index 188feeb4466..188feeb4466 100644
--- a/cs/test/Glacier2/Makefile.mak
+++ b/csharp/test/Glacier2/Makefile.mak
diff --git a/cs/test/Glacier2/router/.depend.mak b/csharp/test/Glacier2/router/.depend.mak
index 1450fc2acba..1450fc2acba 100644
--- a/cs/test/Glacier2/router/.depend.mak
+++ b/csharp/test/Glacier2/router/.depend.mak
diff --git a/cs/test/Glacier2/router/Callback.ice b/csharp/test/Glacier2/router/Callback.ice
index 57b49a2bd89..57b49a2bd89 100644
--- a/cs/test/Glacier2/router/Callback.ice
+++ b/csharp/test/Glacier2/router/Callback.ice
diff --git a/cs/test/Glacier2/router/CallbackI.cs b/csharp/test/Glacier2/router/CallbackI.cs
index f831a06ad3f..f831a06ad3f 100644
--- a/cs/test/Glacier2/router/CallbackI.cs
+++ b/csharp/test/Glacier2/router/CallbackI.cs
diff --git a/cs/test/Glacier2/router/Client.cs b/csharp/test/Glacier2/router/Client.cs
index 61963a710ee..61963a710ee 100644
--- a/cs/test/Glacier2/router/Client.cs
+++ b/csharp/test/Glacier2/router/Client.cs
diff --git a/cs/test/Glacier2/router/Makefile b/csharp/test/Glacier2/router/Makefile
index 70d2189c0cf..70d2189c0cf 100644
--- a/cs/test/Glacier2/router/Makefile
+++ b/csharp/test/Glacier2/router/Makefile
diff --git a/cs/test/Glacier2/router/Makefile.mak b/csharp/test/Glacier2/router/Makefile.mak
index 8bf10f17a57..8bf10f17a57 100644
--- a/cs/test/Glacier2/router/Makefile.mak
+++ b/csharp/test/Glacier2/router/Makefile.mak
diff --git a/cs/test/Glacier2/router/Server.cs b/csharp/test/Glacier2/router/Server.cs
index 5e604856be9..5e604856be9 100644
--- a/cs/test/Glacier2/router/Server.cs
+++ b/csharp/test/Glacier2/router/Server.cs
diff --git a/cs/test/Glacier2/router/client.exe.config b/csharp/test/Glacier2/router/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Glacier2/router/client.exe.config
+++ b/csharp/test/Glacier2/router/client.exe.config
diff --git a/cs/test/Glacier2/router/generated/.gitignore b/csharp/test/Glacier2/router/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Glacier2/router/generated/.gitignore
+++ b/csharp/test/Glacier2/router/generated/.gitignore
diff --git a/cs/test/Glacier2/router/passwords b/csharp/test/Glacier2/router/passwords
index a1527dec2b9..a1527dec2b9 100644
--- a/cs/test/Glacier2/router/passwords
+++ b/csharp/test/Glacier2/router/passwords
diff --git a/cs/test/Glacier2/router/run.py b/csharp/test/Glacier2/router/run.py
index 4b88f3f882a..4b88f3f882a 100755
--- a/cs/test/Glacier2/router/run.py
+++ b/csharp/test/Glacier2/router/run.py
diff --git a/cs/test/Glacier2/router/server.exe.config b/csharp/test/Glacier2/router/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Glacier2/router/server.exe.config
+++ b/csharp/test/Glacier2/router/server.exe.config
diff --git a/cs/test/Glacier2/sessionHelper/.depend.mak b/csharp/test/Glacier2/sessionHelper/.depend.mak
index 1450fc2acba..1450fc2acba 100644
--- a/cs/test/Glacier2/sessionHelper/.depend.mak
+++ b/csharp/test/Glacier2/sessionHelper/.depend.mak
diff --git a/cs/test/Glacier2/sessionHelper/Callback.ice b/csharp/test/Glacier2/sessionHelper/Callback.ice
index f56e5a0ee8e..f56e5a0ee8e 100644
--- a/cs/test/Glacier2/sessionHelper/Callback.ice
+++ b/csharp/test/Glacier2/sessionHelper/Callback.ice
diff --git a/cs/test/Glacier2/sessionHelper/CallbackI.cs b/csharp/test/Glacier2/sessionHelper/CallbackI.cs
index d4b1c6777ce..d4b1c6777ce 100644
--- a/cs/test/Glacier2/sessionHelper/CallbackI.cs
+++ b/csharp/test/Glacier2/sessionHelper/CallbackI.cs
diff --git a/cs/test/Glacier2/sessionHelper/Client.cs b/csharp/test/Glacier2/sessionHelper/Client.cs
index 839277571c8..839277571c8 100644
--- a/cs/test/Glacier2/sessionHelper/Client.cs
+++ b/csharp/test/Glacier2/sessionHelper/Client.cs
diff --git a/cs/test/Glacier2/sessionHelper/Makefile b/csharp/test/Glacier2/sessionHelper/Makefile
index 70d2189c0cf..70d2189c0cf 100644
--- a/cs/test/Glacier2/sessionHelper/Makefile
+++ b/csharp/test/Glacier2/sessionHelper/Makefile
diff --git a/cs/test/Glacier2/sessionHelper/Makefile.mak b/csharp/test/Glacier2/sessionHelper/Makefile.mak
index 8bf10f17a57..8bf10f17a57 100644
--- a/cs/test/Glacier2/sessionHelper/Makefile.mak
+++ b/csharp/test/Glacier2/sessionHelper/Makefile.mak
diff --git a/cs/test/Glacier2/sessionHelper/Server.cs b/csharp/test/Glacier2/sessionHelper/Server.cs
index 99c2cf1b9cb..99c2cf1b9cb 100644
--- a/cs/test/Glacier2/sessionHelper/Server.cs
+++ b/csharp/test/Glacier2/sessionHelper/Server.cs
diff --git a/cs/test/Glacier2/sessionHelper/client.exe.config b/csharp/test/Glacier2/sessionHelper/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Glacier2/sessionHelper/client.exe.config
+++ b/csharp/test/Glacier2/sessionHelper/client.exe.config
diff --git a/cs/test/Glacier2/sessionHelper/generated/.gitignore b/csharp/test/Glacier2/sessionHelper/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Glacier2/sessionHelper/generated/.gitignore
+++ b/csharp/test/Glacier2/sessionHelper/generated/.gitignore
diff --git a/cs/test/Glacier2/sessionHelper/passwords b/csharp/test/Glacier2/sessionHelper/passwords
index a1527dec2b9..a1527dec2b9 100644
--- a/cs/test/Glacier2/sessionHelper/passwords
+++ b/csharp/test/Glacier2/sessionHelper/passwords
diff --git a/cs/test/Glacier2/sessionHelper/run.py b/csharp/test/Glacier2/sessionHelper/run.py
index 1565361b923..1565361b923 100755
--- a/cs/test/Glacier2/sessionHelper/run.py
+++ b/csharp/test/Glacier2/sessionHelper/run.py
diff --git a/cs/test/Glacier2/sessionHelper/server.exe.config b/csharp/test/Glacier2/sessionHelper/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Glacier2/sessionHelper/server.exe.config
+++ b/csharp/test/Glacier2/sessionHelper/server.exe.config
diff --git a/cs/test/Ice/Makefile b/csharp/test/Ice/Makefile
index d924ed07e90..d924ed07e90 100644
--- a/cs/test/Ice/Makefile
+++ b/csharp/test/Ice/Makefile
diff --git a/cs/test/Ice/Makefile.mak b/csharp/test/Ice/Makefile.mak
index 7fd51f02128..7fd51f02128 100644
--- a/cs/test/Ice/Makefile.mak
+++ b/csharp/test/Ice/Makefile.mak
diff --git a/cs/test/Ice/acm/.depend.mak b/csharp/test/Ice/acm/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/acm/.depend.mak
+++ b/csharp/test/Ice/acm/.depend.mak
diff --git a/cs/test/Ice/acm/.gitignore b/csharp/test/Ice/acm/.gitignore
index 67872faa673..67872faa673 100644
--- a/cs/test/Ice/acm/.gitignore
+++ b/csharp/test/Ice/acm/.gitignore
diff --git a/cs/test/Ice/acm/AllTests.cs b/csharp/test/Ice/acm/AllTests.cs
index e78d8b84eaa..e78d8b84eaa 100644
--- a/cs/test/Ice/acm/AllTests.cs
+++ b/csharp/test/Ice/acm/AllTests.cs
diff --git a/cs/test/Ice/acm/Client.cs b/csharp/test/Ice/acm/Client.cs
index b0fc71530ec..b0fc71530ec 100644
--- a/cs/test/Ice/acm/Client.cs
+++ b/csharp/test/Ice/acm/Client.cs
diff --git a/cs/test/Ice/acm/Makefile b/csharp/test/Ice/acm/Makefile
index 17e3aeb5a53..17e3aeb5a53 100644
--- a/cs/test/Ice/acm/Makefile
+++ b/csharp/test/Ice/acm/Makefile
diff --git a/cs/test/Ice/acm/Makefile.mak b/csharp/test/Ice/acm/Makefile.mak
index fa495f3d103..fa495f3d103 100644
--- a/cs/test/Ice/acm/Makefile.mak
+++ b/csharp/test/Ice/acm/Makefile.mak
diff --git a/cs/test/Ice/acm/Server.cs b/csharp/test/Ice/acm/Server.cs
index 7fac8110f06..7fac8110f06 100644
--- a/cs/test/Ice/acm/Server.cs
+++ b/csharp/test/Ice/acm/Server.cs
diff --git a/cs/test/Ice/acm/Test.ice b/csharp/test/Ice/acm/Test.ice
index b1c8b749109..b1c8b749109 100644
--- a/cs/test/Ice/acm/Test.ice
+++ b/csharp/test/Ice/acm/Test.ice
diff --git a/cs/test/Ice/acm/TestI.cs b/csharp/test/Ice/acm/TestI.cs
index bb02117c99d..bb02117c99d 100644
--- a/cs/test/Ice/acm/TestI.cs
+++ b/csharp/test/Ice/acm/TestI.cs
diff --git a/cs/test/Ice/acm/client.exe.config b/csharp/test/Ice/acm/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/acm/client.exe.config
+++ b/csharp/test/Ice/acm/client.exe.config
diff --git a/cs/test/Ice/acm/generated/.gitignore b/csharp/test/Ice/acm/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/acm/generated/.gitignore
+++ b/csharp/test/Ice/acm/generated/.gitignore
diff --git a/cs/test/Ice/acm/run.py b/csharp/test/Ice/acm/run.py
index 3f2e91f0009..3f2e91f0009 100755
--- a/cs/test/Ice/acm/run.py
+++ b/csharp/test/Ice/acm/run.py
diff --git a/cs/test/Ice/acm/server.exe.config b/csharp/test/Ice/acm/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/acm/server.exe.config
+++ b/csharp/test/Ice/acm/server.exe.config
diff --git a/cs/test/Ice/adapterDeactivation/.depend.mak b/csharp/test/Ice/adapterDeactivation/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/adapterDeactivation/.depend.mak
+++ b/csharp/test/Ice/adapterDeactivation/.depend.mak
diff --git a/cs/test/Ice/adapterDeactivation/.gitignore b/csharp/test/Ice/adapterDeactivation/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/adapterDeactivation/.gitignore
+++ b/csharp/test/Ice/adapterDeactivation/.gitignore
diff --git a/cs/test/Ice/adapterDeactivation/AllTests.cs b/csharp/test/Ice/adapterDeactivation/AllTests.cs
index 833faf409f5..833faf409f5 100644
--- a/cs/test/Ice/adapterDeactivation/AllTests.cs
+++ b/csharp/test/Ice/adapterDeactivation/AllTests.cs
diff --git a/cs/test/Ice/adapterDeactivation/App.xaml b/csharp/test/Ice/adapterDeactivation/App.xaml
index cb9c57593e8..cb9c57593e8 100644
--- a/cs/test/Ice/adapterDeactivation/App.xaml
+++ b/csharp/test/Ice/adapterDeactivation/App.xaml
diff --git a/cs/test/Ice/adapterDeactivation/App.xaml.cs b/csharp/test/Ice/adapterDeactivation/App.xaml.cs
index a1edce38dbb..a1edce38dbb 100644
--- a/cs/test/Ice/adapterDeactivation/App.xaml.cs
+++ b/csharp/test/Ice/adapterDeactivation/App.xaml.cs
diff --git a/cs/test/Ice/adapterDeactivation/Client.cs b/csharp/test/Ice/adapterDeactivation/Client.cs
index a73e1398157..a73e1398157 100644
--- a/cs/test/Ice/adapterDeactivation/Client.cs
+++ b/csharp/test/Ice/adapterDeactivation/Client.cs
diff --git a/cs/test/Ice/adapterDeactivation/Collocated.cs b/csharp/test/Ice/adapterDeactivation/Collocated.cs
index f607c1a4954..f607c1a4954 100644
--- a/cs/test/Ice/adapterDeactivation/Collocated.cs
+++ b/csharp/test/Ice/adapterDeactivation/Collocated.cs
diff --git a/cs/test/Ice/adapterDeactivation/CookieI.cs b/csharp/test/Ice/adapterDeactivation/CookieI.cs
index 6766f4e7551..6766f4e7551 100644
--- a/cs/test/Ice/adapterDeactivation/CookieI.cs
+++ b/csharp/test/Ice/adapterDeactivation/CookieI.cs
diff --git a/cs/test/Ice/adapterDeactivation/Makefile b/csharp/test/Ice/adapterDeactivation/Makefile
index b998c652e16..b998c652e16 100644
--- a/cs/test/Ice/adapterDeactivation/Makefile
+++ b/csharp/test/Ice/adapterDeactivation/Makefile
diff --git a/cs/test/Ice/adapterDeactivation/Makefile.mak b/csharp/test/Ice/adapterDeactivation/Makefile.mak
index add29b1e9c7..add29b1e9c7 100644
--- a/cs/test/Ice/adapterDeactivation/Makefile.mak
+++ b/csharp/test/Ice/adapterDeactivation/Makefile.mak
diff --git a/cs/test/Ice/adapterDeactivation/Properties/AppManifest.xml b/csharp/test/Ice/adapterDeactivation/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/adapterDeactivation/Properties/AppManifest.xml
+++ b/csharp/test/Ice/adapterDeactivation/Properties/AppManifest.xml
diff --git a/cs/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs b/csharp/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs
index c0f7b9f960b..c0f7b9f960b 100644
--- a/cs/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/adapterDeactivation/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/adapterDeactivation/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/adapterDeactivation/Properties/OutOfBrowserSettings.xml
index e6989927830..e6989927830 100644
--- a/cs/test/Ice/adapterDeactivation/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/adapterDeactivation/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/adapterDeactivation/ServantLocatorI.cs b/csharp/test/Ice/adapterDeactivation/ServantLocatorI.cs
index 70eb481d79c..70eb481d79c 100644
--- a/cs/test/Ice/adapterDeactivation/ServantLocatorI.cs
+++ b/csharp/test/Ice/adapterDeactivation/ServantLocatorI.cs
diff --git a/cs/test/Ice/adapterDeactivation/Server.cs b/csharp/test/Ice/adapterDeactivation/Server.cs
index 5ef02fc18a0..5ef02fc18a0 100644
--- a/cs/test/Ice/adapterDeactivation/Server.cs
+++ b/csharp/test/Ice/adapterDeactivation/Server.cs
diff --git a/cs/test/Ice/adapterDeactivation/Test.ice b/csharp/test/Ice/adapterDeactivation/Test.ice
index 235121704bd..235121704bd 100644
--- a/cs/test/Ice/adapterDeactivation/Test.ice
+++ b/csharp/test/Ice/adapterDeactivation/Test.ice
diff --git a/cs/test/Ice/adapterDeactivation/TestI.cs b/csharp/test/Ice/adapterDeactivation/TestI.cs
index 8b65a8f13a5..8b65a8f13a5 100644
--- a/cs/test/Ice/adapterDeactivation/TestI.cs
+++ b/csharp/test/Ice/adapterDeactivation/TestI.cs
diff --git a/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj b/csharp/test/Ice/adapterDeactivation/adapterDeactivation.csproj
index b8e7fd105ad..b8e7fd105ad 100644
--- a/cs/test/Ice/adapterDeactivation/adapterDeactivation.csproj
+++ b/csharp/test/Ice/adapterDeactivation/adapterDeactivation.csproj
diff --git a/cs/test/Ice/adapterDeactivation/client.exe.config b/csharp/test/Ice/adapterDeactivation/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/adapterDeactivation/client.exe.config
+++ b/csharp/test/Ice/adapterDeactivation/client.exe.config
diff --git a/cs/test/Ice/adapterDeactivation/collocated.exe.config b/csharp/test/Ice/adapterDeactivation/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/adapterDeactivation/collocated.exe.config
+++ b/csharp/test/Ice/adapterDeactivation/collocated.exe.config
diff --git a/cs/test/Ice/adapterDeactivation/generated/.gitignore b/csharp/test/Ice/adapterDeactivation/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/adapterDeactivation/generated/.gitignore
+++ b/csharp/test/Ice/adapterDeactivation/generated/.gitignore
diff --git a/cs/test/Ice/adapterDeactivation/generated/sl/.gitignore b/csharp/test/Ice/adapterDeactivation/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/adapterDeactivation/generated/sl/.gitignore
+++ b/csharp/test/Ice/adapterDeactivation/generated/sl/.gitignore
diff --git a/cs/test/Ice/adapterDeactivation/run.py b/csharp/test/Ice/adapterDeactivation/run.py
index ac7bc7f799e..ac7bc7f799e 100755
--- a/cs/test/Ice/adapterDeactivation/run.py
+++ b/csharp/test/Ice/adapterDeactivation/run.py
diff --git a/cs/test/Ice/adapterDeactivation/server.exe.config b/csharp/test/Ice/adapterDeactivation/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/adapterDeactivation/server.exe.config
+++ b/csharp/test/Ice/adapterDeactivation/server.exe.config
diff --git a/cs/test/Ice/admin/.depend.mak b/csharp/test/Ice/admin/.depend.mak
index 2f6bd05cb5a..2f6bd05cb5a 100644
--- a/cs/test/Ice/admin/.depend.mak
+++ b/csharp/test/Ice/admin/.depend.mak
diff --git a/cs/test/Ice/admin/AllTests.cs b/csharp/test/Ice/admin/AllTests.cs
index 0b61fec0483..0b61fec0483 100644
--- a/cs/test/Ice/admin/AllTests.cs
+++ b/csharp/test/Ice/admin/AllTests.cs
diff --git a/cs/test/Ice/admin/Client.cs b/csharp/test/Ice/admin/Client.cs
index 29de8417989..29de8417989 100644
--- a/cs/test/Ice/admin/Client.cs
+++ b/csharp/test/Ice/admin/Client.cs
diff --git a/cs/test/Ice/admin/Makefile b/csharp/test/Ice/admin/Makefile
index 8abd1b0dba3..8abd1b0dba3 100644
--- a/cs/test/Ice/admin/Makefile
+++ b/csharp/test/Ice/admin/Makefile
diff --git a/cs/test/Ice/admin/Makefile.mak b/csharp/test/Ice/admin/Makefile.mak
index 4256a0c5fdd..4256a0c5fdd 100644
--- a/cs/test/Ice/admin/Makefile.mak
+++ b/csharp/test/Ice/admin/Makefile.mak
diff --git a/cs/test/Ice/admin/Server.cs b/csharp/test/Ice/admin/Server.cs
index 9007207cb52..9007207cb52 100644
--- a/cs/test/Ice/admin/Server.cs
+++ b/csharp/test/Ice/admin/Server.cs
diff --git a/cs/test/Ice/admin/Test.ice b/csharp/test/Ice/admin/Test.ice
index fbc95428738..fbc95428738 100644
--- a/cs/test/Ice/admin/Test.ice
+++ b/csharp/test/Ice/admin/Test.ice
diff --git a/cs/test/Ice/admin/TestI.cs b/csharp/test/Ice/admin/TestI.cs
index bb224875dd7..bb224875dd7 100644
--- a/cs/test/Ice/admin/TestI.cs
+++ b/csharp/test/Ice/admin/TestI.cs
diff --git a/cs/test/Ice/admin/client.exe.config b/csharp/test/Ice/admin/client.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/admin/client.exe.config
+++ b/csharp/test/Ice/admin/client.exe.config
diff --git a/cs/test/Ice/admin/generated/.gitignore b/csharp/test/Ice/admin/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/admin/generated/.gitignore
+++ b/csharp/test/Ice/admin/generated/.gitignore
diff --git a/cs/test/Ice/admin/run.py b/csharp/test/Ice/admin/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/cs/test/Ice/admin/run.py
+++ b/csharp/test/Ice/admin/run.py
diff --git a/cs/test/Ice/admin/server.exe.config b/csharp/test/Ice/admin/server.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/admin/server.exe.config
+++ b/csharp/test/Ice/admin/server.exe.config
diff --git a/cs/test/Ice/ami/.depend.mak b/csharp/test/Ice/ami/.depend.mak
index a48ca7ca548..a48ca7ca548 100644
--- a/cs/test/Ice/ami/.depend.mak
+++ b/csharp/test/Ice/ami/.depend.mak
diff --git a/cs/test/Ice/ami/.gitignore b/csharp/test/Ice/ami/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/ami/.gitignore
+++ b/csharp/test/Ice/ami/.gitignore
diff --git a/cs/test/Ice/ami/AllTests.cs b/csharp/test/Ice/ami/AllTests.cs
index a9836f1e4e3..a9836f1e4e3 100644
--- a/cs/test/Ice/ami/AllTests.cs
+++ b/csharp/test/Ice/ami/AllTests.cs
diff --git a/cs/test/Ice/ami/App.xaml b/csharp/test/Ice/ami/App.xaml
index d6246bec72d..d6246bec72d 100644
--- a/cs/test/Ice/ami/App.xaml
+++ b/csharp/test/Ice/ami/App.xaml
diff --git a/cs/test/Ice/ami/App.xaml.cs b/csharp/test/Ice/ami/App.xaml.cs
index 9aad98fd75f..9aad98fd75f 100644
--- a/cs/test/Ice/ami/App.xaml.cs
+++ b/csharp/test/Ice/ami/App.xaml.cs
diff --git a/cs/test/Ice/ami/Client.cs b/csharp/test/Ice/ami/Client.cs
index 6d7cdf71bde..6d7cdf71bde 100644
--- a/cs/test/Ice/ami/Client.cs
+++ b/csharp/test/Ice/ami/Client.cs
diff --git a/cs/test/Ice/ami/Collocated.cs b/csharp/test/Ice/ami/Collocated.cs
index ec0d23e21e3..ec0d23e21e3 100644
--- a/cs/test/Ice/ami/Collocated.cs
+++ b/csharp/test/Ice/ami/Collocated.cs
diff --git a/cs/test/Ice/ami/Makefile b/csharp/test/Ice/ami/Makefile
index 0af9a0c57c0..0af9a0c57c0 100644
--- a/cs/test/Ice/ami/Makefile
+++ b/csharp/test/Ice/ami/Makefile
diff --git a/cs/test/Ice/ami/Makefile.mak b/csharp/test/Ice/ami/Makefile.mak
index 721387666ca..721387666ca 100644
--- a/cs/test/Ice/ami/Makefile.mak
+++ b/csharp/test/Ice/ami/Makefile.mak
diff --git a/cs/test/Ice/ami/Properties/AppManifest.xml b/csharp/test/Ice/ami/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/ami/Properties/AppManifest.xml
+++ b/csharp/test/Ice/ami/Properties/AppManifest.xml
diff --git a/cs/test/Ice/ami/Properties/AssemblyInfo.cs b/csharp/test/Ice/ami/Properties/AssemblyInfo.cs
index 805d56a47b4..805d56a47b4 100644
--- a/cs/test/Ice/ami/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/ami/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/ami/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/ami/Properties/OutOfBrowserSettings.xml
index d423e0bd0db..d423e0bd0db 100644
--- a/cs/test/Ice/ami/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/ami/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/ami/Server.cs b/csharp/test/Ice/ami/Server.cs
index 5eb25f2210b..5eb25f2210b 100644
--- a/cs/test/Ice/ami/Server.cs
+++ b/csharp/test/Ice/ami/Server.cs
diff --git a/cs/test/Ice/ami/Test.ice b/csharp/test/Ice/ami/Test.ice
index e5613fe9f94..e5613fe9f94 100644
--- a/cs/test/Ice/ami/Test.ice
+++ b/csharp/test/Ice/ami/Test.ice
diff --git a/cs/test/Ice/ami/TestI.cs b/csharp/test/Ice/ami/TestI.cs
index 7c24b7f7c3a..7c24b7f7c3a 100644
--- a/cs/test/Ice/ami/TestI.cs
+++ b/csharp/test/Ice/ami/TestI.cs
diff --git a/cs/test/Ice/ami/ami.csproj b/csharp/test/Ice/ami/ami.csproj
index 3081862d540..3081862d540 100644
--- a/cs/test/Ice/ami/ami.csproj
+++ b/csharp/test/Ice/ami/ami.csproj
diff --git a/cs/test/Ice/ami/client.exe.config b/csharp/test/Ice/ami/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/ami/client.exe.config
+++ b/csharp/test/Ice/ami/client.exe.config
diff --git a/cs/test/Ice/ami/collocated.exe.config b/csharp/test/Ice/ami/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/ami/collocated.exe.config
+++ b/csharp/test/Ice/ami/collocated.exe.config
diff --git a/cs/test/Ice/ami/generated/.gitignore b/csharp/test/Ice/ami/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/ami/generated/.gitignore
+++ b/csharp/test/Ice/ami/generated/.gitignore
diff --git a/cs/test/Ice/ami/generated/sl/.gitignore b/csharp/test/Ice/ami/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/ami/generated/sl/.gitignore
+++ b/csharp/test/Ice/ami/generated/sl/.gitignore
diff --git a/cs/test/Ice/ami/run.py b/csharp/test/Ice/ami/run.py
index 73dc16e6fc7..73dc16e6fc7 100755
--- a/cs/test/Ice/ami/run.py
+++ b/csharp/test/Ice/ami/run.py
diff --git a/cs/test/Ice/ami/server.exe.config b/csharp/test/Ice/ami/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/ami/server.exe.config
+++ b/csharp/test/Ice/ami/server.exe.config
diff --git a/cs/test/Ice/application/Client.cs b/csharp/test/Ice/application/Client.cs
index e9f89b15258..e9f89b15258 100644
--- a/cs/test/Ice/application/Client.cs
+++ b/csharp/test/Ice/application/Client.cs
diff --git a/cs/test/Ice/application/Makefile b/csharp/test/Ice/application/Makefile
index 5d3470d7670..5d3470d7670 100644
--- a/cs/test/Ice/application/Makefile
+++ b/csharp/test/Ice/application/Makefile
diff --git a/cs/test/Ice/application/Makefile.mak b/csharp/test/Ice/application/Makefile.mak
index 310ec9c6114..310ec9c6114 100644
--- a/cs/test/Ice/application/Makefile.mak
+++ b/csharp/test/Ice/application/Makefile.mak
diff --git a/cs/test/Ice/application/client.exe.config b/csharp/test/Ice/application/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/application/client.exe.config
+++ b/csharp/test/Ice/application/client.exe.config
diff --git a/cs/test/Ice/background/.depend.mak b/csharp/test/Ice/background/.depend.mak
index d723eefb624..d723eefb624 100644
--- a/cs/test/Ice/background/.depend.mak
+++ b/csharp/test/Ice/background/.depend.mak
diff --git a/cs/test/Ice/background/Acceptor.cs b/csharp/test/Ice/background/Acceptor.cs
index 72abf4c19ee..72abf4c19ee 100644
--- a/cs/test/Ice/background/Acceptor.cs
+++ b/csharp/test/Ice/background/Acceptor.cs
diff --git a/cs/test/Ice/background/AllTests.cs b/csharp/test/Ice/background/AllTests.cs
index 37c287d9b9c..37c287d9b9c 100644
--- a/cs/test/Ice/background/AllTests.cs
+++ b/csharp/test/Ice/background/AllTests.cs
diff --git a/cs/test/Ice/background/BackgroundControllerI.cs b/csharp/test/Ice/background/BackgroundControllerI.cs
index 91f86f55a89..91f86f55a89 100644
--- a/cs/test/Ice/background/BackgroundControllerI.cs
+++ b/csharp/test/Ice/background/BackgroundControllerI.cs
diff --git a/cs/test/Ice/background/BackgroundI.cs b/csharp/test/Ice/background/BackgroundI.cs
index d19a40ea504..d19a40ea504 100644
--- a/cs/test/Ice/background/BackgroundI.cs
+++ b/csharp/test/Ice/background/BackgroundI.cs
diff --git a/cs/test/Ice/background/Client.cs b/csharp/test/Ice/background/Client.cs
index 58da5d330af..58da5d330af 100644
--- a/cs/test/Ice/background/Client.cs
+++ b/csharp/test/Ice/background/Client.cs
diff --git a/cs/test/Ice/background/Configuration.cs b/csharp/test/Ice/background/Configuration.cs
index 478d8436aad..478d8436aad 100644
--- a/cs/test/Ice/background/Configuration.cs
+++ b/csharp/test/Ice/background/Configuration.cs
diff --git a/cs/test/Ice/background/Connector.cs b/csharp/test/Ice/background/Connector.cs
index de61937dacd..de61937dacd 100644
--- a/cs/test/Ice/background/Connector.cs
+++ b/csharp/test/Ice/background/Connector.cs
diff --git a/cs/test/Ice/background/EndpointFactory.cs b/csharp/test/Ice/background/EndpointFactory.cs
index c429f96e66d..c429f96e66d 100644
--- a/cs/test/Ice/background/EndpointFactory.cs
+++ b/csharp/test/Ice/background/EndpointFactory.cs
diff --git a/cs/test/Ice/background/EndpointI.cs b/csharp/test/Ice/background/EndpointI.cs
index 8d98d45fc2f..8d98d45fc2f 100644
--- a/cs/test/Ice/background/EndpointI.cs
+++ b/csharp/test/Ice/background/EndpointI.cs
diff --git a/cs/test/Ice/background/Makefile b/csharp/test/Ice/background/Makefile
index f6a37fa0671..f6a37fa0671 100644
--- a/cs/test/Ice/background/Makefile
+++ b/csharp/test/Ice/background/Makefile
diff --git a/cs/test/Ice/background/Makefile.mak b/csharp/test/Ice/background/Makefile.mak
index 43fe2a16617..43fe2a16617 100644
--- a/cs/test/Ice/background/Makefile.mak
+++ b/csharp/test/Ice/background/Makefile.mak
diff --git a/cs/test/Ice/background/PluginI.cs b/csharp/test/Ice/background/PluginI.cs
index 3eca9d91c50..3eca9d91c50 100644
--- a/cs/test/Ice/background/PluginI.cs
+++ b/csharp/test/Ice/background/PluginI.cs
diff --git a/cs/test/Ice/background/Server.cs b/csharp/test/Ice/background/Server.cs
index ec80f1a994e..ec80f1a994e 100644
--- a/cs/test/Ice/background/Server.cs
+++ b/csharp/test/Ice/background/Server.cs
diff --git a/cs/test/Ice/background/Test.ice b/csharp/test/Ice/background/Test.ice
index cd9109b7d9f..cd9109b7d9f 100644
--- a/cs/test/Ice/background/Test.ice
+++ b/csharp/test/Ice/background/Test.ice
diff --git a/cs/test/Ice/background/Transceiver.cs b/csharp/test/Ice/background/Transceiver.cs
index e4fc04b8f33..e4fc04b8f33 100644
--- a/cs/test/Ice/background/Transceiver.cs
+++ b/csharp/test/Ice/background/Transceiver.cs
diff --git a/cs/test/Ice/background/client.exe.config b/csharp/test/Ice/background/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/background/client.exe.config
+++ b/csharp/test/Ice/background/client.exe.config
diff --git a/cs/test/Ice/background/generated/.gitignore b/csharp/test/Ice/background/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/background/generated/.gitignore
+++ b/csharp/test/Ice/background/generated/.gitignore
diff --git a/cs/test/Ice/background/run.py b/csharp/test/Ice/background/run.py
index 3f2e91f0009..3f2e91f0009 100755
--- a/cs/test/Ice/background/run.py
+++ b/csharp/test/Ice/background/run.py
diff --git a/cs/test/Ice/background/server.exe.config b/csharp/test/Ice/background/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/background/server.exe.config
+++ b/csharp/test/Ice/background/server.exe.config
diff --git a/cs/test/Ice/binding/.depend.mak b/csharp/test/Ice/binding/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/binding/.depend.mak
+++ b/csharp/test/Ice/binding/.depend.mak
diff --git a/cs/test/Ice/binding/.gitignore b/csharp/test/Ice/binding/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/binding/.gitignore
+++ b/csharp/test/Ice/binding/.gitignore
diff --git a/cs/test/Ice/binding/AllTests.cs b/csharp/test/Ice/binding/AllTests.cs
index 752b93573c9..752b93573c9 100644
--- a/cs/test/Ice/binding/AllTests.cs
+++ b/csharp/test/Ice/binding/AllTests.cs
diff --git a/cs/test/Ice/binding/App.xaml b/csharp/test/Ice/binding/App.xaml
index c463af180b7..c463af180b7 100644
--- a/cs/test/Ice/binding/App.xaml
+++ b/csharp/test/Ice/binding/App.xaml
diff --git a/cs/test/Ice/binding/App.xaml.cs b/csharp/test/Ice/binding/App.xaml.cs
index 62b2e3cfb6b..62b2e3cfb6b 100644
--- a/cs/test/Ice/binding/App.xaml.cs
+++ b/csharp/test/Ice/binding/App.xaml.cs
diff --git a/cs/test/Ice/binding/Client.cs b/csharp/test/Ice/binding/Client.cs
index aaa8074f243..aaa8074f243 100644
--- a/cs/test/Ice/binding/Client.cs
+++ b/csharp/test/Ice/binding/Client.cs
diff --git a/cs/test/Ice/binding/Makefile b/csharp/test/Ice/binding/Makefile
index c31675c1817..c31675c1817 100644
--- a/cs/test/Ice/binding/Makefile
+++ b/csharp/test/Ice/binding/Makefile
diff --git a/cs/test/Ice/binding/Makefile.mak b/csharp/test/Ice/binding/Makefile.mak
index 1303ba26785..1303ba26785 100644
--- a/cs/test/Ice/binding/Makefile.mak
+++ b/csharp/test/Ice/binding/Makefile.mak
diff --git a/cs/test/Ice/binding/Properties/AppManifest.xml b/csharp/test/Ice/binding/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/binding/Properties/AppManifest.xml
+++ b/csharp/test/Ice/binding/Properties/AppManifest.xml
diff --git a/cs/test/Ice/binding/Properties/AssemblyInfo.cs b/csharp/test/Ice/binding/Properties/AssemblyInfo.cs
index ada312329ea..ada312329ea 100644
--- a/cs/test/Ice/binding/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/binding/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/binding/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/binding/Properties/OutOfBrowserSettings.xml
index b77a07b8769..b77a07b8769 100644
--- a/cs/test/Ice/binding/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/binding/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/binding/RemoteCommunicatorI.cs b/csharp/test/Ice/binding/RemoteCommunicatorI.cs
index 3d44378498b..3d44378498b 100644
--- a/cs/test/Ice/binding/RemoteCommunicatorI.cs
+++ b/csharp/test/Ice/binding/RemoteCommunicatorI.cs
diff --git a/cs/test/Ice/binding/RemoteObjectAdapterI.cs b/csharp/test/Ice/binding/RemoteObjectAdapterI.cs
index 351f3ee62de..351f3ee62de 100644
--- a/cs/test/Ice/binding/RemoteObjectAdapterI.cs
+++ b/csharp/test/Ice/binding/RemoteObjectAdapterI.cs
diff --git a/cs/test/Ice/binding/Server.cs b/csharp/test/Ice/binding/Server.cs
index c12249e54c6..c12249e54c6 100644
--- a/cs/test/Ice/binding/Server.cs
+++ b/csharp/test/Ice/binding/Server.cs
diff --git a/cs/test/Ice/binding/Test.ice b/csharp/test/Ice/binding/Test.ice
index bd7cbe1a971..bd7cbe1a971 100644
--- a/cs/test/Ice/binding/Test.ice
+++ b/csharp/test/Ice/binding/Test.ice
diff --git a/cs/test/Ice/binding/TestI.cs b/csharp/test/Ice/binding/TestI.cs
index a13f1c03d69..a13f1c03d69 100644
--- a/cs/test/Ice/binding/TestI.cs
+++ b/csharp/test/Ice/binding/TestI.cs
diff --git a/cs/test/Ice/binding/binding.csproj b/csharp/test/Ice/binding/binding.csproj
index cbe6e4812d1..cbe6e4812d1 100644
--- a/cs/test/Ice/binding/binding.csproj
+++ b/csharp/test/Ice/binding/binding.csproj
diff --git a/cs/test/Ice/binding/client.exe.config b/csharp/test/Ice/binding/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/binding/client.exe.config
+++ b/csharp/test/Ice/binding/client.exe.config
diff --git a/cs/test/Ice/binding/generated/.gitignore b/csharp/test/Ice/binding/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/binding/generated/.gitignore
+++ b/csharp/test/Ice/binding/generated/.gitignore
diff --git a/cs/test/Ice/binding/generated/sl/.gitignore b/csharp/test/Ice/binding/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/binding/generated/sl/.gitignore
+++ b/csharp/test/Ice/binding/generated/sl/.gitignore
diff --git a/cs/test/Ice/binding/run.py b/csharp/test/Ice/binding/run.py
index 3f2e91f0009..3f2e91f0009 100755
--- a/cs/test/Ice/binding/run.py
+++ b/csharp/test/Ice/binding/run.py
diff --git a/cs/test/Ice/binding/server.exe.config b/csharp/test/Ice/binding/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/binding/server.exe.config
+++ b/csharp/test/Ice/binding/server.exe.config
diff --git a/cs/test/Ice/checksum/.depend.mak b/csharp/test/Ice/checksum/.depend.mak
index 8d18ddd7b20..8d18ddd7b20 100644
--- a/cs/test/Ice/checksum/.depend.mak
+++ b/csharp/test/Ice/checksum/.depend.mak
diff --git a/cs/test/Ice/checksum/AllTests.cs b/csharp/test/Ice/checksum/AllTests.cs
index 4041b230f08..4041b230f08 100644
--- a/cs/test/Ice/checksum/AllTests.cs
+++ b/csharp/test/Ice/checksum/AllTests.cs
diff --git a/cs/test/Ice/checksum/Client.cs b/csharp/test/Ice/checksum/Client.cs
index 234dfa8d299..234dfa8d299 100644
--- a/cs/test/Ice/checksum/Client.cs
+++ b/csharp/test/Ice/checksum/Client.cs
diff --git a/cs/test/Ice/checksum/Makefile b/csharp/test/Ice/checksum/Makefile
index 3e9591d644d..3e9591d644d 100644
--- a/cs/test/Ice/checksum/Makefile
+++ b/csharp/test/Ice/checksum/Makefile
diff --git a/cs/test/Ice/checksum/Makefile.mak b/csharp/test/Ice/checksum/Makefile.mak
index 303b2987589..303b2987589 100644
--- a/cs/test/Ice/checksum/Makefile.mak
+++ b/csharp/test/Ice/checksum/Makefile.mak
diff --git a/cs/test/Ice/checksum/Test.ice b/csharp/test/Ice/checksum/Test.ice
index 21639acff0f..21639acff0f 100644
--- a/cs/test/Ice/checksum/Test.ice
+++ b/csharp/test/Ice/checksum/Test.ice
diff --git a/cs/test/Ice/checksum/Types.ice b/csharp/test/Ice/checksum/Types.ice
index 1dfc5f719d5..1dfc5f719d5 100644
--- a/cs/test/Ice/checksum/Types.ice
+++ b/csharp/test/Ice/checksum/Types.ice
diff --git a/cs/test/Ice/checksum/client.exe.config b/csharp/test/Ice/checksum/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/checksum/client.exe.config
+++ b/csharp/test/Ice/checksum/client.exe.config
diff --git a/cs/test/Ice/checksum/generated/.gitignore b/csharp/test/Ice/checksum/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/checksum/generated/.gitignore
+++ b/csharp/test/Ice/checksum/generated/.gitignore
diff --git a/cs/test/Ice/checksum/run.py b/csharp/test/Ice/checksum/run.py
index c47b07bcb45..c47b07bcb45 100755
--- a/cs/test/Ice/checksum/run.py
+++ b/csharp/test/Ice/checksum/run.py
diff --git a/cs/test/Ice/checksum/server/.depend.mak b/csharp/test/Ice/checksum/server/.depend.mak
index 8d18ddd7b20..8d18ddd7b20 100644
--- a/cs/test/Ice/checksum/server/.depend.mak
+++ b/csharp/test/Ice/checksum/server/.depend.mak
diff --git a/cs/test/Ice/checksum/server/Makefile b/csharp/test/Ice/checksum/server/Makefile
index e48465c2ded..e48465c2ded 100644
--- a/cs/test/Ice/checksum/server/Makefile
+++ b/csharp/test/Ice/checksum/server/Makefile
diff --git a/cs/test/Ice/checksum/server/Makefile.mak b/csharp/test/Ice/checksum/server/Makefile.mak
index 8e3f04781a2..8e3f04781a2 100644
--- a/cs/test/Ice/checksum/server/Makefile.mak
+++ b/csharp/test/Ice/checksum/server/Makefile.mak
diff --git a/cs/test/Ice/checksum/server/Server.cs b/csharp/test/Ice/checksum/server/Server.cs
index 418998d601d..418998d601d 100644
--- a/cs/test/Ice/checksum/server/Server.cs
+++ b/csharp/test/Ice/checksum/server/Server.cs
diff --git a/cs/test/Ice/checksum/server/Test.ice b/csharp/test/Ice/checksum/server/Test.ice
index 21639acff0f..21639acff0f 100644
--- a/cs/test/Ice/checksum/server/Test.ice
+++ b/csharp/test/Ice/checksum/server/Test.ice
diff --git a/cs/test/Ice/checksum/server/TestI.cs b/csharp/test/Ice/checksum/server/TestI.cs
index a5dd984cf2a..a5dd984cf2a 100644
--- a/cs/test/Ice/checksum/server/TestI.cs
+++ b/csharp/test/Ice/checksum/server/TestI.cs
diff --git a/cs/test/Ice/checksum/server/Types.ice b/csharp/test/Ice/checksum/server/Types.ice
index 00e0b76c2ea..00e0b76c2ea 100644
--- a/cs/test/Ice/checksum/server/Types.ice
+++ b/csharp/test/Ice/checksum/server/Types.ice
diff --git a/cs/test/Ice/checksum/server/generated/.gitignore b/csharp/test/Ice/checksum/server/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/checksum/server/generated/.gitignore
+++ b/csharp/test/Ice/checksum/server/generated/.gitignore
diff --git a/cs/test/Ice/checksum/server/server.exe.config b/csharp/test/Ice/checksum/server/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/checksum/server/server.exe.config
+++ b/csharp/test/Ice/checksum/server/server.exe.config
diff --git a/cs/test/Ice/defaultServant/.depend.mak b/csharp/test/Ice/defaultServant/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/defaultServant/.depend.mak
+++ b/csharp/test/Ice/defaultServant/.depend.mak
diff --git a/cs/test/Ice/defaultServant/AllTests.cs b/csharp/test/Ice/defaultServant/AllTests.cs
index 52dbf7e8d9e..52dbf7e8d9e 100644
--- a/cs/test/Ice/defaultServant/AllTests.cs
+++ b/csharp/test/Ice/defaultServant/AllTests.cs
diff --git a/cs/test/Ice/defaultServant/Client.cs b/csharp/test/Ice/defaultServant/Client.cs
index 2547e8d626a..2547e8d626a 100644
--- a/cs/test/Ice/defaultServant/Client.cs
+++ b/csharp/test/Ice/defaultServant/Client.cs
diff --git a/cs/test/Ice/defaultServant/Makefile b/csharp/test/Ice/defaultServant/Makefile
index f519a763083..f519a763083 100644
--- a/cs/test/Ice/defaultServant/Makefile
+++ b/csharp/test/Ice/defaultServant/Makefile
diff --git a/cs/test/Ice/defaultServant/Makefile.mak b/csharp/test/Ice/defaultServant/Makefile.mak
index 8e9a4da1e1b..8e9a4da1e1b 100644
--- a/cs/test/Ice/defaultServant/Makefile.mak
+++ b/csharp/test/Ice/defaultServant/Makefile.mak
diff --git a/cs/test/Ice/defaultServant/MyObjectI.cs b/csharp/test/Ice/defaultServant/MyObjectI.cs
index 8c80bb5e3a5..8c80bb5e3a5 100644
--- a/cs/test/Ice/defaultServant/MyObjectI.cs
+++ b/csharp/test/Ice/defaultServant/MyObjectI.cs
diff --git a/cs/test/Ice/defaultServant/Properties/AppManifest.xml b/csharp/test/Ice/defaultServant/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/defaultServant/Properties/AppManifest.xml
+++ b/csharp/test/Ice/defaultServant/Properties/AppManifest.xml
diff --git a/cs/test/Ice/defaultServant/Properties/AssemblyInfo.cs b/csharp/test/Ice/defaultServant/Properties/AssemblyInfo.cs
index baab961e515..baab961e515 100644
--- a/cs/test/Ice/defaultServant/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/defaultServant/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/defaultServant/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/defaultServant/Properties/OutOfBrowserSettings.xml
index 6d4116f7111..6d4116f7111 100644
--- a/cs/test/Ice/defaultServant/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/defaultServant/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/defaultServant/Test.ice b/csharp/test/Ice/defaultServant/Test.ice
index cc90e550721..cc90e550721 100644
--- a/cs/test/Ice/defaultServant/Test.ice
+++ b/csharp/test/Ice/defaultServant/Test.ice
diff --git a/cs/test/Ice/defaultServant/client.exe.config b/csharp/test/Ice/defaultServant/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/defaultServant/client.exe.config
+++ b/csharp/test/Ice/defaultServant/client.exe.config
diff --git a/cs/test/Ice/defaultServant/generated/.gitignore b/csharp/test/Ice/defaultServant/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/defaultServant/generated/.gitignore
+++ b/csharp/test/Ice/defaultServant/generated/.gitignore
diff --git a/cs/test/Ice/defaultServant/run.py b/csharp/test/Ice/defaultServant/run.py
index a8a27f1f450..a8a27f1f450 100755
--- a/cs/test/Ice/defaultServant/run.py
+++ b/csharp/test/Ice/defaultServant/run.py
diff --git a/cs/test/Ice/defaultValue/.depend.mak b/csharp/test/Ice/defaultValue/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/defaultValue/.depend.mak
+++ b/csharp/test/Ice/defaultValue/.depend.mak
diff --git a/cs/test/Ice/defaultValue/.gitignore b/csharp/test/Ice/defaultValue/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/defaultValue/.gitignore
+++ b/csharp/test/Ice/defaultValue/.gitignore
diff --git a/cs/test/Ice/defaultValue/AllTests.cs b/csharp/test/Ice/defaultValue/AllTests.cs
index dffe175a540..dffe175a540 100644
--- a/cs/test/Ice/defaultValue/AllTests.cs
+++ b/csharp/test/Ice/defaultValue/AllTests.cs
diff --git a/cs/test/Ice/defaultValue/App.xaml b/csharp/test/Ice/defaultValue/App.xaml
index 49f12e8f4e3..49f12e8f4e3 100644
--- a/cs/test/Ice/defaultValue/App.xaml
+++ b/csharp/test/Ice/defaultValue/App.xaml
diff --git a/cs/test/Ice/defaultValue/App.xaml.cs b/csharp/test/Ice/defaultValue/App.xaml.cs
index bc8963c1a55..bc8963c1a55 100644
--- a/cs/test/Ice/defaultValue/App.xaml.cs
+++ b/csharp/test/Ice/defaultValue/App.xaml.cs
diff --git a/cs/test/Ice/defaultValue/Client.cs b/csharp/test/Ice/defaultValue/Client.cs
index 4280fb90eb0..4280fb90eb0 100644
--- a/cs/test/Ice/defaultValue/Client.cs
+++ b/csharp/test/Ice/defaultValue/Client.cs
diff --git a/cs/test/Ice/defaultValue/Makefile b/csharp/test/Ice/defaultValue/Makefile
index 0a678da08f4..0a678da08f4 100644
--- a/cs/test/Ice/defaultValue/Makefile
+++ b/csharp/test/Ice/defaultValue/Makefile
diff --git a/cs/test/Ice/defaultValue/Makefile.mak b/csharp/test/Ice/defaultValue/Makefile.mak
index 64f4d0af5a2..64f4d0af5a2 100644
--- a/cs/test/Ice/defaultValue/Makefile.mak
+++ b/csharp/test/Ice/defaultValue/Makefile.mak
diff --git a/cs/test/Ice/defaultValue/Properties/AppManifest.xml b/csharp/test/Ice/defaultValue/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/defaultValue/Properties/AppManifest.xml
+++ b/csharp/test/Ice/defaultValue/Properties/AppManifest.xml
diff --git a/cs/test/Ice/defaultValue/Properties/AssemblyInfo.cs b/csharp/test/Ice/defaultValue/Properties/AssemblyInfo.cs
index baab961e515..baab961e515 100644
--- a/cs/test/Ice/defaultValue/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/defaultValue/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/defaultValue/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/defaultValue/Properties/OutOfBrowserSettings.xml
index d6a0bfe1311..d6a0bfe1311 100644
--- a/cs/test/Ice/defaultValue/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/defaultValue/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice
index 2f89d136102..2f89d136102 100644
--- a/cs/test/Ice/defaultValue/Test.ice
+++ b/csharp/test/Ice/defaultValue/Test.ice
diff --git a/cs/test/Ice/defaultValue/client.exe.config b/csharp/test/Ice/defaultValue/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/defaultValue/client.exe.config
+++ b/csharp/test/Ice/defaultValue/client.exe.config
diff --git a/cs/test/Ice/defaultValue/defaultValue.csproj b/csharp/test/Ice/defaultValue/defaultValue.csproj
index 1f143aa9328..1f143aa9328 100644
--- a/cs/test/Ice/defaultValue/defaultValue.csproj
+++ b/csharp/test/Ice/defaultValue/defaultValue.csproj
diff --git a/cs/test/Ice/defaultValue/generated/.gitignore b/csharp/test/Ice/defaultValue/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/defaultValue/generated/.gitignore
+++ b/csharp/test/Ice/defaultValue/generated/.gitignore
diff --git a/cs/test/Ice/defaultValue/generated/sl/.gitignore b/csharp/test/Ice/defaultValue/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/defaultValue/generated/sl/.gitignore
+++ b/csharp/test/Ice/defaultValue/generated/sl/.gitignore
diff --git a/cs/test/Ice/defaultValue/run.py b/csharp/test/Ice/defaultValue/run.py
index 27ce0e10ca7..27ce0e10ca7 100755
--- a/cs/test/Ice/defaultValue/run.py
+++ b/csharp/test/Ice/defaultValue/run.py
diff --git a/cs/test/Ice/dictMapping/.depend.mak b/csharp/test/Ice/dictMapping/.depend.mak
index ab202383ea9..ab202383ea9 100644
--- a/cs/test/Ice/dictMapping/.depend.mak
+++ b/csharp/test/Ice/dictMapping/.depend.mak
diff --git a/cs/test/Ice/dictMapping/.gitignore b/csharp/test/Ice/dictMapping/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/dictMapping/.gitignore
+++ b/csharp/test/Ice/dictMapping/.gitignore
diff --git a/cs/test/Ice/dictMapping/AllTests.cs b/csharp/test/Ice/dictMapping/AllTests.cs
index 470d19c6bdc..470d19c6bdc 100644
--- a/cs/test/Ice/dictMapping/AllTests.cs
+++ b/csharp/test/Ice/dictMapping/AllTests.cs
diff --git a/cs/test/Ice/dictMapping/App.xaml b/csharp/test/Ice/dictMapping/App.xaml
index 9f59de7496a..9f59de7496a 100644
--- a/cs/test/Ice/dictMapping/App.xaml
+++ b/csharp/test/Ice/dictMapping/App.xaml
diff --git a/cs/test/Ice/dictMapping/App.xaml.cs b/csharp/test/Ice/dictMapping/App.xaml.cs
index c5a9695b8d7..c5a9695b8d7 100644
--- a/cs/test/Ice/dictMapping/App.xaml.cs
+++ b/csharp/test/Ice/dictMapping/App.xaml.cs
diff --git a/cs/test/Ice/dictMapping/Client.cs b/csharp/test/Ice/dictMapping/Client.cs
index f0f7ac48b05..f0f7ac48b05 100644
--- a/cs/test/Ice/dictMapping/Client.cs
+++ b/csharp/test/Ice/dictMapping/Client.cs
diff --git a/cs/test/Ice/dictMapping/Collocated.cs b/csharp/test/Ice/dictMapping/Collocated.cs
index 563d2ac5bb5..563d2ac5bb5 100644
--- a/cs/test/Ice/dictMapping/Collocated.cs
+++ b/csharp/test/Ice/dictMapping/Collocated.cs
diff --git a/cs/test/Ice/dictMapping/Makefile b/csharp/test/Ice/dictMapping/Makefile
index 31474e9cc99..31474e9cc99 100644
--- a/cs/test/Ice/dictMapping/Makefile
+++ b/csharp/test/Ice/dictMapping/Makefile
diff --git a/cs/test/Ice/dictMapping/Makefile.mak b/csharp/test/Ice/dictMapping/Makefile.mak
index 0e3f8810670..0e3f8810670 100644
--- a/cs/test/Ice/dictMapping/Makefile.mak
+++ b/csharp/test/Ice/dictMapping/Makefile.mak
diff --git a/cs/test/Ice/dictMapping/MyClassAMDI.cs b/csharp/test/Ice/dictMapping/MyClassAMDI.cs
index 8912439aa20..8912439aa20 100644
--- a/cs/test/Ice/dictMapping/MyClassAMDI.cs
+++ b/csharp/test/Ice/dictMapping/MyClassAMDI.cs
diff --git a/cs/test/Ice/dictMapping/MyClassI.cs b/csharp/test/Ice/dictMapping/MyClassI.cs
index 745bcd5dcec..745bcd5dcec 100644
--- a/cs/test/Ice/dictMapping/MyClassI.cs
+++ b/csharp/test/Ice/dictMapping/MyClassI.cs
diff --git a/cs/test/Ice/dictMapping/Properties/AppManifest.xml b/csharp/test/Ice/dictMapping/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/dictMapping/Properties/AppManifest.xml
+++ b/csharp/test/Ice/dictMapping/Properties/AppManifest.xml
diff --git a/cs/test/Ice/dictMapping/Properties/AssemblyInfo.cs b/csharp/test/Ice/dictMapping/Properties/AssemblyInfo.cs
index ce07760b973..ce07760b973 100644
--- a/cs/test/Ice/dictMapping/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/dictMapping/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/dictMapping/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/dictMapping/Properties/OutOfBrowserSettings.xml
index 596535696ee..596535696ee 100644
--- a/cs/test/Ice/dictMapping/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/dictMapping/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/dictMapping/Server.cs b/csharp/test/Ice/dictMapping/Server.cs
index a8d970e2ed0..a8d970e2ed0 100644
--- a/cs/test/Ice/dictMapping/Server.cs
+++ b/csharp/test/Ice/dictMapping/Server.cs
diff --git a/cs/test/Ice/dictMapping/Test.ice b/csharp/test/Ice/dictMapping/Test.ice
index 2467469b8dd..2467469b8dd 100644
--- a/cs/test/Ice/dictMapping/Test.ice
+++ b/csharp/test/Ice/dictMapping/Test.ice
diff --git a/cs/test/Ice/dictMapping/TestAMD.ice b/csharp/test/Ice/dictMapping/TestAMD.ice
index 4e59f0ca826..4e59f0ca826 100644
--- a/cs/test/Ice/dictMapping/TestAMD.ice
+++ b/csharp/test/Ice/dictMapping/TestAMD.ice
diff --git a/cs/test/Ice/dictMapping/Twoways.cs b/csharp/test/Ice/dictMapping/Twoways.cs
index 0b31bfb4bbc..0b31bfb4bbc 100644
--- a/cs/test/Ice/dictMapping/Twoways.cs
+++ b/csharp/test/Ice/dictMapping/Twoways.cs
diff --git a/cs/test/Ice/dictMapping/TwowaysAMI.cs b/csharp/test/Ice/dictMapping/TwowaysAMI.cs
index 651feb83431..651feb83431 100644
--- a/cs/test/Ice/dictMapping/TwowaysAMI.cs
+++ b/csharp/test/Ice/dictMapping/TwowaysAMI.cs
diff --git a/cs/test/Ice/dictMapping/client.exe.config b/csharp/test/Ice/dictMapping/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/dictMapping/client.exe.config
+++ b/csharp/test/Ice/dictMapping/client.exe.config
diff --git a/cs/test/Ice/dictMapping/collocated.exe.config b/csharp/test/Ice/dictMapping/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/dictMapping/collocated.exe.config
+++ b/csharp/test/Ice/dictMapping/collocated.exe.config
diff --git a/cs/test/Ice/dictMapping/dictMapping.csproj b/csharp/test/Ice/dictMapping/dictMapping.csproj
index 73c01d56f4a..73c01d56f4a 100644
--- a/cs/test/Ice/dictMapping/dictMapping.csproj
+++ b/csharp/test/Ice/dictMapping/dictMapping.csproj
diff --git a/cs/test/Ice/dictMapping/generated/.gitignore b/csharp/test/Ice/dictMapping/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/dictMapping/generated/.gitignore
+++ b/csharp/test/Ice/dictMapping/generated/.gitignore
diff --git a/cs/test/Ice/dictMapping/generated/sl/.gitignore b/csharp/test/Ice/dictMapping/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/dictMapping/generated/sl/.gitignore
+++ b/csharp/test/Ice/dictMapping/generated/sl/.gitignore
diff --git a/cs/test/Ice/dictMapping/run.py b/csharp/test/Ice/dictMapping/run.py
index eec082f03e5..eec082f03e5 100755
--- a/cs/test/Ice/dictMapping/run.py
+++ b/csharp/test/Ice/dictMapping/run.py
diff --git a/cs/test/Ice/dictMapping/server.exe.config b/csharp/test/Ice/dictMapping/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/dictMapping/server.exe.config
+++ b/csharp/test/Ice/dictMapping/server.exe.config
diff --git a/cs/test/Ice/dictMapping/serveramd.exe.config b/csharp/test/Ice/dictMapping/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/dictMapping/serveramd.exe.config
+++ b/csharp/test/Ice/dictMapping/serveramd.exe.config
diff --git a/cs/test/Ice/dispatcher/.depend.mak b/csharp/test/Ice/dispatcher/.depend.mak
index a48ca7ca548..a48ca7ca548 100644
--- a/cs/test/Ice/dispatcher/.depend.mak
+++ b/csharp/test/Ice/dispatcher/.depend.mak
diff --git a/cs/test/Ice/dispatcher/.gitignore b/csharp/test/Ice/dispatcher/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/dispatcher/.gitignore
+++ b/csharp/test/Ice/dispatcher/.gitignore
diff --git a/cs/test/Ice/dispatcher/AllTests.cs b/csharp/test/Ice/dispatcher/AllTests.cs
index 83a0091586a..83a0091586a 100644
--- a/cs/test/Ice/dispatcher/AllTests.cs
+++ b/csharp/test/Ice/dispatcher/AllTests.cs
diff --git a/cs/test/Ice/dispatcher/App.xaml b/csharp/test/Ice/dispatcher/App.xaml
index ab6f24abee6..ab6f24abee6 100644
--- a/cs/test/Ice/dispatcher/App.xaml
+++ b/csharp/test/Ice/dispatcher/App.xaml
diff --git a/cs/test/Ice/dispatcher/App.xaml.cs b/csharp/test/Ice/dispatcher/App.xaml.cs
index 7075365bb1b..7075365bb1b 100644
--- a/cs/test/Ice/dispatcher/App.xaml.cs
+++ b/csharp/test/Ice/dispatcher/App.xaml.cs
diff --git a/cs/test/Ice/dispatcher/Client.cs b/csharp/test/Ice/dispatcher/Client.cs
index 78e9a9a5b45..78e9a9a5b45 100644
--- a/cs/test/Ice/dispatcher/Client.cs
+++ b/csharp/test/Ice/dispatcher/Client.cs
diff --git a/cs/test/Ice/dispatcher/Collocated.cs b/csharp/test/Ice/dispatcher/Collocated.cs
index afe031cd4c2..afe031cd4c2 100644
--- a/cs/test/Ice/dispatcher/Collocated.cs
+++ b/csharp/test/Ice/dispatcher/Collocated.cs
diff --git a/cs/test/Ice/dispatcher/Dispatcher.cs b/csharp/test/Ice/dispatcher/Dispatcher.cs
index a9ac1f97217..a9ac1f97217 100644
--- a/cs/test/Ice/dispatcher/Dispatcher.cs
+++ b/csharp/test/Ice/dispatcher/Dispatcher.cs
diff --git a/cs/test/Ice/dispatcher/Makefile b/csharp/test/Ice/dispatcher/Makefile
index 3f5d03bd74a..3f5d03bd74a 100644
--- a/cs/test/Ice/dispatcher/Makefile
+++ b/csharp/test/Ice/dispatcher/Makefile
diff --git a/cs/test/Ice/dispatcher/Makefile.mak b/csharp/test/Ice/dispatcher/Makefile.mak
index a8064eedf69..a8064eedf69 100644
--- a/cs/test/Ice/dispatcher/Makefile.mak
+++ b/csharp/test/Ice/dispatcher/Makefile.mak
diff --git a/cs/test/Ice/dispatcher/Properties/AppManifest.xml b/csharp/test/Ice/dispatcher/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/dispatcher/Properties/AppManifest.xml
+++ b/csharp/test/Ice/dispatcher/Properties/AppManifest.xml
diff --git a/cs/test/Ice/dispatcher/Properties/AssemblyInfo.cs b/csharp/test/Ice/dispatcher/Properties/AssemblyInfo.cs
index 553991c9c2f..553991c9c2f 100644
--- a/cs/test/Ice/dispatcher/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/dispatcher/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/dispatcher/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/dispatcher/Properties/OutOfBrowserSettings.xml
index 252763a7edc..252763a7edc 100644
--- a/cs/test/Ice/dispatcher/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/dispatcher/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/dispatcher/Server.cs b/csharp/test/Ice/dispatcher/Server.cs
index d1ebae40141..d1ebae40141 100644
--- a/cs/test/Ice/dispatcher/Server.cs
+++ b/csharp/test/Ice/dispatcher/Server.cs
diff --git a/cs/test/Ice/dispatcher/Test.ice b/csharp/test/Ice/dispatcher/Test.ice
index dbd44e6a063..dbd44e6a063 100644
--- a/cs/test/Ice/dispatcher/Test.ice
+++ b/csharp/test/Ice/dispatcher/Test.ice
diff --git a/cs/test/Ice/dispatcher/TestI.cs b/csharp/test/Ice/dispatcher/TestI.cs
index 057057c7736..057057c7736 100644
--- a/cs/test/Ice/dispatcher/TestI.cs
+++ b/csharp/test/Ice/dispatcher/TestI.cs
diff --git a/cs/test/Ice/dispatcher/client.exe.config b/csharp/test/Ice/dispatcher/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/dispatcher/client.exe.config
+++ b/csharp/test/Ice/dispatcher/client.exe.config
diff --git a/cs/test/Ice/dispatcher/collocated.exe.config b/csharp/test/Ice/dispatcher/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/dispatcher/collocated.exe.config
+++ b/csharp/test/Ice/dispatcher/collocated.exe.config
diff --git a/cs/test/Ice/dispatcher/dispatcher.csproj b/csharp/test/Ice/dispatcher/dispatcher.csproj
index 1541a68818d..1541a68818d 100644
--- a/cs/test/Ice/dispatcher/dispatcher.csproj
+++ b/csharp/test/Ice/dispatcher/dispatcher.csproj
diff --git a/cs/test/Ice/dispatcher/generated/.gitignore b/csharp/test/Ice/dispatcher/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/dispatcher/generated/.gitignore
+++ b/csharp/test/Ice/dispatcher/generated/.gitignore
diff --git a/cs/test/Ice/dispatcher/generated/sl/.gitignore b/csharp/test/Ice/dispatcher/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/dispatcher/generated/sl/.gitignore
+++ b/csharp/test/Ice/dispatcher/generated/sl/.gitignore
diff --git a/cs/test/Ice/dispatcher/run.py b/csharp/test/Ice/dispatcher/run.py
index 8f5fa2b1152..8f5fa2b1152 100755
--- a/cs/test/Ice/dispatcher/run.py
+++ b/csharp/test/Ice/dispatcher/run.py
diff --git a/cs/test/Ice/dispatcher/server.exe.config b/csharp/test/Ice/dispatcher/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/dispatcher/server.exe.config
+++ b/csharp/test/Ice/dispatcher/server.exe.config
diff --git a/cs/test/Ice/echo/BlobjectI.cs b/csharp/test/Ice/echo/BlobjectI.cs
index 64ba120e2be..64ba120e2be 100644
--- a/cs/test/Ice/echo/BlobjectI.cs
+++ b/csharp/test/Ice/echo/BlobjectI.cs
diff --git a/cs/test/Ice/echo/Makefile b/csharp/test/Ice/echo/Makefile
index 250be2cf4ca..250be2cf4ca 100644
--- a/cs/test/Ice/echo/Makefile
+++ b/csharp/test/Ice/echo/Makefile
diff --git a/cs/test/Ice/echo/Makefile.mak b/csharp/test/Ice/echo/Makefile.mak
index 0fd24cfaf8a..0fd24cfaf8a 100644
--- a/cs/test/Ice/echo/Makefile.mak
+++ b/csharp/test/Ice/echo/Makefile.mak
diff --git a/cs/test/Ice/echo/Server.cs b/csharp/test/Ice/echo/Server.cs
index e05bf9f495f..e05bf9f495f 100644
--- a/cs/test/Ice/echo/Server.cs
+++ b/csharp/test/Ice/echo/Server.cs
diff --git a/cs/test/Ice/echo/Test.ice b/csharp/test/Ice/echo/Test.ice
index 04526baccb2..04526baccb2 100644
--- a/cs/test/Ice/echo/Test.ice
+++ b/csharp/test/Ice/echo/Test.ice
diff --git a/cs/test/Ice/echo/generated/.gitignore b/csharp/test/Ice/echo/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/echo/generated/.gitignore
+++ b/csharp/test/Ice/echo/generated/.gitignore
diff --git a/cs/test/Ice/echo/run.py b/csharp/test/Ice/echo/run.py
index fb06954a948..fb06954a948 100755
--- a/cs/test/Ice/echo/run.py
+++ b/csharp/test/Ice/echo/run.py
diff --git a/cs/test/Ice/echo/server.exe.config b/csharp/test/Ice/echo/server.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/echo/server.exe.config
+++ b/csharp/test/Ice/echo/server.exe.config
diff --git a/cs/test/Ice/enums/.depend.mak b/csharp/test/Ice/enums/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/enums/.depend.mak
+++ b/csharp/test/Ice/enums/.depend.mak
diff --git a/cs/test/Ice/enums/AllTests.cs b/csharp/test/Ice/enums/AllTests.cs
index 6834a400e78..6834a400e78 100644
--- a/cs/test/Ice/enums/AllTests.cs
+++ b/csharp/test/Ice/enums/AllTests.cs
diff --git a/cs/test/Ice/enums/App.xaml b/csharp/test/Ice/enums/App.xaml
index 98401950806..98401950806 100644
--- a/cs/test/Ice/enums/App.xaml
+++ b/csharp/test/Ice/enums/App.xaml
diff --git a/cs/test/Ice/enums/App.xaml.cs b/csharp/test/Ice/enums/App.xaml.cs
index c822a95a067..c822a95a067 100644
--- a/cs/test/Ice/enums/App.xaml.cs
+++ b/csharp/test/Ice/enums/App.xaml.cs
diff --git a/cs/test/Ice/enums/AppManifest.xaml b/csharp/test/Ice/enums/AppManifest.xaml
index 21baba2d0e4..21baba2d0e4 100644
--- a/cs/test/Ice/enums/AppManifest.xaml
+++ b/csharp/test/Ice/enums/AppManifest.xaml
diff --git a/cs/test/Ice/enums/Client.cs b/csharp/test/Ice/enums/Client.cs
index d0de00db8c1..d0de00db8c1 100644
--- a/cs/test/Ice/enums/Client.cs
+++ b/csharp/test/Ice/enums/Client.cs
diff --git a/cs/test/Ice/enums/Makefile b/csharp/test/Ice/enums/Makefile
index 38221fd48eb..38221fd48eb 100644
--- a/cs/test/Ice/enums/Makefile
+++ b/csharp/test/Ice/enums/Makefile
diff --git a/cs/test/Ice/enums/Makefile.mak b/csharp/test/Ice/enums/Makefile.mak
index b39cfa76d88..b39cfa76d88 100644
--- a/cs/test/Ice/enums/Makefile.mak
+++ b/csharp/test/Ice/enums/Makefile.mak
diff --git a/cs/test/Ice/enums/Properties/AppManifest.xml b/csharp/test/Ice/enums/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/enums/Properties/AppManifest.xml
+++ b/csharp/test/Ice/enums/Properties/AppManifest.xml
diff --git a/cs/test/Ice/enums/Properties/AssemblyInfo.cs b/csharp/test/Ice/enums/Properties/AssemblyInfo.cs
index 7bee3fa2cf6..7bee3fa2cf6 100644
--- a/cs/test/Ice/enums/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/enums/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/enums/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/enums/Properties/OutOfBrowserSettings.xml
index 12e87373a71..12e87373a71 100644
--- a/cs/test/Ice/enums/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/enums/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/enums/Server.cs b/csharp/test/Ice/enums/Server.cs
index c0310794c18..c0310794c18 100644
--- a/cs/test/Ice/enums/Server.cs
+++ b/csharp/test/Ice/enums/Server.cs
diff --git a/cs/test/Ice/enums/Test.ice b/csharp/test/Ice/enums/Test.ice
index 1cfe8c3eda8..1cfe8c3eda8 100644
--- a/cs/test/Ice/enums/Test.ice
+++ b/csharp/test/Ice/enums/Test.ice
diff --git a/cs/test/Ice/enums/TestI.cs b/csharp/test/Ice/enums/TestI.cs
index c016847f316..c016847f316 100644
--- a/cs/test/Ice/enums/TestI.cs
+++ b/csharp/test/Ice/enums/TestI.cs
diff --git a/cs/test/Ice/enums/client.exe.config b/csharp/test/Ice/enums/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/enums/client.exe.config
+++ b/csharp/test/Ice/enums/client.exe.config
diff --git a/cs/test/Ice/enums/enums.csproj b/csharp/test/Ice/enums/enums.csproj
index 250423c033a..250423c033a 100644
--- a/cs/test/Ice/enums/enums.csproj
+++ b/csharp/test/Ice/enums/enums.csproj
diff --git a/cs/test/Ice/enums/enumsTestPage.html b/csharp/test/Ice/enums/enumsTestPage.html
index 73369610bcc..73369610bcc 100644
--- a/cs/test/Ice/enums/enumsTestPage.html
+++ b/csharp/test/Ice/enums/enumsTestPage.html
diff --git a/cs/test/Ice/enums/generated/.gitignore b/csharp/test/Ice/enums/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/enums/generated/.gitignore
+++ b/csharp/test/Ice/enums/generated/.gitignore
diff --git a/cs/test/Ice/enums/generated/sl/.gitignore b/csharp/test/Ice/enums/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/enums/generated/sl/.gitignore
+++ b/csharp/test/Ice/enums/generated/sl/.gitignore
diff --git a/cs/test/Ice/enums/run.py b/csharp/test/Ice/enums/run.py
index 614bfe363bf..614bfe363bf 100755
--- a/cs/test/Ice/enums/run.py
+++ b/csharp/test/Ice/enums/run.py
diff --git a/cs/test/Ice/enums/server.exe.config b/csharp/test/Ice/enums/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/enums/server.exe.config
+++ b/csharp/test/Ice/enums/server.exe.config
diff --git a/cs/test/Ice/exceptions/.depend.mak b/csharp/test/Ice/exceptions/.depend.mak
index 8db7fa68b5f..8db7fa68b5f 100644
--- a/cs/test/Ice/exceptions/.depend.mak
+++ b/csharp/test/Ice/exceptions/.depend.mak
diff --git a/cs/test/Ice/exceptions/.gitignore b/csharp/test/Ice/exceptions/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/exceptions/.gitignore
+++ b/csharp/test/Ice/exceptions/.gitignore
diff --git a/cs/test/Ice/exceptions/AllTests.cs b/csharp/test/Ice/exceptions/AllTests.cs
index 5869c1c80ab..5869c1c80ab 100644
--- a/cs/test/Ice/exceptions/AllTests.cs
+++ b/csharp/test/Ice/exceptions/AllTests.cs
diff --git a/cs/test/Ice/exceptions/App.xaml b/csharp/test/Ice/exceptions/App.xaml
index 0840e58a13e..0840e58a13e 100644
--- a/cs/test/Ice/exceptions/App.xaml
+++ b/csharp/test/Ice/exceptions/App.xaml
diff --git a/cs/test/Ice/exceptions/App.xaml.cs b/csharp/test/Ice/exceptions/App.xaml.cs
index 6901eaa58b3..6901eaa58b3 100644
--- a/cs/test/Ice/exceptions/App.xaml.cs
+++ b/csharp/test/Ice/exceptions/App.xaml.cs
diff --git a/cs/test/Ice/exceptions/Client.cs b/csharp/test/Ice/exceptions/Client.cs
index 8191d61df2f..8191d61df2f 100644
--- a/cs/test/Ice/exceptions/Client.cs
+++ b/csharp/test/Ice/exceptions/Client.cs
diff --git a/cs/test/Ice/exceptions/Collocated.cs b/csharp/test/Ice/exceptions/Collocated.cs
index 1e2184f15e5..1e2184f15e5 100644
--- a/cs/test/Ice/exceptions/Collocated.cs
+++ b/csharp/test/Ice/exceptions/Collocated.cs
diff --git a/cs/test/Ice/exceptions/EmptyI.cs b/csharp/test/Ice/exceptions/EmptyI.cs
index 67219eddc8c..67219eddc8c 100644
--- a/cs/test/Ice/exceptions/EmptyI.cs
+++ b/csharp/test/Ice/exceptions/EmptyI.cs
diff --git a/cs/test/Ice/exceptions/Makefile b/csharp/test/Ice/exceptions/Makefile
index 12870972028..12870972028 100644
--- a/cs/test/Ice/exceptions/Makefile
+++ b/csharp/test/Ice/exceptions/Makefile
diff --git a/cs/test/Ice/exceptions/Makefile.mak b/csharp/test/Ice/exceptions/Makefile.mak
index 87b2af63240..87b2af63240 100644
--- a/cs/test/Ice/exceptions/Makefile.mak
+++ b/csharp/test/Ice/exceptions/Makefile.mak
diff --git a/cs/test/Ice/exceptions/ObjectFactoryI.cs b/csharp/test/Ice/exceptions/ObjectFactoryI.cs
index fdada7ebf07..fdada7ebf07 100644
--- a/cs/test/Ice/exceptions/ObjectFactoryI.cs
+++ b/csharp/test/Ice/exceptions/ObjectFactoryI.cs
diff --git a/cs/test/Ice/exceptions/Properties/AppManifest.xml b/csharp/test/Ice/exceptions/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/exceptions/Properties/AppManifest.xml
+++ b/csharp/test/Ice/exceptions/Properties/AppManifest.xml
diff --git a/cs/test/Ice/exceptions/Properties/AssemblyInfo.cs b/csharp/test/Ice/exceptions/Properties/AssemblyInfo.cs
index 65b29bda18b..65b29bda18b 100644
--- a/cs/test/Ice/exceptions/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/exceptions/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/exceptions/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/exceptions/Properties/OutOfBrowserSettings.xml
index 37b04b93874..37b04b93874 100644
--- a/cs/test/Ice/exceptions/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/exceptions/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/exceptions/ServantLocatorI.cs b/csharp/test/Ice/exceptions/ServantLocatorI.cs
index 88b8b527afb..88b8b527afb 100644
--- a/cs/test/Ice/exceptions/ServantLocatorI.cs
+++ b/csharp/test/Ice/exceptions/ServantLocatorI.cs
diff --git a/cs/test/Ice/exceptions/Server.cs b/csharp/test/Ice/exceptions/Server.cs
index 2bb66492907..2bb66492907 100644
--- a/cs/test/Ice/exceptions/Server.cs
+++ b/csharp/test/Ice/exceptions/Server.cs
diff --git a/cs/test/Ice/exceptions/Test.ice b/csharp/test/Ice/exceptions/Test.ice
index 834b3a8fbf2..834b3a8fbf2 100644
--- a/cs/test/Ice/exceptions/Test.ice
+++ b/csharp/test/Ice/exceptions/Test.ice
diff --git a/cs/test/Ice/exceptions/TestAMD.ice b/csharp/test/Ice/exceptions/TestAMD.ice
index 24a39ecc238..24a39ecc238 100644
--- a/cs/test/Ice/exceptions/TestAMD.ice
+++ b/csharp/test/Ice/exceptions/TestAMD.ice
diff --git a/cs/test/Ice/exceptions/ThrowerAMDI.cs b/csharp/test/Ice/exceptions/ThrowerAMDI.cs
index c4d0f2bd185..c4d0f2bd185 100644
--- a/cs/test/Ice/exceptions/ThrowerAMDI.cs
+++ b/csharp/test/Ice/exceptions/ThrowerAMDI.cs
diff --git a/cs/test/Ice/exceptions/ThrowerI.cs b/csharp/test/Ice/exceptions/ThrowerI.cs
index 7200abef9ab..7200abef9ab 100644
--- a/cs/test/Ice/exceptions/ThrowerI.cs
+++ b/csharp/test/Ice/exceptions/ThrowerI.cs
diff --git a/cs/test/Ice/exceptions/client.exe.config b/csharp/test/Ice/exceptions/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/exceptions/client.exe.config
+++ b/csharp/test/Ice/exceptions/client.exe.config
diff --git a/cs/test/Ice/exceptions/collocated.exe.config b/csharp/test/Ice/exceptions/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/exceptions/collocated.exe.config
+++ b/csharp/test/Ice/exceptions/collocated.exe.config
diff --git a/cs/test/Ice/exceptions/exceptions.csproj b/csharp/test/Ice/exceptions/exceptions.csproj
index 37e70ae5016..37e70ae5016 100644
--- a/cs/test/Ice/exceptions/exceptions.csproj
+++ b/csharp/test/Ice/exceptions/exceptions.csproj
diff --git a/cs/test/Ice/exceptions/generated/.gitignore b/csharp/test/Ice/exceptions/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/exceptions/generated/.gitignore
+++ b/csharp/test/Ice/exceptions/generated/.gitignore
diff --git a/cs/test/Ice/exceptions/generated/sl/.gitignore b/csharp/test/Ice/exceptions/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/exceptions/generated/sl/.gitignore
+++ b/csharp/test/Ice/exceptions/generated/sl/.gitignore
diff --git a/cs/test/Ice/exceptions/run.py b/csharp/test/Ice/exceptions/run.py
index 49048adf651..49048adf651 100755
--- a/cs/test/Ice/exceptions/run.py
+++ b/csharp/test/Ice/exceptions/run.py
diff --git a/cs/test/Ice/exceptions/server.exe.config b/csharp/test/Ice/exceptions/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/exceptions/server.exe.config
+++ b/csharp/test/Ice/exceptions/server.exe.config
diff --git a/cs/test/Ice/exceptions/serveramd.exe.config b/csharp/test/Ice/exceptions/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/exceptions/serveramd.exe.config
+++ b/csharp/test/Ice/exceptions/serveramd.exe.config
diff --git a/cs/test/Ice/facets/.depend.mak b/csharp/test/Ice/facets/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/facets/.depend.mak
+++ b/csharp/test/Ice/facets/.depend.mak
diff --git a/cs/test/Ice/facets/.gitignore b/csharp/test/Ice/facets/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/facets/.gitignore
+++ b/csharp/test/Ice/facets/.gitignore
diff --git a/cs/test/Ice/facets/AI.cs b/csharp/test/Ice/facets/AI.cs
index b9b71e7c1f6..b9b71e7c1f6 100644
--- a/cs/test/Ice/facets/AI.cs
+++ b/csharp/test/Ice/facets/AI.cs
diff --git a/cs/test/Ice/facets/AllTests.cs b/csharp/test/Ice/facets/AllTests.cs
index 2b76f47e5ed..2b76f47e5ed 100644
--- a/cs/test/Ice/facets/AllTests.cs
+++ b/csharp/test/Ice/facets/AllTests.cs
diff --git a/cs/test/Ice/facets/App.xaml b/csharp/test/Ice/facets/App.xaml
index 1779b536307..1779b536307 100644
--- a/cs/test/Ice/facets/App.xaml
+++ b/csharp/test/Ice/facets/App.xaml
diff --git a/cs/test/Ice/facets/App.xaml.cs b/csharp/test/Ice/facets/App.xaml.cs
index 314c33c8119..314c33c8119 100644
--- a/cs/test/Ice/facets/App.xaml.cs
+++ b/csharp/test/Ice/facets/App.xaml.cs
diff --git a/cs/test/Ice/facets/BI.cs b/csharp/test/Ice/facets/BI.cs
index 5bafbdef212..5bafbdef212 100644
--- a/cs/test/Ice/facets/BI.cs
+++ b/csharp/test/Ice/facets/BI.cs
diff --git a/cs/test/Ice/facets/CI.cs b/csharp/test/Ice/facets/CI.cs
index 0645e74df3c..0645e74df3c 100644
--- a/cs/test/Ice/facets/CI.cs
+++ b/csharp/test/Ice/facets/CI.cs
diff --git a/cs/test/Ice/facets/Client.cs b/csharp/test/Ice/facets/Client.cs
index c3eec14d06e..c3eec14d06e 100644
--- a/cs/test/Ice/facets/Client.cs
+++ b/csharp/test/Ice/facets/Client.cs
diff --git a/cs/test/Ice/facets/Collocated.cs b/csharp/test/Ice/facets/Collocated.cs
index 9e65784047f..9e65784047f 100644
--- a/cs/test/Ice/facets/Collocated.cs
+++ b/csharp/test/Ice/facets/Collocated.cs
diff --git a/cs/test/Ice/facets/DI.cs b/csharp/test/Ice/facets/DI.cs
index 577d550a2d6..577d550a2d6 100644
--- a/cs/test/Ice/facets/DI.cs
+++ b/csharp/test/Ice/facets/DI.cs
diff --git a/cs/test/Ice/facets/EI.cs b/csharp/test/Ice/facets/EI.cs
index 37e09c3bc75..37e09c3bc75 100644
--- a/cs/test/Ice/facets/EI.cs
+++ b/csharp/test/Ice/facets/EI.cs
diff --git a/cs/test/Ice/facets/EmptyI.cs b/csharp/test/Ice/facets/EmptyI.cs
index 67219eddc8c..67219eddc8c 100644
--- a/cs/test/Ice/facets/EmptyI.cs
+++ b/csharp/test/Ice/facets/EmptyI.cs
diff --git a/cs/test/Ice/facets/FI.cs b/csharp/test/Ice/facets/FI.cs
index 653d9a0df6c..653d9a0df6c 100644
--- a/cs/test/Ice/facets/FI.cs
+++ b/csharp/test/Ice/facets/FI.cs
diff --git a/cs/test/Ice/facets/GI.cs b/csharp/test/Ice/facets/GI.cs
index ed4a4b47aa8..ed4a4b47aa8 100644
--- a/cs/test/Ice/facets/GI.cs
+++ b/csharp/test/Ice/facets/GI.cs
diff --git a/cs/test/Ice/facets/HI.cs b/csharp/test/Ice/facets/HI.cs
index cb479cbad49..cb479cbad49 100644
--- a/cs/test/Ice/facets/HI.cs
+++ b/csharp/test/Ice/facets/HI.cs
diff --git a/cs/test/Ice/facets/Makefile b/csharp/test/Ice/facets/Makefile
index 237fb7e362f..237fb7e362f 100644
--- a/cs/test/Ice/facets/Makefile
+++ b/csharp/test/Ice/facets/Makefile
diff --git a/cs/test/Ice/facets/Makefile.mak b/csharp/test/Ice/facets/Makefile.mak
index 24a2bafd973..24a2bafd973 100644
--- a/cs/test/Ice/facets/Makefile.mak
+++ b/csharp/test/Ice/facets/Makefile.mak
diff --git a/cs/test/Ice/facets/Properties/AppManifest.xml b/csharp/test/Ice/facets/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/facets/Properties/AppManifest.xml
+++ b/csharp/test/Ice/facets/Properties/AppManifest.xml
diff --git a/cs/test/Ice/facets/Properties/AssemblyInfo.cs b/csharp/test/Ice/facets/Properties/AssemblyInfo.cs
index b44fc7e7289..b44fc7e7289 100644
--- a/cs/test/Ice/facets/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/facets/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/facets/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/facets/Properties/OutOfBrowserSettings.xml
index 1a62c962213..1a62c962213 100644
--- a/cs/test/Ice/facets/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/facets/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/facets/Server.cs b/csharp/test/Ice/facets/Server.cs
index 1e45a648cc2..1e45a648cc2 100644
--- a/cs/test/Ice/facets/Server.cs
+++ b/csharp/test/Ice/facets/Server.cs
diff --git a/cs/test/Ice/facets/Test.ice b/csharp/test/Ice/facets/Test.ice
index d73c6594829..d73c6594829 100644
--- a/cs/test/Ice/facets/Test.ice
+++ b/csharp/test/Ice/facets/Test.ice
diff --git a/cs/test/Ice/facets/client.exe.config b/csharp/test/Ice/facets/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/facets/client.exe.config
+++ b/csharp/test/Ice/facets/client.exe.config
diff --git a/cs/test/Ice/facets/collocated.exe.config b/csharp/test/Ice/facets/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/facets/collocated.exe.config
+++ b/csharp/test/Ice/facets/collocated.exe.config
diff --git a/cs/test/Ice/facets/facets.csproj b/csharp/test/Ice/facets/facets.csproj
index 6f6711e5f59..6f6711e5f59 100644
--- a/cs/test/Ice/facets/facets.csproj
+++ b/csharp/test/Ice/facets/facets.csproj
diff --git a/cs/test/Ice/facets/generated/.gitignore b/csharp/test/Ice/facets/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/facets/generated/.gitignore
+++ b/csharp/test/Ice/facets/generated/.gitignore
diff --git a/cs/test/Ice/facets/generated/sl/.gitignore b/csharp/test/Ice/facets/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/facets/generated/sl/.gitignore
+++ b/csharp/test/Ice/facets/generated/sl/.gitignore
diff --git a/cs/test/Ice/facets/run.py b/csharp/test/Ice/facets/run.py
index ac7bc7f799e..ac7bc7f799e 100755
--- a/cs/test/Ice/facets/run.py
+++ b/csharp/test/Ice/facets/run.py
diff --git a/cs/test/Ice/facets/server.exe.config b/csharp/test/Ice/facets/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/facets/server.exe.config
+++ b/csharp/test/Ice/facets/server.exe.config
diff --git a/cs/test/Ice/faultTolerance/.depend.mak b/csharp/test/Ice/faultTolerance/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/faultTolerance/.depend.mak
+++ b/csharp/test/Ice/faultTolerance/.depend.mak
diff --git a/cs/test/Ice/faultTolerance/.gitignore b/csharp/test/Ice/faultTolerance/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/faultTolerance/.gitignore
+++ b/csharp/test/Ice/faultTolerance/.gitignore
diff --git a/cs/test/Ice/faultTolerance/AllTests.cs b/csharp/test/Ice/faultTolerance/AllTests.cs
index f7be2bef105..f7be2bef105 100644
--- a/cs/test/Ice/faultTolerance/AllTests.cs
+++ b/csharp/test/Ice/faultTolerance/AllTests.cs
diff --git a/cs/test/Ice/faultTolerance/App.xaml b/csharp/test/Ice/faultTolerance/App.xaml
index bb96b01e371..bb96b01e371 100644
--- a/cs/test/Ice/faultTolerance/App.xaml
+++ b/csharp/test/Ice/faultTolerance/App.xaml
diff --git a/cs/test/Ice/faultTolerance/App.xaml.cs b/csharp/test/Ice/faultTolerance/App.xaml.cs
index d1de4e146d7..d1de4e146d7 100644
--- a/cs/test/Ice/faultTolerance/App.xaml.cs
+++ b/csharp/test/Ice/faultTolerance/App.xaml.cs
diff --git a/cs/test/Ice/faultTolerance/Client.cs b/csharp/test/Ice/faultTolerance/Client.cs
index 9faa0e0f311..9faa0e0f311 100644
--- a/cs/test/Ice/faultTolerance/Client.cs
+++ b/csharp/test/Ice/faultTolerance/Client.cs
diff --git a/cs/test/Ice/faultTolerance/Makefile b/csharp/test/Ice/faultTolerance/Makefile
index 9ccd45c4846..9ccd45c4846 100644
--- a/cs/test/Ice/faultTolerance/Makefile
+++ b/csharp/test/Ice/faultTolerance/Makefile
diff --git a/cs/test/Ice/faultTolerance/Makefile.mak b/csharp/test/Ice/faultTolerance/Makefile.mak
index 2e09da906a7..2e09da906a7 100644
--- a/cs/test/Ice/faultTolerance/Makefile.mak
+++ b/csharp/test/Ice/faultTolerance/Makefile.mak
diff --git a/cs/test/Ice/faultTolerance/Properties/AppManifest.xml b/csharp/test/Ice/faultTolerance/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/faultTolerance/Properties/AppManifest.xml
+++ b/csharp/test/Ice/faultTolerance/Properties/AppManifest.xml
diff --git a/cs/test/Ice/faultTolerance/Properties/AssemblyInfo.cs b/csharp/test/Ice/faultTolerance/Properties/AssemblyInfo.cs
index 1e48a0763a3..1e48a0763a3 100644
--- a/cs/test/Ice/faultTolerance/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/faultTolerance/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/faultTolerance/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/faultTolerance/Properties/OutOfBrowserSettings.xml
index 6c457176516..6c457176516 100644
--- a/cs/test/Ice/faultTolerance/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/faultTolerance/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/faultTolerance/Server.cs b/csharp/test/Ice/faultTolerance/Server.cs
index 17bd78a083f..17bd78a083f 100644
--- a/cs/test/Ice/faultTolerance/Server.cs
+++ b/csharp/test/Ice/faultTolerance/Server.cs
diff --git a/cs/test/Ice/faultTolerance/Test.ice b/csharp/test/Ice/faultTolerance/Test.ice
index 7d2e0f31915..7d2e0f31915 100644
--- a/cs/test/Ice/faultTolerance/Test.ice
+++ b/csharp/test/Ice/faultTolerance/Test.ice
diff --git a/cs/test/Ice/faultTolerance/TestI.cs b/csharp/test/Ice/faultTolerance/TestI.cs
index c7728c1b75e..c7728c1b75e 100644
--- a/cs/test/Ice/faultTolerance/TestI.cs
+++ b/csharp/test/Ice/faultTolerance/TestI.cs
diff --git a/cs/test/Ice/faultTolerance/client.exe.config b/csharp/test/Ice/faultTolerance/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/faultTolerance/client.exe.config
+++ b/csharp/test/Ice/faultTolerance/client.exe.config
diff --git a/cs/test/Ice/faultTolerance/faultTolerance.csproj b/csharp/test/Ice/faultTolerance/faultTolerance.csproj
index 71051e51ddb..71051e51ddb 100644
--- a/cs/test/Ice/faultTolerance/faultTolerance.csproj
+++ b/csharp/test/Ice/faultTolerance/faultTolerance.csproj
diff --git a/cs/test/Ice/faultTolerance/generated/.gitignore b/csharp/test/Ice/faultTolerance/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/faultTolerance/generated/.gitignore
+++ b/csharp/test/Ice/faultTolerance/generated/.gitignore
diff --git a/cs/test/Ice/faultTolerance/generated/sl/.gitignore b/csharp/test/Ice/faultTolerance/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/faultTolerance/generated/sl/.gitignore
+++ b/csharp/test/Ice/faultTolerance/generated/sl/.gitignore
diff --git a/cs/test/Ice/faultTolerance/run.py b/csharp/test/Ice/faultTolerance/run.py
index 28d0d35f0d2..28d0d35f0d2 100755
--- a/cs/test/Ice/faultTolerance/run.py
+++ b/csharp/test/Ice/faultTolerance/run.py
diff --git a/cs/test/Ice/faultTolerance/server.exe.config b/csharp/test/Ice/faultTolerance/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/faultTolerance/server.exe.config
+++ b/csharp/test/Ice/faultTolerance/server.exe.config
diff --git a/cs/test/Ice/hash/.depend.mak b/csharp/test/Ice/hash/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/hash/.depend.mak
+++ b/csharp/test/Ice/hash/.depend.mak
diff --git a/cs/test/Ice/hash/Client.cs b/csharp/test/Ice/hash/Client.cs
index c59e3728fd6..c59e3728fd6 100644
--- a/cs/test/Ice/hash/Client.cs
+++ b/csharp/test/Ice/hash/Client.cs
diff --git a/cs/test/Ice/hash/Makefile b/csharp/test/Ice/hash/Makefile
index e07bc739cb0..e07bc739cb0 100644
--- a/cs/test/Ice/hash/Makefile
+++ b/csharp/test/Ice/hash/Makefile
diff --git a/cs/test/Ice/hash/Makefile.mak b/csharp/test/Ice/hash/Makefile.mak
index 9a224de1f60..9a224de1f60 100644
--- a/cs/test/Ice/hash/Makefile.mak
+++ b/csharp/test/Ice/hash/Makefile.mak
diff --git a/cs/test/Ice/hash/Test.ice b/csharp/test/Ice/hash/Test.ice
index cc1e48343fc..cc1e48343fc 100644
--- a/cs/test/Ice/hash/Test.ice
+++ b/csharp/test/Ice/hash/Test.ice
diff --git a/cs/test/Ice/hash/client.exe.config b/csharp/test/Ice/hash/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/hash/client.exe.config
+++ b/csharp/test/Ice/hash/client.exe.config
diff --git a/cs/test/Ice/hash/generated/.gitignore b/csharp/test/Ice/hash/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/hash/generated/.gitignore
+++ b/csharp/test/Ice/hash/generated/.gitignore
diff --git a/cs/test/Ice/hash/run.py b/csharp/test/Ice/hash/run.py
index 1b4279c449b..1b4279c449b 100755
--- a/cs/test/Ice/hash/run.py
+++ b/csharp/test/Ice/hash/run.py
diff --git a/cs/test/Ice/hold/.depend.mak b/csharp/test/Ice/hold/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/hold/.depend.mak
+++ b/csharp/test/Ice/hold/.depend.mak
diff --git a/cs/test/Ice/hold/.gitignore b/csharp/test/Ice/hold/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/hold/.gitignore
+++ b/csharp/test/Ice/hold/.gitignore
diff --git a/cs/test/Ice/hold/AllTests.cs b/csharp/test/Ice/hold/AllTests.cs
index ea32d4b541e..ea32d4b541e 100644
--- a/cs/test/Ice/hold/AllTests.cs
+++ b/csharp/test/Ice/hold/AllTests.cs
diff --git a/cs/test/Ice/hold/App.xaml b/csharp/test/Ice/hold/App.xaml
index 3fc9745302e..3fc9745302e 100644
--- a/cs/test/Ice/hold/App.xaml
+++ b/csharp/test/Ice/hold/App.xaml
diff --git a/cs/test/Ice/hold/App.xaml.cs b/csharp/test/Ice/hold/App.xaml.cs
index ad364ac9729..ad364ac9729 100644
--- a/cs/test/Ice/hold/App.xaml.cs
+++ b/csharp/test/Ice/hold/App.xaml.cs
diff --git a/cs/test/Ice/hold/Client.cs b/csharp/test/Ice/hold/Client.cs
index 13898db84a9..13898db84a9 100644
--- a/cs/test/Ice/hold/Client.cs
+++ b/csharp/test/Ice/hold/Client.cs
diff --git a/cs/test/Ice/hold/HoldI.cs b/csharp/test/Ice/hold/HoldI.cs
index 921b26bd46d..921b26bd46d 100644
--- a/cs/test/Ice/hold/HoldI.cs
+++ b/csharp/test/Ice/hold/HoldI.cs
diff --git a/cs/test/Ice/hold/Makefile b/csharp/test/Ice/hold/Makefile
index 5b994e5239b..5b994e5239b 100644
--- a/cs/test/Ice/hold/Makefile
+++ b/csharp/test/Ice/hold/Makefile
diff --git a/cs/test/Ice/hold/Makefile.mak b/csharp/test/Ice/hold/Makefile.mak
index 7324317eb69..7324317eb69 100644
--- a/cs/test/Ice/hold/Makefile.mak
+++ b/csharp/test/Ice/hold/Makefile.mak
diff --git a/cs/test/Ice/hold/Properties/AppManifest.xml b/csharp/test/Ice/hold/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/hold/Properties/AppManifest.xml
+++ b/csharp/test/Ice/hold/Properties/AppManifest.xml
diff --git a/cs/test/Ice/hold/Properties/AssemblyInfo.cs b/csharp/test/Ice/hold/Properties/AssemblyInfo.cs
index 8880a944fd1..8880a944fd1 100644
--- a/cs/test/Ice/hold/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/hold/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/hold/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/hold/Properties/OutOfBrowserSettings.xml
index 9ff4f5ffbdb..9ff4f5ffbdb 100644
--- a/cs/test/Ice/hold/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/hold/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/hold/Server.cs b/csharp/test/Ice/hold/Server.cs
index f8ac61e9bfe..f8ac61e9bfe 100644
--- a/cs/test/Ice/hold/Server.cs
+++ b/csharp/test/Ice/hold/Server.cs
diff --git a/cs/test/Ice/hold/Test.ice b/csharp/test/Ice/hold/Test.ice
index 905f5f65430..905f5f65430 100644
--- a/cs/test/Ice/hold/Test.ice
+++ b/csharp/test/Ice/hold/Test.ice
diff --git a/cs/test/Ice/hold/Timer.cs b/csharp/test/Ice/hold/Timer.cs
index e05878f1cba..e05878f1cba 100644
--- a/cs/test/Ice/hold/Timer.cs
+++ b/csharp/test/Ice/hold/Timer.cs
diff --git a/cs/test/Ice/hold/client.exe.config b/csharp/test/Ice/hold/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/hold/client.exe.config
+++ b/csharp/test/Ice/hold/client.exe.config
diff --git a/cs/test/Ice/hold/generated/.gitignore b/csharp/test/Ice/hold/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/hold/generated/.gitignore
+++ b/csharp/test/Ice/hold/generated/.gitignore
diff --git a/cs/test/Ice/hold/generated/sl/.gitignore b/csharp/test/Ice/hold/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/hold/generated/sl/.gitignore
+++ b/csharp/test/Ice/hold/generated/sl/.gitignore
diff --git a/cs/test/Ice/hold/hold.csproj b/csharp/test/Ice/hold/hold.csproj
index fdbbd0f654e..fdbbd0f654e 100644
--- a/cs/test/Ice/hold/hold.csproj
+++ b/csharp/test/Ice/hold/hold.csproj
diff --git a/cs/test/Ice/hold/run.py b/csharp/test/Ice/hold/run.py
index 3f2e91f0009..3f2e91f0009 100755
--- a/cs/test/Ice/hold/run.py
+++ b/csharp/test/Ice/hold/run.py
diff --git a/cs/test/Ice/hold/server.exe.config b/csharp/test/Ice/hold/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/hold/server.exe.config
+++ b/csharp/test/Ice/hold/server.exe.config
diff --git a/cs/test/Ice/info/.depend.mak b/csharp/test/Ice/info/.depend.mak
index 4f93a6c3dac..4f93a6c3dac 100644
--- a/cs/test/Ice/info/.depend.mak
+++ b/csharp/test/Ice/info/.depend.mak
diff --git a/cs/test/Ice/info/.gitignore b/csharp/test/Ice/info/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/info/.gitignore
+++ b/csharp/test/Ice/info/.gitignore
diff --git a/cs/test/Ice/info/AllTests.cs b/csharp/test/Ice/info/AllTests.cs
index 87019626c24..87019626c24 100644
--- a/cs/test/Ice/info/AllTests.cs
+++ b/csharp/test/Ice/info/AllTests.cs
diff --git a/cs/test/Ice/info/App.xaml b/csharp/test/Ice/info/App.xaml
index 2757f4787a5..2757f4787a5 100644
--- a/cs/test/Ice/info/App.xaml
+++ b/csharp/test/Ice/info/App.xaml
diff --git a/cs/test/Ice/info/App.xaml.cs b/csharp/test/Ice/info/App.xaml.cs
index 44b7281dd2b..44b7281dd2b 100644
--- a/cs/test/Ice/info/App.xaml.cs
+++ b/csharp/test/Ice/info/App.xaml.cs
diff --git a/cs/test/Ice/info/Client.cs b/csharp/test/Ice/info/Client.cs
index 4f67e42dc5f..4f67e42dc5f 100644
--- a/cs/test/Ice/info/Client.cs
+++ b/csharp/test/Ice/info/Client.cs
diff --git a/cs/test/Ice/info/Makefile b/csharp/test/Ice/info/Makefile
index 8abd1b0dba3..8abd1b0dba3 100644
--- a/cs/test/Ice/info/Makefile
+++ b/csharp/test/Ice/info/Makefile
diff --git a/cs/test/Ice/info/Makefile.mak b/csharp/test/Ice/info/Makefile.mak
index 658b8916f17..658b8916f17 100644
--- a/cs/test/Ice/info/Makefile.mak
+++ b/csharp/test/Ice/info/Makefile.mak
diff --git a/cs/test/Ice/info/Properties/AppManifest.xml b/csharp/test/Ice/info/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/info/Properties/AppManifest.xml
+++ b/csharp/test/Ice/info/Properties/AppManifest.xml
diff --git a/cs/test/Ice/info/Properties/AssemblyInfo.cs b/csharp/test/Ice/info/Properties/AssemblyInfo.cs
index f3718262748..f3718262748 100644
--- a/cs/test/Ice/info/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/info/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/info/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/info/Properties/OutOfBrowserSettings.xml
index 84bfb9003b4..84bfb9003b4 100644
--- a/cs/test/Ice/info/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/info/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/info/Server.cs b/csharp/test/Ice/info/Server.cs
index 5bf1a9fc037..5bf1a9fc037 100644
--- a/cs/test/Ice/info/Server.cs
+++ b/csharp/test/Ice/info/Server.cs
diff --git a/cs/test/Ice/info/Test.ice b/csharp/test/Ice/info/Test.ice
index a71990ba3db..a71990ba3db 100644
--- a/cs/test/Ice/info/Test.ice
+++ b/csharp/test/Ice/info/Test.ice
diff --git a/cs/test/Ice/info/TestI.cs b/csharp/test/Ice/info/TestI.cs
index 3e15e9fecc1..3e15e9fecc1 100644
--- a/cs/test/Ice/info/TestI.cs
+++ b/csharp/test/Ice/info/TestI.cs
diff --git a/cs/test/Ice/info/client.exe.config b/csharp/test/Ice/info/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/info/client.exe.config
+++ b/csharp/test/Ice/info/client.exe.config
diff --git a/cs/test/Ice/info/generated/.gitignore b/csharp/test/Ice/info/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/info/generated/.gitignore
+++ b/csharp/test/Ice/info/generated/.gitignore
diff --git a/cs/test/Ice/info/generated/sl/.gitignore b/csharp/test/Ice/info/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/info/generated/sl/.gitignore
+++ b/csharp/test/Ice/info/generated/sl/.gitignore
diff --git a/cs/test/Ice/info/info.csproj b/csharp/test/Ice/info/info.csproj
index 691149100a0..691149100a0 100644
--- a/cs/test/Ice/info/info.csproj
+++ b/csharp/test/Ice/info/info.csproj
diff --git a/cs/test/Ice/info/run.py b/csharp/test/Ice/info/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/cs/test/Ice/info/run.py
+++ b/csharp/test/Ice/info/run.py
diff --git a/cs/test/Ice/info/server.exe.config b/csharp/test/Ice/info/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/info/server.exe.config
+++ b/csharp/test/Ice/info/server.exe.config
diff --git a/cs/test/Ice/inheritance/.depend.mak b/csharp/test/Ice/inheritance/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/inheritance/.depend.mak
+++ b/csharp/test/Ice/inheritance/.depend.mak
diff --git a/cs/test/Ice/inheritance/.gitignore b/csharp/test/Ice/inheritance/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/inheritance/.gitignore
+++ b/csharp/test/Ice/inheritance/.gitignore
diff --git a/cs/test/Ice/inheritance/AllTests.cs b/csharp/test/Ice/inheritance/AllTests.cs
index 75a7e69c840..75a7e69c840 100644
--- a/cs/test/Ice/inheritance/AllTests.cs
+++ b/csharp/test/Ice/inheritance/AllTests.cs
diff --git a/cs/test/Ice/inheritance/App.xaml b/csharp/test/Ice/inheritance/App.xaml
index 0f916c0fb2f..0f916c0fb2f 100644
--- a/cs/test/Ice/inheritance/App.xaml
+++ b/csharp/test/Ice/inheritance/App.xaml
diff --git a/cs/test/Ice/inheritance/App.xaml.cs b/csharp/test/Ice/inheritance/App.xaml.cs
index 89ca9e4738a..89ca9e4738a 100644
--- a/cs/test/Ice/inheritance/App.xaml.cs
+++ b/csharp/test/Ice/inheritance/App.xaml.cs
diff --git a/cs/test/Ice/inheritance/CAI.cs b/csharp/test/Ice/inheritance/CAI.cs
index 657870dea6a..657870dea6a 100644
--- a/cs/test/Ice/inheritance/CAI.cs
+++ b/csharp/test/Ice/inheritance/CAI.cs
diff --git a/cs/test/Ice/inheritance/CBI.cs b/csharp/test/Ice/inheritance/CBI.cs
index 55a4d8dae3d..55a4d8dae3d 100644
--- a/cs/test/Ice/inheritance/CBI.cs
+++ b/csharp/test/Ice/inheritance/CBI.cs
diff --git a/cs/test/Ice/inheritance/CCI.cs b/csharp/test/Ice/inheritance/CCI.cs
index 803d335fc42..803d335fc42 100644
--- a/cs/test/Ice/inheritance/CCI.cs
+++ b/csharp/test/Ice/inheritance/CCI.cs
diff --git a/cs/test/Ice/inheritance/CDI.cs b/csharp/test/Ice/inheritance/CDI.cs
index 93935f40fa2..93935f40fa2 100644
--- a/cs/test/Ice/inheritance/CDI.cs
+++ b/csharp/test/Ice/inheritance/CDI.cs
diff --git a/cs/test/Ice/inheritance/Client.cs b/csharp/test/Ice/inheritance/Client.cs
index ec74d88caac..ec74d88caac 100644
--- a/cs/test/Ice/inheritance/Client.cs
+++ b/csharp/test/Ice/inheritance/Client.cs
diff --git a/cs/test/Ice/inheritance/Collocated.cs b/csharp/test/Ice/inheritance/Collocated.cs
index 8c233d0c207..8c233d0c207 100644
--- a/cs/test/Ice/inheritance/Collocated.cs
+++ b/csharp/test/Ice/inheritance/Collocated.cs
diff --git a/cs/test/Ice/inheritance/IAI.cs b/csharp/test/Ice/inheritance/IAI.cs
index e2aca850c22..e2aca850c22 100644
--- a/cs/test/Ice/inheritance/IAI.cs
+++ b/csharp/test/Ice/inheritance/IAI.cs
diff --git a/cs/test/Ice/inheritance/IB1I.cs b/csharp/test/Ice/inheritance/IB1I.cs
index dd971d46476..dd971d46476 100644
--- a/cs/test/Ice/inheritance/IB1I.cs
+++ b/csharp/test/Ice/inheritance/IB1I.cs
diff --git a/cs/test/Ice/inheritance/IB2I.cs b/csharp/test/Ice/inheritance/IB2I.cs
index 9799ca0e763..9799ca0e763 100644
--- a/cs/test/Ice/inheritance/IB2I.cs
+++ b/csharp/test/Ice/inheritance/IB2I.cs
diff --git a/cs/test/Ice/inheritance/ICI.cs b/csharp/test/Ice/inheritance/ICI.cs
index d7e41eb5398..d7e41eb5398 100644
--- a/cs/test/Ice/inheritance/ICI.cs
+++ b/csharp/test/Ice/inheritance/ICI.cs
diff --git a/cs/test/Ice/inheritance/InitialI.cs b/csharp/test/Ice/inheritance/InitialI.cs
index a5dc984dd4d..a5dc984dd4d 100644
--- a/cs/test/Ice/inheritance/InitialI.cs
+++ b/csharp/test/Ice/inheritance/InitialI.cs
diff --git a/cs/test/Ice/inheritance/Makefile b/csharp/test/Ice/inheritance/Makefile
index b195c86fd74..b195c86fd74 100644
--- a/cs/test/Ice/inheritance/Makefile
+++ b/csharp/test/Ice/inheritance/Makefile
diff --git a/cs/test/Ice/inheritance/Makefile.mak b/csharp/test/Ice/inheritance/Makefile.mak
index 4efbda9bab1..4efbda9bab1 100644
--- a/cs/test/Ice/inheritance/Makefile.mak
+++ b/csharp/test/Ice/inheritance/Makefile.mak
diff --git a/cs/test/Ice/inheritance/Properties/AppManifest.xml b/csharp/test/Ice/inheritance/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/inheritance/Properties/AppManifest.xml
+++ b/csharp/test/Ice/inheritance/Properties/AppManifest.xml
diff --git a/cs/test/Ice/inheritance/Properties/AssemblyInfo.cs b/csharp/test/Ice/inheritance/Properties/AssemblyInfo.cs
index 9bdc94cab54..9bdc94cab54 100644
--- a/cs/test/Ice/inheritance/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/inheritance/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/inheritance/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/inheritance/Properties/OutOfBrowserSettings.xml
index 373b6028392..373b6028392 100644
--- a/cs/test/Ice/inheritance/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/inheritance/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/inheritance/Server.cs b/csharp/test/Ice/inheritance/Server.cs
index 63d0f637cf2..63d0f637cf2 100644
--- a/cs/test/Ice/inheritance/Server.cs
+++ b/csharp/test/Ice/inheritance/Server.cs
diff --git a/cs/test/Ice/inheritance/Test.ice b/csharp/test/Ice/inheritance/Test.ice
index 7dd63ee98b6..7dd63ee98b6 100644
--- a/cs/test/Ice/inheritance/Test.ice
+++ b/csharp/test/Ice/inheritance/Test.ice
diff --git a/cs/test/Ice/inheritance/client.exe.config b/csharp/test/Ice/inheritance/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/inheritance/client.exe.config
+++ b/csharp/test/Ice/inheritance/client.exe.config
diff --git a/cs/test/Ice/inheritance/collocated.exe.config b/csharp/test/Ice/inheritance/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/inheritance/collocated.exe.config
+++ b/csharp/test/Ice/inheritance/collocated.exe.config
diff --git a/cs/test/Ice/inheritance/generated/.gitignore b/csharp/test/Ice/inheritance/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/inheritance/generated/.gitignore
+++ b/csharp/test/Ice/inheritance/generated/.gitignore
diff --git a/cs/test/Ice/inheritance/generated/sl/.gitignore b/csharp/test/Ice/inheritance/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/inheritance/generated/sl/.gitignore
+++ b/csharp/test/Ice/inheritance/generated/sl/.gitignore
diff --git a/cs/test/Ice/inheritance/inheritance.csproj b/csharp/test/Ice/inheritance/inheritance.csproj
index d85c3be7128..d85c3be7128 100644
--- a/cs/test/Ice/inheritance/inheritance.csproj
+++ b/csharp/test/Ice/inheritance/inheritance.csproj
diff --git a/cs/test/Ice/inheritance/run.py b/csharp/test/Ice/inheritance/run.py
index ac7bc7f799e..ac7bc7f799e 100755
--- a/cs/test/Ice/inheritance/run.py
+++ b/csharp/test/Ice/inheritance/run.py
diff --git a/cs/test/Ice/inheritance/server.exe.config b/csharp/test/Ice/inheritance/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/inheritance/server.exe.config
+++ b/csharp/test/Ice/inheritance/server.exe.config
diff --git a/cs/test/Ice/interceptor/.depend.mak b/csharp/test/Ice/interceptor/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/interceptor/.depend.mak
+++ b/csharp/test/Ice/interceptor/.depend.mak
diff --git a/cs/test/Ice/interceptor/AMDInterceptorI.cs b/csharp/test/Ice/interceptor/AMDInterceptorI.cs
index 54c56b24f5d..54c56b24f5d 100644
--- a/cs/test/Ice/interceptor/AMDInterceptorI.cs
+++ b/csharp/test/Ice/interceptor/AMDInterceptorI.cs
diff --git a/cs/test/Ice/interceptor/Client.cs b/csharp/test/Ice/interceptor/Client.cs
index 984c6a99d96..984c6a99d96 100644
--- a/cs/test/Ice/interceptor/Client.cs
+++ b/csharp/test/Ice/interceptor/Client.cs
diff --git a/cs/test/Ice/interceptor/InterceptorI.cs b/csharp/test/Ice/interceptor/InterceptorI.cs
index 94a58c0c834..94a58c0c834 100644
--- a/cs/test/Ice/interceptor/InterceptorI.cs
+++ b/csharp/test/Ice/interceptor/InterceptorI.cs
diff --git a/cs/test/Ice/interceptor/Makefile b/csharp/test/Ice/interceptor/Makefile
index 54896639cd0..54896639cd0 100644
--- a/cs/test/Ice/interceptor/Makefile
+++ b/csharp/test/Ice/interceptor/Makefile
diff --git a/cs/test/Ice/interceptor/Makefile.mak b/csharp/test/Ice/interceptor/Makefile.mak
index e154f7ba845..e154f7ba845 100644
--- a/cs/test/Ice/interceptor/Makefile.mak
+++ b/csharp/test/Ice/interceptor/Makefile.mak
diff --git a/cs/test/Ice/interceptor/MyObjectI.cs b/csharp/test/Ice/interceptor/MyObjectI.cs
index 38bb5d6fb77..38bb5d6fb77 100644
--- a/cs/test/Ice/interceptor/MyObjectI.cs
+++ b/csharp/test/Ice/interceptor/MyObjectI.cs
diff --git a/cs/test/Ice/interceptor/Test.ice b/csharp/test/Ice/interceptor/Test.ice
index 4c2c4308b48..4c2c4308b48 100644
--- a/cs/test/Ice/interceptor/Test.ice
+++ b/csharp/test/Ice/interceptor/Test.ice
diff --git a/cs/test/Ice/interceptor/client.exe.config b/csharp/test/Ice/interceptor/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/interceptor/client.exe.config
+++ b/csharp/test/Ice/interceptor/client.exe.config
diff --git a/cs/test/Ice/interceptor/generated/.gitignore b/csharp/test/Ice/interceptor/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/interceptor/generated/.gitignore
+++ b/csharp/test/Ice/interceptor/generated/.gitignore
diff --git a/cs/test/Ice/interceptor/run.py b/csharp/test/Ice/interceptor/run.py
index 80a745c6826..80a745c6826 100755
--- a/cs/test/Ice/interceptor/run.py
+++ b/csharp/test/Ice/interceptor/run.py
diff --git a/cs/test/Ice/invoke/.depend.mak b/csharp/test/Ice/invoke/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/invoke/.depend.mak
+++ b/csharp/test/Ice/invoke/.depend.mak
diff --git a/cs/test/Ice/invoke/.gitignore b/csharp/test/Ice/invoke/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/invoke/.gitignore
+++ b/csharp/test/Ice/invoke/.gitignore
diff --git a/cs/test/Ice/invoke/AllTests.cs b/csharp/test/Ice/invoke/AllTests.cs
index 3c7da63ac76..3c7da63ac76 100644
--- a/cs/test/Ice/invoke/AllTests.cs
+++ b/csharp/test/Ice/invoke/AllTests.cs
diff --git a/cs/test/Ice/invoke/App.xaml b/csharp/test/Ice/invoke/App.xaml
index 361b38c2e99..361b38c2e99 100644
--- a/cs/test/Ice/invoke/App.xaml
+++ b/csharp/test/Ice/invoke/App.xaml
diff --git a/cs/test/Ice/invoke/App.xaml.cs b/csharp/test/Ice/invoke/App.xaml.cs
index 7618d553d63..7618d553d63 100644
--- a/cs/test/Ice/invoke/App.xaml.cs
+++ b/csharp/test/Ice/invoke/App.xaml.cs
diff --git a/cs/test/Ice/invoke/BlobjectI.cs b/csharp/test/Ice/invoke/BlobjectI.cs
index 4f24964d477..4f24964d477 100644
--- a/cs/test/Ice/invoke/BlobjectI.cs
+++ b/csharp/test/Ice/invoke/BlobjectI.cs
diff --git a/cs/test/Ice/invoke/Client.cs b/csharp/test/Ice/invoke/Client.cs
index 35c708584d1..35c708584d1 100644
--- a/cs/test/Ice/invoke/Client.cs
+++ b/csharp/test/Ice/invoke/Client.cs
diff --git a/cs/test/Ice/invoke/Makefile b/csharp/test/Ice/invoke/Makefile
index faaf7ad9f03..faaf7ad9f03 100644
--- a/cs/test/Ice/invoke/Makefile
+++ b/csharp/test/Ice/invoke/Makefile
diff --git a/cs/test/Ice/invoke/Makefile.mak b/csharp/test/Ice/invoke/Makefile.mak
index 8de9185b3b2..8de9185b3b2 100644
--- a/cs/test/Ice/invoke/Makefile.mak
+++ b/csharp/test/Ice/invoke/Makefile.mak
diff --git a/cs/test/Ice/invoke/Properties/AppManifest.xml b/csharp/test/Ice/invoke/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/invoke/Properties/AppManifest.xml
+++ b/csharp/test/Ice/invoke/Properties/AppManifest.xml
diff --git a/cs/test/Ice/invoke/Properties/AssemblyInfo.cs b/csharp/test/Ice/invoke/Properties/AssemblyInfo.cs
index 730df420dad..730df420dad 100644
--- a/cs/test/Ice/invoke/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/invoke/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/invoke/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/invoke/Properties/OutOfBrowserSettings.xml
index e82087156c3..e82087156c3 100644
--- a/cs/test/Ice/invoke/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/invoke/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/invoke/Server.cs b/csharp/test/Ice/invoke/Server.cs
index 791c1b9b766..791c1b9b766 100644
--- a/cs/test/Ice/invoke/Server.cs
+++ b/csharp/test/Ice/invoke/Server.cs
diff --git a/cs/test/Ice/invoke/Test.ice b/csharp/test/Ice/invoke/Test.ice
index 616fd001228..616fd001228 100644
--- a/cs/test/Ice/invoke/Test.ice
+++ b/csharp/test/Ice/invoke/Test.ice
diff --git a/cs/test/Ice/invoke/client.exe.config b/csharp/test/Ice/invoke/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/invoke/client.exe.config
+++ b/csharp/test/Ice/invoke/client.exe.config
diff --git a/cs/test/Ice/invoke/generated/.gitignore b/csharp/test/Ice/invoke/generated/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cs/test/Ice/invoke/generated/.gitignore
+++ b/csharp/test/Ice/invoke/generated/.gitignore
diff --git a/cs/test/Ice/invoke/generated/sl/.gitignore b/csharp/test/Ice/invoke/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/invoke/generated/sl/.gitignore
+++ b/csharp/test/Ice/invoke/generated/sl/.gitignore
diff --git a/cs/test/Ice/invoke/invoke.csproj b/csharp/test/Ice/invoke/invoke.csproj
index 57f33888a1b..57f33888a1b 100644
--- a/cs/test/Ice/invoke/invoke.csproj
+++ b/csharp/test/Ice/invoke/invoke.csproj
diff --git a/cs/test/Ice/invoke/run.py b/csharp/test/Ice/invoke/run.py
index e3172b537ae..e3172b537ae 100755
--- a/cs/test/Ice/invoke/run.py
+++ b/csharp/test/Ice/invoke/run.py
diff --git a/cs/test/Ice/invoke/server.exe.config b/csharp/test/Ice/invoke/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/invoke/server.exe.config
+++ b/csharp/test/Ice/invoke/server.exe.config
diff --git a/cs/test/Ice/location/.depend.mak b/csharp/test/Ice/location/.depend.mak
index 7260e53343b..7260e53343b 100644
--- a/cs/test/Ice/location/.depend.mak
+++ b/csharp/test/Ice/location/.depend.mak
diff --git a/cs/test/Ice/location/.gitignore b/csharp/test/Ice/location/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/location/.gitignore
+++ b/csharp/test/Ice/location/.gitignore
diff --git a/cs/test/Ice/location/AllTests.cs b/csharp/test/Ice/location/AllTests.cs
index 96cb6b39234..96cb6b39234 100644
--- a/cs/test/Ice/location/AllTests.cs
+++ b/csharp/test/Ice/location/AllTests.cs
diff --git a/cs/test/Ice/location/App.xaml b/csharp/test/Ice/location/App.xaml
index 396a62ba39a..396a62ba39a 100644
--- a/cs/test/Ice/location/App.xaml
+++ b/csharp/test/Ice/location/App.xaml
diff --git a/cs/test/Ice/location/App.xaml.cs b/csharp/test/Ice/location/App.xaml.cs
index 2b6dd1183ba..2b6dd1183ba 100644
--- a/cs/test/Ice/location/App.xaml.cs
+++ b/csharp/test/Ice/location/App.xaml.cs
diff --git a/cs/test/Ice/location/Client.cs b/csharp/test/Ice/location/Client.cs
index b3103cdebb4..b3103cdebb4 100644
--- a/cs/test/Ice/location/Client.cs
+++ b/csharp/test/Ice/location/Client.cs
diff --git a/cs/test/Ice/location/HelloI.cs b/csharp/test/Ice/location/HelloI.cs
index 34209d4217e..34209d4217e 100644
--- a/cs/test/Ice/location/HelloI.cs
+++ b/csharp/test/Ice/location/HelloI.cs
diff --git a/cs/test/Ice/location/Makefile b/csharp/test/Ice/location/Makefile
index 2d821803657..2d821803657 100644
--- a/cs/test/Ice/location/Makefile
+++ b/csharp/test/Ice/location/Makefile
diff --git a/cs/test/Ice/location/Makefile.mak b/csharp/test/Ice/location/Makefile.mak
index 866a5cde06e..866a5cde06e 100644
--- a/cs/test/Ice/location/Makefile.mak
+++ b/csharp/test/Ice/location/Makefile.mak
diff --git a/cs/test/Ice/location/Properties/AppManifest.xml b/csharp/test/Ice/location/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/location/Properties/AppManifest.xml
+++ b/csharp/test/Ice/location/Properties/AppManifest.xml
diff --git a/cs/test/Ice/location/Properties/AssemblyInfo.cs b/csharp/test/Ice/location/Properties/AssemblyInfo.cs
index 046602d3f94..046602d3f94 100644
--- a/cs/test/Ice/location/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/location/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/location/Properties/InBrowserSettings.xml b/csharp/test/Ice/location/Properties/InBrowserSettings.xml
index 0c41b0763ad..0c41b0763ad 100644
--- a/cs/test/Ice/location/Properties/InBrowserSettings.xml
+++ b/csharp/test/Ice/location/Properties/InBrowserSettings.xml
diff --git a/cs/test/Ice/location/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/location/Properties/OutOfBrowserSettings.xml
index 35a8f357a24..35a8f357a24 100644
--- a/cs/test/Ice/location/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/location/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/location/Server.cs b/csharp/test/Ice/location/Server.cs
index 96249535890..96249535890 100644
--- a/cs/test/Ice/location/Server.cs
+++ b/csharp/test/Ice/location/Server.cs
diff --git a/cs/test/Ice/location/ServerLocator.cs b/csharp/test/Ice/location/ServerLocator.cs
index f63d8d5c1ab..f63d8d5c1ab 100644
--- a/cs/test/Ice/location/ServerLocator.cs
+++ b/csharp/test/Ice/location/ServerLocator.cs
diff --git a/cs/test/Ice/location/ServerLocatorRegistry.cs b/csharp/test/Ice/location/ServerLocatorRegistry.cs
index e0b0ba01d10..e0b0ba01d10 100644
--- a/cs/test/Ice/location/ServerLocatorRegistry.cs
+++ b/csharp/test/Ice/location/ServerLocatorRegistry.cs
diff --git a/cs/test/Ice/location/ServerManagerI.cs b/csharp/test/Ice/location/ServerManagerI.cs
index 9987630c0c2..9987630c0c2 100644
--- a/cs/test/Ice/location/ServerManagerI.cs
+++ b/csharp/test/Ice/location/ServerManagerI.cs
diff --git a/cs/test/Ice/location/Test.ice b/csharp/test/Ice/location/Test.ice
index 6fc11ee2a8a..6fc11ee2a8a 100644
--- a/cs/test/Ice/location/Test.ice
+++ b/csharp/test/Ice/location/Test.ice
diff --git a/cs/test/Ice/location/TestI.cs b/csharp/test/Ice/location/TestI.cs
index 7dea5b04705..7dea5b04705 100644
--- a/cs/test/Ice/location/TestI.cs
+++ b/csharp/test/Ice/location/TestI.cs
diff --git a/cs/test/Ice/location/client.exe.config b/csharp/test/Ice/location/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/location/client.exe.config
+++ b/csharp/test/Ice/location/client.exe.config
diff --git a/cs/test/Ice/location/generated/.gitignore b/csharp/test/Ice/location/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/location/generated/.gitignore
+++ b/csharp/test/Ice/location/generated/.gitignore
diff --git a/cs/test/Ice/location/generated/sl/.gitignore b/csharp/test/Ice/location/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/location/generated/sl/.gitignore
+++ b/csharp/test/Ice/location/generated/sl/.gitignore
diff --git a/cs/test/Ice/location/location.csproj b/csharp/test/Ice/location/location.csproj
index 22488c63a56..22488c63a56 100644
--- a/cs/test/Ice/location/location.csproj
+++ b/csharp/test/Ice/location/location.csproj
diff --git a/cs/test/Ice/location/run.py b/csharp/test/Ice/location/run.py
index 3f2e91f0009..3f2e91f0009 100755
--- a/cs/test/Ice/location/run.py
+++ b/csharp/test/Ice/location/run.py
diff --git a/cs/test/Ice/location/server.exe.config b/csharp/test/Ice/location/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/location/server.exe.config
+++ b/csharp/test/Ice/location/server.exe.config
diff --git a/cs/test/Ice/metrics/.depend.mak b/csharp/test/Ice/metrics/.depend.mak
index ab202383ea9..ab202383ea9 100644
--- a/cs/test/Ice/metrics/.depend.mak
+++ b/csharp/test/Ice/metrics/.depend.mak
diff --git a/cs/test/Ice/metrics/AllTests.cs b/csharp/test/Ice/metrics/AllTests.cs
index 78aee790a12..78aee790a12 100644
--- a/cs/test/Ice/metrics/AllTests.cs
+++ b/csharp/test/Ice/metrics/AllTests.cs
diff --git a/cs/test/Ice/metrics/Client.cs b/csharp/test/Ice/metrics/Client.cs
index 784d0d9c6ef..784d0d9c6ef 100644
--- a/cs/test/Ice/metrics/Client.cs
+++ b/csharp/test/Ice/metrics/Client.cs
diff --git a/cs/test/Ice/metrics/Collocated.cs b/csharp/test/Ice/metrics/Collocated.cs
index dc986b2928a..dc986b2928a 100644
--- a/cs/test/Ice/metrics/Collocated.cs
+++ b/csharp/test/Ice/metrics/Collocated.cs
diff --git a/cs/test/Ice/metrics/InstrumentationI.cs b/csharp/test/Ice/metrics/InstrumentationI.cs
index 496d5145a7e..496d5145a7e 100644
--- a/cs/test/Ice/metrics/InstrumentationI.cs
+++ b/csharp/test/Ice/metrics/InstrumentationI.cs
diff --git a/cs/test/Ice/metrics/Makefile b/csharp/test/Ice/metrics/Makefile
index 0e0757da8c4..0e0757da8c4 100644
--- a/cs/test/Ice/metrics/Makefile
+++ b/csharp/test/Ice/metrics/Makefile
diff --git a/cs/test/Ice/metrics/Makefile.mak b/csharp/test/Ice/metrics/Makefile.mak
index 7b3f22a4786..7b3f22a4786 100644
--- a/cs/test/Ice/metrics/Makefile.mak
+++ b/csharp/test/Ice/metrics/Makefile.mak
diff --git a/cs/test/Ice/metrics/MetricsAMDI.cs b/csharp/test/Ice/metrics/MetricsAMDI.cs
index 2d146f0734e..2d146f0734e 100644
--- a/cs/test/Ice/metrics/MetricsAMDI.cs
+++ b/csharp/test/Ice/metrics/MetricsAMDI.cs
diff --git a/cs/test/Ice/metrics/MetricsI.cs b/csharp/test/Ice/metrics/MetricsI.cs
index f253d0d100e..f253d0d100e 100644
--- a/cs/test/Ice/metrics/MetricsI.cs
+++ b/csharp/test/Ice/metrics/MetricsI.cs
diff --git a/cs/test/Ice/metrics/Server.cs b/csharp/test/Ice/metrics/Server.cs
index 7898d843e3d..7898d843e3d 100644
--- a/cs/test/Ice/metrics/Server.cs
+++ b/csharp/test/Ice/metrics/Server.cs
diff --git a/cs/test/Ice/metrics/Test.ice b/csharp/test/Ice/metrics/Test.ice
index 6d5abb91996..6d5abb91996 100644
--- a/cs/test/Ice/metrics/Test.ice
+++ b/csharp/test/Ice/metrics/Test.ice
diff --git a/cs/test/Ice/metrics/TestAMD.ice b/csharp/test/Ice/metrics/TestAMD.ice
index 89d3b9efb4b..89d3b9efb4b 100644
--- a/cs/test/Ice/metrics/TestAMD.ice
+++ b/csharp/test/Ice/metrics/TestAMD.ice
diff --git a/cs/test/Ice/metrics/client.exe.config b/csharp/test/Ice/metrics/client.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/metrics/client.exe.config
+++ b/csharp/test/Ice/metrics/client.exe.config
diff --git a/cs/test/Ice/metrics/collocated.exe.config b/csharp/test/Ice/metrics/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/metrics/collocated.exe.config
+++ b/csharp/test/Ice/metrics/collocated.exe.config
diff --git a/cs/test/Ice/metrics/generated/.gitignore b/csharp/test/Ice/metrics/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/metrics/generated/.gitignore
+++ b/csharp/test/Ice/metrics/generated/.gitignore
diff --git a/cs/test/Ice/metrics/run.py b/csharp/test/Ice/metrics/run.py
index eadac777a2c..eadac777a2c 100755
--- a/cs/test/Ice/metrics/run.py
+++ b/csharp/test/Ice/metrics/run.py
diff --git a/cs/test/Ice/metrics/server.exe.config b/csharp/test/Ice/metrics/server.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/Ice/metrics/server.exe.config
+++ b/csharp/test/Ice/metrics/server.exe.config
diff --git a/cs/test/Ice/metrics/serveramd.exe.config b/csharp/test/Ice/metrics/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/metrics/serveramd.exe.config
+++ b/csharp/test/Ice/metrics/serveramd.exe.config
diff --git a/cs/test/Ice/networkProxy/.depend.mak b/csharp/test/Ice/networkProxy/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/networkProxy/.depend.mak
+++ b/csharp/test/Ice/networkProxy/.depend.mak
diff --git a/cs/test/Ice/networkProxy/.gitignore b/csharp/test/Ice/networkProxy/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/networkProxy/.gitignore
+++ b/csharp/test/Ice/networkProxy/.gitignore
diff --git a/cs/test/Ice/networkProxy/AllTests.cs b/csharp/test/Ice/networkProxy/AllTests.cs
index 5a915452b2b..5a915452b2b 100644
--- a/cs/test/Ice/networkProxy/AllTests.cs
+++ b/csharp/test/Ice/networkProxy/AllTests.cs
diff --git a/cs/test/Ice/networkProxy/Client.cs b/csharp/test/Ice/networkProxy/Client.cs
index 6991f4e9df6..6991f4e9df6 100644
--- a/cs/test/Ice/networkProxy/Client.cs
+++ b/csharp/test/Ice/networkProxy/Client.cs
diff --git a/cs/test/Ice/networkProxy/Makefile b/csharp/test/Ice/networkProxy/Makefile
index d3eb50af5cc..d3eb50af5cc 100644
--- a/cs/test/Ice/networkProxy/Makefile
+++ b/csharp/test/Ice/networkProxy/Makefile
diff --git a/cs/test/Ice/networkProxy/Makefile.mak b/csharp/test/Ice/networkProxy/Makefile.mak
index a411a25d123..a411a25d123 100644
--- a/cs/test/Ice/networkProxy/Makefile.mak
+++ b/csharp/test/Ice/networkProxy/Makefile.mak
diff --git a/cs/test/Ice/networkProxy/Server.cs b/csharp/test/Ice/networkProxy/Server.cs
index 41e65f360ed..41e65f360ed 100644
--- a/cs/test/Ice/networkProxy/Server.cs
+++ b/csharp/test/Ice/networkProxy/Server.cs
diff --git a/cs/test/Ice/networkProxy/Test.ice b/csharp/test/Ice/networkProxy/Test.ice
index 3e9c67cc40b..3e9c67cc40b 100644
--- a/cs/test/Ice/networkProxy/Test.ice
+++ b/csharp/test/Ice/networkProxy/Test.ice
diff --git a/cs/test/Ice/networkProxy/client.exe.config b/csharp/test/Ice/networkProxy/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/networkProxy/client.exe.config
+++ b/csharp/test/Ice/networkProxy/client.exe.config
diff --git a/cs/test/Ice/networkProxy/generated/.gitignore b/csharp/test/Ice/networkProxy/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/networkProxy/generated/.gitignore
+++ b/csharp/test/Ice/networkProxy/generated/.gitignore
diff --git a/cs/test/Ice/networkProxy/run.py b/csharp/test/Ice/networkProxy/run.py
index 143b054256a..143b054256a 100755
--- a/cs/test/Ice/networkProxy/run.py
+++ b/csharp/test/Ice/networkProxy/run.py
diff --git a/cs/test/Ice/networkProxy/server.exe.config b/csharp/test/Ice/networkProxy/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/networkProxy/server.exe.config
+++ b/csharp/test/Ice/networkProxy/server.exe.config
diff --git a/cs/test/Ice/objects/.depend.mak b/csharp/test/Ice/objects/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/objects/.depend.mak
+++ b/csharp/test/Ice/objects/.depend.mak
diff --git a/cs/test/Ice/objects/.gitignore b/csharp/test/Ice/objects/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/objects/.gitignore
+++ b/csharp/test/Ice/objects/.gitignore
diff --git a/cs/test/Ice/objects/AllTests.cs b/csharp/test/Ice/objects/AllTests.cs
index bae0fac3c72..bae0fac3c72 100644
--- a/cs/test/Ice/objects/AllTests.cs
+++ b/csharp/test/Ice/objects/AllTests.cs
diff --git a/cs/test/Ice/objects/App.xaml b/csharp/test/Ice/objects/App.xaml
index fe91eece391..fe91eece391 100644
--- a/cs/test/Ice/objects/App.xaml
+++ b/csharp/test/Ice/objects/App.xaml
diff --git a/cs/test/Ice/objects/App.xaml.cs b/csharp/test/Ice/objects/App.xaml.cs
index 36ca81edd5a..36ca81edd5a 100644
--- a/cs/test/Ice/objects/App.xaml.cs
+++ b/csharp/test/Ice/objects/App.xaml.cs
diff --git a/cs/test/Ice/objects/BI.cs b/csharp/test/Ice/objects/BI.cs
index 47a1445be4f..47a1445be4f 100644
--- a/cs/test/Ice/objects/BI.cs
+++ b/csharp/test/Ice/objects/BI.cs
diff --git a/cs/test/Ice/objects/CI.cs b/csharp/test/Ice/objects/CI.cs
index 53af4e1535b..53af4e1535b 100644
--- a/cs/test/Ice/objects/CI.cs
+++ b/csharp/test/Ice/objects/CI.cs
diff --git a/cs/test/Ice/objects/Client.cs b/csharp/test/Ice/objects/Client.cs
index ec74d88caac..ec74d88caac 100644
--- a/cs/test/Ice/objects/Client.cs
+++ b/csharp/test/Ice/objects/Client.cs
diff --git a/cs/test/Ice/objects/Collocated.cs b/csharp/test/Ice/objects/Collocated.cs
index 32a52cc64ed..32a52cc64ed 100644
--- a/cs/test/Ice/objects/Collocated.cs
+++ b/csharp/test/Ice/objects/Collocated.cs
diff --git a/cs/test/Ice/objects/DI.cs b/csharp/test/Ice/objects/DI.cs
index 0d2294b0370..0d2294b0370 100644
--- a/cs/test/Ice/objects/DI.cs
+++ b/csharp/test/Ice/objects/DI.cs
diff --git a/cs/test/Ice/objects/EI.cs b/csharp/test/Ice/objects/EI.cs
index 43338aee119..43338aee119 100644
--- a/cs/test/Ice/objects/EI.cs
+++ b/csharp/test/Ice/objects/EI.cs
diff --git a/cs/test/Ice/objects/FI.cs b/csharp/test/Ice/objects/FI.cs
index d4d0b56fed0..d4d0b56fed0 100644
--- a/cs/test/Ice/objects/FI.cs
+++ b/csharp/test/Ice/objects/FI.cs
diff --git a/cs/test/Ice/objects/HI.cs b/csharp/test/Ice/objects/HI.cs
index ff82ef32339..ff82ef32339 100644
--- a/cs/test/Ice/objects/HI.cs
+++ b/csharp/test/Ice/objects/HI.cs
diff --git a/cs/test/Ice/objects/II.cs b/csharp/test/Ice/objects/II.cs
index 733b4f7ee05..733b4f7ee05 100644
--- a/cs/test/Ice/objects/II.cs
+++ b/csharp/test/Ice/objects/II.cs
diff --git a/cs/test/Ice/objects/InitialI.cs b/csharp/test/Ice/objects/InitialI.cs
index 2ea6ca9f14f..2ea6ca9f14f 100644
--- a/cs/test/Ice/objects/InitialI.cs
+++ b/csharp/test/Ice/objects/InitialI.cs
diff --git a/cs/test/Ice/objects/JI.cs b/csharp/test/Ice/objects/JI.cs
index 8eb491a9e8a..8eb491a9e8a 100644
--- a/cs/test/Ice/objects/JI.cs
+++ b/csharp/test/Ice/objects/JI.cs
diff --git a/cs/test/Ice/objects/Makefile b/csharp/test/Ice/objects/Makefile
index 709bfb46dc6..709bfb46dc6 100644
--- a/cs/test/Ice/objects/Makefile
+++ b/csharp/test/Ice/objects/Makefile
diff --git a/cs/test/Ice/objects/Makefile.mak b/csharp/test/Ice/objects/Makefile.mak
index 677ceac393e..677ceac393e 100644
--- a/cs/test/Ice/objects/Makefile.mak
+++ b/csharp/test/Ice/objects/Makefile.mak
diff --git a/cs/test/Ice/objects/Properties/AppManifest.xml b/csharp/test/Ice/objects/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/objects/Properties/AppManifest.xml
+++ b/csharp/test/Ice/objects/Properties/AppManifest.xml
diff --git a/cs/test/Ice/objects/Properties/AssemblyInfo.cs b/csharp/test/Ice/objects/Properties/AssemblyInfo.cs
index 60ae7a47a1c..60ae7a47a1c 100644
--- a/cs/test/Ice/objects/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/objects/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/objects/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/objects/Properties/OutOfBrowserSettings.xml
index 1632458fbdd..1632458fbdd 100644
--- a/cs/test/Ice/objects/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/objects/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/objects/Server.cs b/csharp/test/Ice/objects/Server.cs
index 3e8b124ee78..3e8b124ee78 100644
--- a/cs/test/Ice/objects/Server.cs
+++ b/csharp/test/Ice/objects/Server.cs
diff --git a/cs/test/Ice/objects/Test.ice b/csharp/test/Ice/objects/Test.ice
index abbc1b87dc2..abbc1b87dc2 100644
--- a/cs/test/Ice/objects/Test.ice
+++ b/csharp/test/Ice/objects/Test.ice
diff --git a/cs/test/Ice/objects/UnexpectedObjectExceptionTestI.cs b/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs
index 50320e057a1..50320e057a1 100644
--- a/cs/test/Ice/objects/UnexpectedObjectExceptionTestI.cs
+++ b/csharp/test/Ice/objects/UnexpectedObjectExceptionTestI.cs
diff --git a/cs/test/Ice/objects/client.exe.config b/csharp/test/Ice/objects/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/objects/client.exe.config
+++ b/csharp/test/Ice/objects/client.exe.config
diff --git a/cs/test/Ice/objects/collocated.exe.config b/csharp/test/Ice/objects/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/objects/collocated.exe.config
+++ b/csharp/test/Ice/objects/collocated.exe.config
diff --git a/cs/test/Ice/objects/generated/.gitignore b/csharp/test/Ice/objects/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/objects/generated/.gitignore
+++ b/csharp/test/Ice/objects/generated/.gitignore
diff --git a/cs/test/Ice/objects/generated/sl/.gitignore b/csharp/test/Ice/objects/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/objects/generated/sl/.gitignore
+++ b/csharp/test/Ice/objects/generated/sl/.gitignore
diff --git a/cs/test/Ice/objects/objects.csproj b/csharp/test/Ice/objects/objects.csproj
index fa60b0a8a65..fa60b0a8a65 100644
--- a/cs/test/Ice/objects/objects.csproj
+++ b/csharp/test/Ice/objects/objects.csproj
diff --git a/cs/test/Ice/objects/run.py b/csharp/test/Ice/objects/run.py
index bad83a5b610..bad83a5b610 100755
--- a/cs/test/Ice/objects/run.py
+++ b/csharp/test/Ice/objects/run.py
diff --git a/cs/test/Ice/objects/server.exe.config b/csharp/test/Ice/objects/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/objects/server.exe.config
+++ b/csharp/test/Ice/objects/server.exe.config
diff --git a/cs/test/Ice/operations/.depend.mak b/csharp/test/Ice/operations/.depend.mak
index 69aba890824..69aba890824 100644
--- a/cs/test/Ice/operations/.depend.mak
+++ b/csharp/test/Ice/operations/.depend.mak
diff --git a/cs/test/Ice/operations/.gitignore b/csharp/test/Ice/operations/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/operations/.gitignore
+++ b/csharp/test/Ice/operations/.gitignore
diff --git a/cs/test/Ice/operations/AllTests.cs b/csharp/test/Ice/operations/AllTests.cs
index d1e49f61c9b..d1e49f61c9b 100644
--- a/cs/test/Ice/operations/AllTests.cs
+++ b/csharp/test/Ice/operations/AllTests.cs
diff --git a/cs/test/Ice/operations/App.xaml b/csharp/test/Ice/operations/App.xaml
index 0e11fa2bbcc..0e11fa2bbcc 100644
--- a/cs/test/Ice/operations/App.xaml
+++ b/csharp/test/Ice/operations/App.xaml
diff --git a/cs/test/Ice/operations/App.xaml.cs b/csharp/test/Ice/operations/App.xaml.cs
index 22d23f38fc3..22d23f38fc3 100644
--- a/cs/test/Ice/operations/App.xaml.cs
+++ b/csharp/test/Ice/operations/App.xaml.cs
diff --git a/cs/test/Ice/operations/BatchOneways.cs b/csharp/test/Ice/operations/BatchOneways.cs
index 973ec3ff594..973ec3ff594 100644
--- a/cs/test/Ice/operations/BatchOneways.cs
+++ b/csharp/test/Ice/operations/BatchOneways.cs
diff --git a/cs/test/Ice/operations/BatchOnewaysAMI.cs b/csharp/test/Ice/operations/BatchOnewaysAMI.cs
index 3951101c5b3..3951101c5b3 100644
--- a/cs/test/Ice/operations/BatchOnewaysAMI.cs
+++ b/csharp/test/Ice/operations/BatchOnewaysAMI.cs
diff --git a/cs/test/Ice/operations/Client.cs b/csharp/test/Ice/operations/Client.cs
index fe7c64a736d..fe7c64a736d 100644
--- a/cs/test/Ice/operations/Client.cs
+++ b/csharp/test/Ice/operations/Client.cs
diff --git a/cs/test/Ice/operations/Collocated.cs b/csharp/test/Ice/operations/Collocated.cs
index 679ff95d596..679ff95d596 100644
--- a/cs/test/Ice/operations/Collocated.cs
+++ b/csharp/test/Ice/operations/Collocated.cs
diff --git a/cs/test/Ice/operations/Makefile b/csharp/test/Ice/operations/Makefile
index 5b3ccb0ea10..5b3ccb0ea10 100644
--- a/cs/test/Ice/operations/Makefile
+++ b/csharp/test/Ice/operations/Makefile
diff --git a/cs/test/Ice/operations/Makefile.mak b/csharp/test/Ice/operations/Makefile.mak
index b4d626e50d1..b4d626e50d1 100644
--- a/cs/test/Ice/operations/Makefile.mak
+++ b/csharp/test/Ice/operations/Makefile.mak
diff --git a/cs/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs
index f5e8333e71b..f5e8333e71b 100644
--- a/cs/test/Ice/operations/MyDerivedClassAMDI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs
diff --git a/cs/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs
index b30a9821d53..b30a9821d53 100644
--- a/cs/test/Ice/operations/MyDerivedClassAMDTieI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs
diff --git a/cs/test/Ice/operations/MyDerivedClassI.cs b/csharp/test/Ice/operations/MyDerivedClassI.cs
index 60a8d90dd68..60a8d90dd68 100644
--- a/cs/test/Ice/operations/MyDerivedClassI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassI.cs
diff --git a/cs/test/Ice/operations/MyDerivedClassTieI.cs b/csharp/test/Ice/operations/MyDerivedClassTieI.cs
index a0a5722c61b..a0a5722c61b 100644
--- a/cs/test/Ice/operations/MyDerivedClassTieI.cs
+++ b/csharp/test/Ice/operations/MyDerivedClassTieI.cs
diff --git a/cs/test/Ice/operations/Oneways.cs b/csharp/test/Ice/operations/Oneways.cs
index 79d2ed6d2f5..79d2ed6d2f5 100644
--- a/cs/test/Ice/operations/Oneways.cs
+++ b/csharp/test/Ice/operations/Oneways.cs
diff --git a/cs/test/Ice/operations/OnewaysAMI.cs b/csharp/test/Ice/operations/OnewaysAMI.cs
index 1911a89c075..1911a89c075 100644
--- a/cs/test/Ice/operations/OnewaysAMI.cs
+++ b/csharp/test/Ice/operations/OnewaysAMI.cs
diff --git a/cs/test/Ice/operations/Properties/AppManifest.xml b/csharp/test/Ice/operations/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/operations/Properties/AppManifest.xml
+++ b/csharp/test/Ice/operations/Properties/AppManifest.xml
diff --git a/cs/test/Ice/operations/Properties/AssemblyInfo.cs b/csharp/test/Ice/operations/Properties/AssemblyInfo.cs
index f867f174a19..f867f174a19 100644
--- a/cs/test/Ice/operations/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/operations/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/operations/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/operations/Properties/OutOfBrowserSettings.xml
index b2ec0136f6d..b2ec0136f6d 100644
--- a/cs/test/Ice/operations/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/operations/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/operations/Server.cs b/csharp/test/Ice/operations/Server.cs
index 6784b176c25..6784b176c25 100644
--- a/cs/test/Ice/operations/Server.cs
+++ b/csharp/test/Ice/operations/Server.cs
diff --git a/cs/test/Ice/operations/Test.ice b/csharp/test/Ice/operations/Test.ice
index 5a0d3252c02..5a0d3252c02 100644
--- a/cs/test/Ice/operations/Test.ice
+++ b/csharp/test/Ice/operations/Test.ice
diff --git a/cs/test/Ice/operations/TestAMD.ice b/csharp/test/Ice/operations/TestAMD.ice
index b0c78b61b1e..b0c78b61b1e 100644
--- a/cs/test/Ice/operations/TestAMD.ice
+++ b/csharp/test/Ice/operations/TestAMD.ice
diff --git a/cs/test/Ice/operations/Twoways.cs b/csharp/test/Ice/operations/Twoways.cs
index 1d322d8d96d..1d322d8d96d 100644
--- a/cs/test/Ice/operations/Twoways.cs
+++ b/csharp/test/Ice/operations/Twoways.cs
diff --git a/cs/test/Ice/operations/TwowaysAMI.cs b/csharp/test/Ice/operations/TwowaysAMI.cs
index 610178aee1b..610178aee1b 100644
--- a/cs/test/Ice/operations/TwowaysAMI.cs
+++ b/csharp/test/Ice/operations/TwowaysAMI.cs
diff --git a/cs/test/Ice/operations/client.exe.config b/csharp/test/Ice/operations/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/operations/client.exe.config
+++ b/csharp/test/Ice/operations/client.exe.config
diff --git a/cs/test/Ice/operations/collocated.exe.config b/csharp/test/Ice/operations/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/operations/collocated.exe.config
+++ b/csharp/test/Ice/operations/collocated.exe.config
diff --git a/cs/test/Ice/operations/generated/.gitignore b/csharp/test/Ice/operations/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/operations/generated/.gitignore
+++ b/csharp/test/Ice/operations/generated/.gitignore
diff --git a/cs/test/Ice/operations/generated/sl/.gitignore b/csharp/test/Ice/operations/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/operations/generated/sl/.gitignore
+++ b/csharp/test/Ice/operations/generated/sl/.gitignore
diff --git a/cs/test/Ice/operations/operations.csproj b/csharp/test/Ice/operations/operations.csproj
index 7f42348ea29..7f42348ea29 100644
--- a/cs/test/Ice/operations/operations.csproj
+++ b/csharp/test/Ice/operations/operations.csproj
diff --git a/cs/test/Ice/operations/run.py b/csharp/test/Ice/operations/run.py
index 08eda9b1ee1..08eda9b1ee1 100755
--- a/cs/test/Ice/operations/run.py
+++ b/csharp/test/Ice/operations/run.py
diff --git a/cs/test/Ice/operations/server.exe.config b/csharp/test/Ice/operations/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/operations/server.exe.config
+++ b/csharp/test/Ice/operations/server.exe.config
diff --git a/cs/test/Ice/operations/serveramd.exe.config b/csharp/test/Ice/operations/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/operations/serveramd.exe.config
+++ b/csharp/test/Ice/operations/serveramd.exe.config
diff --git a/cs/test/Ice/operations/serveramdtie.exe.config b/csharp/test/Ice/operations/serveramdtie.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/operations/serveramdtie.exe.config
+++ b/csharp/test/Ice/operations/serveramdtie.exe.config
diff --git a/cs/test/Ice/operations/servertie.exe.config b/csharp/test/Ice/operations/servertie.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/operations/servertie.exe.config
+++ b/csharp/test/Ice/operations/servertie.exe.config
diff --git a/cs/test/Ice/optional/.depend.mak b/csharp/test/Ice/optional/.depend.mak
index ab202383ea9..ab202383ea9 100644
--- a/cs/test/Ice/optional/.depend.mak
+++ b/csharp/test/Ice/optional/.depend.mak
diff --git a/cs/test/Ice/optional/AllTests.cs b/csharp/test/Ice/optional/AllTests.cs
index 6d36d6cebff..6d36d6cebff 100644
--- a/cs/test/Ice/optional/AllTests.cs
+++ b/csharp/test/Ice/optional/AllTests.cs
diff --git a/cs/test/Ice/optional/App.xaml b/csharp/test/Ice/optional/App.xaml
index 58625c9971c..58625c9971c 100644
--- a/cs/test/Ice/optional/App.xaml
+++ b/csharp/test/Ice/optional/App.xaml
diff --git a/cs/test/Ice/optional/App.xaml.cs b/csharp/test/Ice/optional/App.xaml.cs
index 2d136ffd6bf..2d136ffd6bf 100644
--- a/cs/test/Ice/optional/App.xaml.cs
+++ b/csharp/test/Ice/optional/App.xaml.cs
diff --git a/cs/test/Ice/optional/AppManifest.xaml b/csharp/test/Ice/optional/AppManifest.xaml
index 42ceabde133..42ceabde133 100644
--- a/cs/test/Ice/optional/AppManifest.xaml
+++ b/csharp/test/Ice/optional/AppManifest.xaml
diff --git a/cs/test/Ice/optional/Client.cs b/csharp/test/Ice/optional/Client.cs
index abbf4525d92..abbf4525d92 100644
--- a/cs/test/Ice/optional/Client.cs
+++ b/csharp/test/Ice/optional/Client.cs
diff --git a/cs/test/Ice/optional/Makefile b/csharp/test/Ice/optional/Makefile
index 9344909542d..9344909542d 100644
--- a/cs/test/Ice/optional/Makefile
+++ b/csharp/test/Ice/optional/Makefile
diff --git a/cs/test/Ice/optional/Makefile.mak b/csharp/test/Ice/optional/Makefile.mak
index e8eaf40aa57..e8eaf40aa57 100644
--- a/cs/test/Ice/optional/Makefile.mak
+++ b/csharp/test/Ice/optional/Makefile.mak
diff --git a/cs/test/Ice/optional/Properties/AppManifest.xml b/csharp/test/Ice/optional/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/optional/Properties/AppManifest.xml
+++ b/csharp/test/Ice/optional/Properties/AppManifest.xml
diff --git a/cs/test/Ice/optional/Properties/AssemblyInfo.cs b/csharp/test/Ice/optional/Properties/AssemblyInfo.cs
index 80ba2c31f5f..80ba2c31f5f 100644
--- a/cs/test/Ice/optional/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/optional/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/optional/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/optional/Properties/OutOfBrowserSettings.xml
index 44c5c79f24f..44c5c79f24f 100644
--- a/cs/test/Ice/optional/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/optional/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/optional/SerializableClass.cs b/csharp/test/Ice/optional/SerializableClass.cs
index 81528a56215..81528a56215 100644
--- a/cs/test/Ice/optional/SerializableClass.cs
+++ b/csharp/test/Ice/optional/SerializableClass.cs
diff --git a/cs/test/Ice/optional/Server.cs b/csharp/test/Ice/optional/Server.cs
index d00c94e9d24..d00c94e9d24 100644
--- a/cs/test/Ice/optional/Server.cs
+++ b/csharp/test/Ice/optional/Server.cs
diff --git a/cs/test/Ice/optional/ServerAMD.cs b/csharp/test/Ice/optional/ServerAMD.cs
index 7385c4134cf..7385c4134cf 100644
--- a/cs/test/Ice/optional/ServerAMD.cs
+++ b/csharp/test/Ice/optional/ServerAMD.cs
diff --git a/cs/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice
index 3bb23ee1ffa..3bb23ee1ffa 100644
--- a/cs/test/Ice/optional/Test.ice
+++ b/csharp/test/Ice/optional/Test.ice
diff --git a/cs/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice
index 19456c8dab3..19456c8dab3 100644
--- a/cs/test/Ice/optional/TestAMD.ice
+++ b/csharp/test/Ice/optional/TestAMD.ice
diff --git a/cs/test/Ice/optional/TestAMDI.cs b/csharp/test/Ice/optional/TestAMDI.cs
index 8bde293aa40..8bde293aa40 100644
--- a/cs/test/Ice/optional/TestAMDI.cs
+++ b/csharp/test/Ice/optional/TestAMDI.cs
diff --git a/cs/test/Ice/optional/TestI.cs b/csharp/test/Ice/optional/TestI.cs
index 44e09fcaa92..44e09fcaa92 100644
--- a/cs/test/Ice/optional/TestI.cs
+++ b/csharp/test/Ice/optional/TestI.cs
diff --git a/cs/test/Ice/optional/client.exe.config b/csharp/test/Ice/optional/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/optional/client.exe.config
+++ b/csharp/test/Ice/optional/client.exe.config
diff --git a/cs/test/Ice/optional/generated/.gitignore b/csharp/test/Ice/optional/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/optional/generated/.gitignore
+++ b/csharp/test/Ice/optional/generated/.gitignore
diff --git a/cs/test/Ice/optional/generated/sl/.gitignore b/csharp/test/Ice/optional/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/optional/generated/sl/.gitignore
+++ b/csharp/test/Ice/optional/generated/sl/.gitignore
diff --git a/cs/test/Ice/optional/optional.csproj b/csharp/test/Ice/optional/optional.csproj
index afdf28f8959..afdf28f8959 100644
--- a/cs/test/Ice/optional/optional.csproj
+++ b/csharp/test/Ice/optional/optional.csproj
diff --git a/cs/test/Ice/optional/optionalTestPage.html b/csharp/test/Ice/optional/optionalTestPage.html
index 9d76a58e583..9d76a58e583 100644
--- a/cs/test/Ice/optional/optionalTestPage.html
+++ b/csharp/test/Ice/optional/optionalTestPage.html
diff --git a/cs/test/Ice/optional/run.py b/csharp/test/Ice/optional/run.py
index 95214f14a11..95214f14a11 100755
--- a/cs/test/Ice/optional/run.py
+++ b/csharp/test/Ice/optional/run.py
diff --git a/cs/test/Ice/optional/server.exe.config b/csharp/test/Ice/optional/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/optional/server.exe.config
+++ b/csharp/test/Ice/optional/server.exe.config
diff --git a/cs/test/Ice/optional/serveramd.exe.config b/csharp/test/Ice/optional/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/optional/serveramd.exe.config
+++ b/csharp/test/Ice/optional/serveramd.exe.config
diff --git a/cs/test/Ice/plugin/BasePlugin.cs b/csharp/test/Ice/plugin/BasePlugin.cs
index 834ab445a02..834ab445a02 100644
--- a/cs/test/Ice/plugin/BasePlugin.cs
+++ b/csharp/test/Ice/plugin/BasePlugin.cs
diff --git a/cs/test/Ice/plugin/BasePluginFail.cs b/csharp/test/Ice/plugin/BasePluginFail.cs
index b10a0a584b6..b10a0a584b6 100644
--- a/cs/test/Ice/plugin/BasePluginFail.cs
+++ b/csharp/test/Ice/plugin/BasePluginFail.cs
diff --git a/cs/test/Ice/plugin/Client.cs b/csharp/test/Ice/plugin/Client.cs
index bf714113a14..bf714113a14 100644
--- a/cs/test/Ice/plugin/Client.cs
+++ b/csharp/test/Ice/plugin/Client.cs
diff --git a/cs/test/Ice/plugin/Makefile b/csharp/test/Ice/plugin/Makefile
index 24eb434f446..24eb434f446 100644
--- a/cs/test/Ice/plugin/Makefile
+++ b/csharp/test/Ice/plugin/Makefile
diff --git a/cs/test/Ice/plugin/Makefile.mak b/csharp/test/Ice/plugin/Makefile.mak
index c5b125a9b87..c5b125a9b87 100644
--- a/cs/test/Ice/plugin/Makefile.mak
+++ b/csharp/test/Ice/plugin/Makefile.mak
diff --git a/cs/test/Ice/plugin/PluginFactory.cs b/csharp/test/Ice/plugin/PluginFactory.cs
index 578f5104218..578f5104218 100644
--- a/cs/test/Ice/plugin/PluginFactory.cs
+++ b/csharp/test/Ice/plugin/PluginFactory.cs
diff --git a/cs/test/Ice/plugin/PluginInitializeFailException.cs b/csharp/test/Ice/plugin/PluginInitializeFailException.cs
index 0b7051134a4..0b7051134a4 100644
--- a/cs/test/Ice/plugin/PluginInitializeFailException.cs
+++ b/csharp/test/Ice/plugin/PluginInitializeFailException.cs
diff --git a/cs/test/Ice/plugin/PluginInitializeFailFactory.cs b/csharp/test/Ice/plugin/PluginInitializeFailFactory.cs
index e2e03825698..e2e03825698 100644
--- a/cs/test/Ice/plugin/PluginInitializeFailFactory.cs
+++ b/csharp/test/Ice/plugin/PluginInitializeFailFactory.cs
diff --git a/cs/test/Ice/plugin/PluginOneFactory.cs b/csharp/test/Ice/plugin/PluginOneFactory.cs
index 7cb5fc85855..7cb5fc85855 100644
--- a/cs/test/Ice/plugin/PluginOneFactory.cs
+++ b/csharp/test/Ice/plugin/PluginOneFactory.cs
diff --git a/cs/test/Ice/plugin/PluginOneFailFactory.cs b/csharp/test/Ice/plugin/PluginOneFailFactory.cs
index 6326e899fdd..6326e899fdd 100644
--- a/cs/test/Ice/plugin/PluginOneFailFactory.cs
+++ b/csharp/test/Ice/plugin/PluginOneFailFactory.cs
diff --git a/cs/test/Ice/plugin/PluginThreeFactory.cs b/csharp/test/Ice/plugin/PluginThreeFactory.cs
index b9f9b9e5b8e..b9f9b9e5b8e 100644
--- a/cs/test/Ice/plugin/PluginThreeFactory.cs
+++ b/csharp/test/Ice/plugin/PluginThreeFactory.cs
diff --git a/cs/test/Ice/plugin/PluginThreeFailFactory.cs b/csharp/test/Ice/plugin/PluginThreeFailFactory.cs
index e2d20165f3f..e2d20165f3f 100644
--- a/cs/test/Ice/plugin/PluginThreeFailFactory.cs
+++ b/csharp/test/Ice/plugin/PluginThreeFailFactory.cs
diff --git a/cs/test/Ice/plugin/PluginTwoFactory.cs b/csharp/test/Ice/plugin/PluginTwoFactory.cs
index eeb8330e4e7..eeb8330e4e7 100644
--- a/cs/test/Ice/plugin/PluginTwoFactory.cs
+++ b/csharp/test/Ice/plugin/PluginTwoFactory.cs
diff --git a/cs/test/Ice/plugin/PluginTwoFailFactory.cs b/csharp/test/Ice/plugin/PluginTwoFailFactory.cs
index 6671789f00d..6671789f00d 100644
--- a/cs/test/Ice/plugin/PluginTwoFailFactory.cs
+++ b/csharp/test/Ice/plugin/PluginTwoFailFactory.cs
diff --git a/cs/test/Ice/plugin/client.exe.config b/csharp/test/Ice/plugin/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/plugin/client.exe.config
+++ b/csharp/test/Ice/plugin/client.exe.config
diff --git a/cs/test/Ice/plugin/plugins/.gitignore b/csharp/test/Ice/plugin/plugins/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cs/test/Ice/plugin/plugins/.gitignore
+++ b/csharp/test/Ice/plugin/plugins/.gitignore
diff --git a/cs/test/Ice/plugin/run.py b/csharp/test/Ice/plugin/run.py
index dbc76af9e30..dbc76af9e30 100755
--- a/cs/test/Ice/plugin/run.py
+++ b/csharp/test/Ice/plugin/run.py
diff --git a/cs/test/Ice/properties/Client.cs b/csharp/test/Ice/properties/Client.cs
index b7256afb19b..b7256afb19b 100644
--- a/cs/test/Ice/properties/Client.cs
+++ b/csharp/test/Ice/properties/Client.cs
diff --git a/cs/test/Ice/properties/Makefile b/csharp/test/Ice/properties/Makefile
index 15a224387e1..15a224387e1 100644
--- a/cs/test/Ice/properties/Makefile
+++ b/csharp/test/Ice/properties/Makefile
diff --git a/cs/test/Ice/properties/Makefile.mak b/csharp/test/Ice/properties/Makefile.mak
index 5edb5a800ce..5edb5a800ce 100644
--- a/cs/test/Ice/properties/Makefile.mak
+++ b/csharp/test/Ice/properties/Makefile.mak
diff --git a/cs/test/Ice/properties/client.exe.config b/csharp/test/Ice/properties/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/properties/client.exe.config
+++ b/csharp/test/Ice/properties/client.exe.config
diff --git a/cs/test/Ice/properties/config/.gitignore b/csharp/test/Ice/properties/config/.gitignore
index 143c64680f3..143c64680f3 100644
--- a/cs/test/Ice/properties/config/.gitignore
+++ b/csharp/test/Ice/properties/config/.gitignore
diff --git a/cs/test/Ice/properties/config/config.1 b/csharp/test/Ice/properties/config/config.1
index 2a20653e4c5..2a20653e4c5 100644
--- a/cs/test/Ice/properties/config/config.1
+++ b/csharp/test/Ice/properties/config/config.1
diff --git a/cs/test/Ice/properties/config/config.2 b/csharp/test/Ice/properties/config/config.2
index be276df6602..be276df6602 100644
--- a/cs/test/Ice/properties/config/config.2
+++ b/csharp/test/Ice/properties/config/config.2
diff --git a/cs/test/Ice/properties/config/config.3 b/csharp/test/Ice/properties/config/config.3
index 55c1e1123f6..55c1e1123f6 100644
--- a/cs/test/Ice/properties/config/config.3
+++ b/csharp/test/Ice/properties/config/config.3
diff --git a/cs/test/Ice/properties/config/escapes.cfg b/csharp/test/Ice/properties/config/escapes.cfg
index f438d2b59c8..f438d2b59c8 100644
--- a/cs/test/Ice/properties/config/escapes.cfg
+++ b/csharp/test/Ice/properties/config/escapes.cfg
diff --git a/cs/test/Ice/properties/run.py b/csharp/test/Ice/properties/run.py
index c6ce2b8cfad..c6ce2b8cfad 100755
--- a/cs/test/Ice/properties/run.py
+++ b/csharp/test/Ice/properties/run.py
diff --git a/cs/test/Ice/proxy/.depend.mak b/csharp/test/Ice/proxy/.depend.mak
index 69aba890824..69aba890824 100644
--- a/cs/test/Ice/proxy/.depend.mak
+++ b/csharp/test/Ice/proxy/.depend.mak
diff --git a/cs/test/Ice/proxy/.gitignore b/csharp/test/Ice/proxy/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/proxy/.gitignore
+++ b/csharp/test/Ice/proxy/.gitignore
diff --git a/cs/test/Ice/proxy/AllTests.cs b/csharp/test/Ice/proxy/AllTests.cs
index 9a43ba20820..9a43ba20820 100644
--- a/cs/test/Ice/proxy/AllTests.cs
+++ b/csharp/test/Ice/proxy/AllTests.cs
diff --git a/cs/test/Ice/proxy/App.xaml b/csharp/test/Ice/proxy/App.xaml
index 2659fa28212..2659fa28212 100644
--- a/cs/test/Ice/proxy/App.xaml
+++ b/csharp/test/Ice/proxy/App.xaml
diff --git a/cs/test/Ice/proxy/App.xaml.cs b/csharp/test/Ice/proxy/App.xaml.cs
index ee45cb62b93..ee45cb62b93 100644
--- a/cs/test/Ice/proxy/App.xaml.cs
+++ b/csharp/test/Ice/proxy/App.xaml.cs
diff --git a/cs/test/Ice/proxy/Client.cs b/csharp/test/Ice/proxy/Client.cs
index 6c39bda37d1..6c39bda37d1 100644
--- a/cs/test/Ice/proxy/Client.cs
+++ b/csharp/test/Ice/proxy/Client.cs
diff --git a/cs/test/Ice/proxy/Collocated.cs b/csharp/test/Ice/proxy/Collocated.cs
index da59d064310..da59d064310 100644
--- a/cs/test/Ice/proxy/Collocated.cs
+++ b/csharp/test/Ice/proxy/Collocated.cs
diff --git a/cs/test/Ice/proxy/Makefile b/csharp/test/Ice/proxy/Makefile
index c8accb3cb87..c8accb3cb87 100644
--- a/cs/test/Ice/proxy/Makefile
+++ b/csharp/test/Ice/proxy/Makefile
diff --git a/cs/test/Ice/proxy/Makefile.mak b/csharp/test/Ice/proxy/Makefile.mak
index abce9ebbf44..abce9ebbf44 100644
--- a/cs/test/Ice/proxy/Makefile.mak
+++ b/csharp/test/Ice/proxy/Makefile.mak
diff --git a/cs/test/Ice/proxy/MyDerivedClassAMDI.cs b/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs
index 486b9fe511b..486b9fe511b 100644
--- a/cs/test/Ice/proxy/MyDerivedClassAMDI.cs
+++ b/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs
diff --git a/cs/test/Ice/proxy/MyDerivedClassI.cs b/csharp/test/Ice/proxy/MyDerivedClassI.cs
index 2a74ce36752..2a74ce36752 100644
--- a/cs/test/Ice/proxy/MyDerivedClassI.cs
+++ b/csharp/test/Ice/proxy/MyDerivedClassI.cs
diff --git a/cs/test/Ice/proxy/Properties/AppManifest.xml b/csharp/test/Ice/proxy/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/proxy/Properties/AppManifest.xml
+++ b/csharp/test/Ice/proxy/Properties/AppManifest.xml
diff --git a/cs/test/Ice/proxy/Properties/AssemblyInfo.cs b/csharp/test/Ice/proxy/Properties/AssemblyInfo.cs
index 9f26231d081..9f26231d081 100644
--- a/cs/test/Ice/proxy/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/proxy/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/proxy/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/proxy/Properties/OutOfBrowserSettings.xml
index 5de7bf2f0a5..5de7bf2f0a5 100644
--- a/cs/test/Ice/proxy/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/proxy/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/proxy/Server.cs b/csharp/test/Ice/proxy/Server.cs
index e3fd182dd69..e3fd182dd69 100644
--- a/cs/test/Ice/proxy/Server.cs
+++ b/csharp/test/Ice/proxy/Server.cs
diff --git a/cs/test/Ice/proxy/Test.ice b/csharp/test/Ice/proxy/Test.ice
index e39742a0c85..e39742a0c85 100644
--- a/cs/test/Ice/proxy/Test.ice
+++ b/csharp/test/Ice/proxy/Test.ice
diff --git a/cs/test/Ice/proxy/TestAMD.ice b/csharp/test/Ice/proxy/TestAMD.ice
index aa404315568..aa404315568 100644
--- a/cs/test/Ice/proxy/TestAMD.ice
+++ b/csharp/test/Ice/proxy/TestAMD.ice
diff --git a/cs/test/Ice/proxy/client.exe.config b/csharp/test/Ice/proxy/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/proxy/client.exe.config
+++ b/csharp/test/Ice/proxy/client.exe.config
diff --git a/cs/test/Ice/proxy/collocated.exe.config b/csharp/test/Ice/proxy/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/proxy/collocated.exe.config
+++ b/csharp/test/Ice/proxy/collocated.exe.config
diff --git a/cs/test/Ice/proxy/generated/.gitignore b/csharp/test/Ice/proxy/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/proxy/generated/.gitignore
+++ b/csharp/test/Ice/proxy/generated/.gitignore
diff --git a/cs/test/Ice/proxy/generated/sl/.gitignore b/csharp/test/Ice/proxy/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/proxy/generated/sl/.gitignore
+++ b/csharp/test/Ice/proxy/generated/sl/.gitignore
diff --git a/cs/test/Ice/proxy/proxy.csproj b/csharp/test/Ice/proxy/proxy.csproj
index 3f69368ae79..3f69368ae79 100644
--- a/cs/test/Ice/proxy/proxy.csproj
+++ b/csharp/test/Ice/proxy/proxy.csproj
diff --git a/cs/test/Ice/proxy/run.py b/csharp/test/Ice/proxy/run.py
index eec082f03e5..eec082f03e5 100755
--- a/cs/test/Ice/proxy/run.py
+++ b/csharp/test/Ice/proxy/run.py
diff --git a/cs/test/Ice/proxy/server.exe.config b/csharp/test/Ice/proxy/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/proxy/server.exe.config
+++ b/csharp/test/Ice/proxy/server.exe.config
diff --git a/cs/test/Ice/proxy/serveramd.exe.config b/csharp/test/Ice/proxy/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/proxy/serveramd.exe.config
+++ b/csharp/test/Ice/proxy/serveramd.exe.config
diff --git a/cs/test/Ice/retry/.depend.mak b/csharp/test/Ice/retry/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/retry/.depend.mak
+++ b/csharp/test/Ice/retry/.depend.mak
diff --git a/cs/test/Ice/retry/.gitignore b/csharp/test/Ice/retry/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/retry/.gitignore
+++ b/csharp/test/Ice/retry/.gitignore
diff --git a/cs/test/Ice/retry/AllTests.cs b/csharp/test/Ice/retry/AllTests.cs
index 7d3e4a0567f..7d3e4a0567f 100644
--- a/cs/test/Ice/retry/AllTests.cs
+++ b/csharp/test/Ice/retry/AllTests.cs
diff --git a/cs/test/Ice/retry/App.xaml b/csharp/test/Ice/retry/App.xaml
index e7648e141f0..e7648e141f0 100644
--- a/cs/test/Ice/retry/App.xaml
+++ b/csharp/test/Ice/retry/App.xaml
diff --git a/cs/test/Ice/retry/App.xaml.cs b/csharp/test/Ice/retry/App.xaml.cs
index 22b2a2e7e86..22b2a2e7e86 100644
--- a/cs/test/Ice/retry/App.xaml.cs
+++ b/csharp/test/Ice/retry/App.xaml.cs
diff --git a/cs/test/Ice/retry/Client.cs b/csharp/test/Ice/retry/Client.cs
index 1d6cb7173d3..1d6cb7173d3 100644
--- a/cs/test/Ice/retry/Client.cs
+++ b/csharp/test/Ice/retry/Client.cs
diff --git a/cs/test/Ice/retry/Collocated.cs b/csharp/test/Ice/retry/Collocated.cs
index 68775b756b0..68775b756b0 100644
--- a/cs/test/Ice/retry/Collocated.cs
+++ b/csharp/test/Ice/retry/Collocated.cs
diff --git a/cs/test/Ice/retry/Instrumentation.cs b/csharp/test/Ice/retry/Instrumentation.cs
index bd67e8f92f1..bd67e8f92f1 100644
--- a/cs/test/Ice/retry/Instrumentation.cs
+++ b/csharp/test/Ice/retry/Instrumentation.cs
diff --git a/cs/test/Ice/retry/Makefile b/csharp/test/Ice/retry/Makefile
index 37dce803f99..37dce803f99 100644
--- a/cs/test/Ice/retry/Makefile
+++ b/csharp/test/Ice/retry/Makefile
diff --git a/cs/test/Ice/retry/Makefile.mak b/csharp/test/Ice/retry/Makefile.mak
index 659e785a595..659e785a595 100644
--- a/cs/test/Ice/retry/Makefile.mak
+++ b/csharp/test/Ice/retry/Makefile.mak
diff --git a/cs/test/Ice/retry/Properties/AppManifest.xml b/csharp/test/Ice/retry/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/retry/Properties/AppManifest.xml
+++ b/csharp/test/Ice/retry/Properties/AppManifest.xml
diff --git a/cs/test/Ice/retry/Properties/AssemblyInfo.cs b/csharp/test/Ice/retry/Properties/AssemblyInfo.cs
index 1947d791431..1947d791431 100644
--- a/cs/test/Ice/retry/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/retry/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/retry/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/retry/Properties/OutOfBrowserSettings.xml
index 702dfcb98ab..702dfcb98ab 100644
--- a/cs/test/Ice/retry/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/retry/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/retry/RetryI.cs b/csharp/test/Ice/retry/RetryI.cs
index bbf058aa0e3..bbf058aa0e3 100644
--- a/cs/test/Ice/retry/RetryI.cs
+++ b/csharp/test/Ice/retry/RetryI.cs
diff --git a/cs/test/Ice/retry/Server.cs b/csharp/test/Ice/retry/Server.cs
index 79784503c2e..79784503c2e 100644
--- a/cs/test/Ice/retry/Server.cs
+++ b/csharp/test/Ice/retry/Server.cs
diff --git a/cs/test/Ice/retry/SystemFailure.cs b/csharp/test/Ice/retry/SystemFailure.cs
index 16fc66b5633..16fc66b5633 100644
--- a/cs/test/Ice/retry/SystemFailure.cs
+++ b/csharp/test/Ice/retry/SystemFailure.cs
diff --git a/cs/test/Ice/retry/Test.ice b/csharp/test/Ice/retry/Test.ice
index 937f26fd7f1..937f26fd7f1 100644
--- a/cs/test/Ice/retry/Test.ice
+++ b/csharp/test/Ice/retry/Test.ice
diff --git a/cs/test/Ice/retry/client.exe.config b/csharp/test/Ice/retry/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/retry/client.exe.config
+++ b/csharp/test/Ice/retry/client.exe.config
diff --git a/cs/test/Ice/retry/collocated.exe.config b/csharp/test/Ice/retry/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/retry/collocated.exe.config
+++ b/csharp/test/Ice/retry/collocated.exe.config
diff --git a/cs/test/Ice/retry/generated/.gitignore b/csharp/test/Ice/retry/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/retry/generated/.gitignore
+++ b/csharp/test/Ice/retry/generated/.gitignore
diff --git a/cs/test/Ice/retry/generated/sl/.gitignore b/csharp/test/Ice/retry/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/retry/generated/sl/.gitignore
+++ b/csharp/test/Ice/retry/generated/sl/.gitignore
diff --git a/cs/test/Ice/retry/retry.csproj b/csharp/test/Ice/retry/retry.csproj
index f59f368ef5e..f59f368ef5e 100644
--- a/cs/test/Ice/retry/retry.csproj
+++ b/csharp/test/Ice/retry/retry.csproj
diff --git a/cs/test/Ice/retry/run.py b/csharp/test/Ice/retry/run.py
index 73dc16e6fc7..73dc16e6fc7 100755
--- a/cs/test/Ice/retry/run.py
+++ b/csharp/test/Ice/retry/run.py
diff --git a/cs/test/Ice/retry/server.exe.config b/csharp/test/Ice/retry/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/retry/server.exe.config
+++ b/csharp/test/Ice/retry/server.exe.config
diff --git a/cs/test/Ice/seqMapping/.depend.mak b/csharp/test/Ice/seqMapping/.depend.mak
index ab202383ea9..ab202383ea9 100644
--- a/cs/test/Ice/seqMapping/.depend.mak
+++ b/csharp/test/Ice/seqMapping/.depend.mak
diff --git a/cs/test/Ice/seqMapping/.gitignore b/csharp/test/Ice/seqMapping/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/seqMapping/.gitignore
+++ b/csharp/test/Ice/seqMapping/.gitignore
diff --git a/cs/test/Ice/seqMapping/AllTests.cs b/csharp/test/Ice/seqMapping/AllTests.cs
index b6bb9803bf2..b6bb9803bf2 100644
--- a/cs/test/Ice/seqMapping/AllTests.cs
+++ b/csharp/test/Ice/seqMapping/AllTests.cs
diff --git a/cs/test/Ice/seqMapping/App.xaml b/csharp/test/Ice/seqMapping/App.xaml
index 7e78267ec52..7e78267ec52 100644
--- a/cs/test/Ice/seqMapping/App.xaml
+++ b/csharp/test/Ice/seqMapping/App.xaml
diff --git a/cs/test/Ice/seqMapping/App.xaml.cs b/csharp/test/Ice/seqMapping/App.xaml.cs
index 3a51fb51bf7..3a51fb51bf7 100644
--- a/cs/test/Ice/seqMapping/App.xaml.cs
+++ b/csharp/test/Ice/seqMapping/App.xaml.cs
diff --git a/cs/test/Ice/seqMapping/Client.cs b/csharp/test/Ice/seqMapping/Client.cs
index add1cf89ce1..add1cf89ce1 100644
--- a/cs/test/Ice/seqMapping/Client.cs
+++ b/csharp/test/Ice/seqMapping/Client.cs
diff --git a/cs/test/Ice/seqMapping/Collocated.cs b/csharp/test/Ice/seqMapping/Collocated.cs
index 756a4b44592..756a4b44592 100644
--- a/cs/test/Ice/seqMapping/Collocated.cs
+++ b/csharp/test/Ice/seqMapping/Collocated.cs
diff --git a/cs/test/Ice/seqMapping/Custom.cs b/csharp/test/Ice/seqMapping/Custom.cs
index be8ebe7bb0a..be8ebe7bb0a 100644
--- a/cs/test/Ice/seqMapping/Custom.cs
+++ b/csharp/test/Ice/seqMapping/Custom.cs
diff --git a/cs/test/Ice/seqMapping/Makefile b/csharp/test/Ice/seqMapping/Makefile
index cd7a393a2f1..cd7a393a2f1 100644
--- a/cs/test/Ice/seqMapping/Makefile
+++ b/csharp/test/Ice/seqMapping/Makefile
diff --git a/cs/test/Ice/seqMapping/Makefile.mak b/csharp/test/Ice/seqMapping/Makefile.mak
index d4424707cdd..d4424707cdd 100644
--- a/cs/test/Ice/seqMapping/Makefile.mak
+++ b/csharp/test/Ice/seqMapping/Makefile.mak
diff --git a/cs/test/Ice/seqMapping/MyClassAMDI.cs b/csharp/test/Ice/seqMapping/MyClassAMDI.cs
index 3c4233d2ffc..3c4233d2ffc 100644
--- a/cs/test/Ice/seqMapping/MyClassAMDI.cs
+++ b/csharp/test/Ice/seqMapping/MyClassAMDI.cs
diff --git a/cs/test/Ice/seqMapping/MyClassI.cs b/csharp/test/Ice/seqMapping/MyClassI.cs
index 4f2f96f3800..4f2f96f3800 100644
--- a/cs/test/Ice/seqMapping/MyClassI.cs
+++ b/csharp/test/Ice/seqMapping/MyClassI.cs
diff --git a/cs/test/Ice/seqMapping/Properties/AppManifest.xml b/csharp/test/Ice/seqMapping/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/seqMapping/Properties/AppManifest.xml
+++ b/csharp/test/Ice/seqMapping/Properties/AppManifest.xml
diff --git a/cs/test/Ice/seqMapping/Properties/AssemblyInfo.cs b/csharp/test/Ice/seqMapping/Properties/AssemblyInfo.cs
index fe3509c9380..fe3509c9380 100644
--- a/cs/test/Ice/seqMapping/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/seqMapping/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/seqMapping/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/seqMapping/Properties/OutOfBrowserSettings.xml
index 2a61e4dd655..2a61e4dd655 100644
--- a/cs/test/Ice/seqMapping/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/seqMapping/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/seqMapping/Serializable.cs b/csharp/test/Ice/seqMapping/Serializable.cs
index 9968c4eeda5..9968c4eeda5 100644
--- a/cs/test/Ice/seqMapping/Serializable.cs
+++ b/csharp/test/Ice/seqMapping/Serializable.cs
diff --git a/cs/test/Ice/seqMapping/Server.cs b/csharp/test/Ice/seqMapping/Server.cs
index 6c96bbac328..6c96bbac328 100644
--- a/cs/test/Ice/seqMapping/Server.cs
+++ b/csharp/test/Ice/seqMapping/Server.cs
diff --git a/cs/test/Ice/seqMapping/ServerAMD.cs b/csharp/test/Ice/seqMapping/ServerAMD.cs
index 22fcfabe406..22fcfabe406 100644
--- a/cs/test/Ice/seqMapping/ServerAMD.cs
+++ b/csharp/test/Ice/seqMapping/ServerAMD.cs
diff --git a/cs/test/Ice/seqMapping/Test.ice b/csharp/test/Ice/seqMapping/Test.ice
index 3def192e85f..3def192e85f 100644
--- a/cs/test/Ice/seqMapping/Test.ice
+++ b/csharp/test/Ice/seqMapping/Test.ice
diff --git a/cs/test/Ice/seqMapping/TestAMD.ice b/csharp/test/Ice/seqMapping/TestAMD.ice
index ec9ece97c19..ec9ece97c19 100644
--- a/cs/test/Ice/seqMapping/TestAMD.ice
+++ b/csharp/test/Ice/seqMapping/TestAMD.ice
diff --git a/cs/test/Ice/seqMapping/Twoways.cs b/csharp/test/Ice/seqMapping/Twoways.cs
index 1b9de791f41..1b9de791f41 100644
--- a/cs/test/Ice/seqMapping/Twoways.cs
+++ b/csharp/test/Ice/seqMapping/Twoways.cs
diff --git a/cs/test/Ice/seqMapping/TwowaysAMI.cs b/csharp/test/Ice/seqMapping/TwowaysAMI.cs
index 74f2f6494ab..74f2f6494ab 100644
--- a/cs/test/Ice/seqMapping/TwowaysAMI.cs
+++ b/csharp/test/Ice/seqMapping/TwowaysAMI.cs
diff --git a/cs/test/Ice/seqMapping/client.exe.config b/csharp/test/Ice/seqMapping/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/seqMapping/client.exe.config
+++ b/csharp/test/Ice/seqMapping/client.exe.config
diff --git a/cs/test/Ice/seqMapping/collocated.exe.config b/csharp/test/Ice/seqMapping/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/seqMapping/collocated.exe.config
+++ b/csharp/test/Ice/seqMapping/collocated.exe.config
diff --git a/cs/test/Ice/seqMapping/generated/.gitignore b/csharp/test/Ice/seqMapping/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/seqMapping/generated/.gitignore
+++ b/csharp/test/Ice/seqMapping/generated/.gitignore
diff --git a/cs/test/Ice/seqMapping/generated/sl/.gitignore b/csharp/test/Ice/seqMapping/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/seqMapping/generated/sl/.gitignore
+++ b/csharp/test/Ice/seqMapping/generated/sl/.gitignore
diff --git a/cs/test/Ice/seqMapping/run.py b/csharp/test/Ice/seqMapping/run.py
index eec082f03e5..eec082f03e5 100755
--- a/cs/test/Ice/seqMapping/run.py
+++ b/csharp/test/Ice/seqMapping/run.py
diff --git a/cs/test/Ice/seqMapping/seqMapping.csproj b/csharp/test/Ice/seqMapping/seqMapping.csproj
index ef9db4fb7c5..ef9db4fb7c5 100644
--- a/cs/test/Ice/seqMapping/seqMapping.csproj
+++ b/csharp/test/Ice/seqMapping/seqMapping.csproj
diff --git a/cs/test/Ice/seqMapping/server.exe.config b/csharp/test/Ice/seqMapping/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/seqMapping/server.exe.config
+++ b/csharp/test/Ice/seqMapping/server.exe.config
diff --git a/cs/test/Ice/seqMapping/serveramd.exe.config b/csharp/test/Ice/seqMapping/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/seqMapping/serveramd.exe.config
+++ b/csharp/test/Ice/seqMapping/serveramd.exe.config
diff --git a/cs/test/Ice/serialize/.depend.mak b/csharp/test/Ice/serialize/.depend.mak
index a48ca7ca548..a48ca7ca548 100644
--- a/cs/test/Ice/serialize/.depend.mak
+++ b/csharp/test/Ice/serialize/.depend.mak
diff --git a/cs/test/Ice/serialize/.gitignore b/csharp/test/Ice/serialize/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/serialize/.gitignore
+++ b/csharp/test/Ice/serialize/.gitignore
diff --git a/cs/test/Ice/serialize/AllTests.cs b/csharp/test/Ice/serialize/AllTests.cs
index 9cfef85e63b..9cfef85e63b 100644
--- a/cs/test/Ice/serialize/AllTests.cs
+++ b/csharp/test/Ice/serialize/AllTests.cs
diff --git a/cs/test/Ice/serialize/App.xaml.cs b/csharp/test/Ice/serialize/App.xaml.cs
index adfb68f9cd5..adfb68f9cd5 100644
--- a/cs/test/Ice/serialize/App.xaml.cs
+++ b/csharp/test/Ice/serialize/App.xaml.cs
diff --git a/cs/test/Ice/serialize/Client.cs b/csharp/test/Ice/serialize/Client.cs
index ef972378031..ef972378031 100644
--- a/cs/test/Ice/serialize/Client.cs
+++ b/csharp/test/Ice/serialize/Client.cs
diff --git a/cs/test/Ice/serialize/Makefile b/csharp/test/Ice/serialize/Makefile
index e551aa10117..e551aa10117 100644
--- a/cs/test/Ice/serialize/Makefile
+++ b/csharp/test/Ice/serialize/Makefile
diff --git a/cs/test/Ice/serialize/Makefile.mak b/csharp/test/Ice/serialize/Makefile.mak
index 4fb44da38ec..4fb44da38ec 100644
--- a/cs/test/Ice/serialize/Makefile.mak
+++ b/csharp/test/Ice/serialize/Makefile.mak
diff --git a/cs/test/Ice/serialize/Properties/AssemblyInfo.cs b/csharp/test/Ice/serialize/Properties/AssemblyInfo.cs
index b52dc1a59ce..b52dc1a59ce 100644
--- a/cs/test/Ice/serialize/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/serialize/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/serialize/Test.ice b/csharp/test/Ice/serialize/Test.ice
index 36198eba972..36198eba972 100644
--- a/cs/test/Ice/serialize/Test.ice
+++ b/csharp/test/Ice/serialize/Test.ice
diff --git a/cs/test/Ice/serialize/client.exe.config b/csharp/test/Ice/serialize/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/serialize/client.exe.config
+++ b/csharp/test/Ice/serialize/client.exe.config
diff --git a/cs/test/Ice/serialize/generated/.gitignore b/csharp/test/Ice/serialize/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/serialize/generated/.gitignore
+++ b/csharp/test/Ice/serialize/generated/.gitignore
diff --git a/cs/test/Ice/serialize/generated/sl/.gitignore b/csharp/test/Ice/serialize/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/serialize/generated/sl/.gitignore
+++ b/csharp/test/Ice/serialize/generated/sl/.gitignore
diff --git a/cs/test/Ice/serialize/run.py b/csharp/test/Ice/serialize/run.py
index 601e5d00087..601e5d00087 100755
--- a/cs/test/Ice/serialize/run.py
+++ b/csharp/test/Ice/serialize/run.py
diff --git a/cs/test/Ice/serialize/serialize.csproj b/csharp/test/Ice/serialize/serialize.csproj
index facfd8151ae..facfd8151ae 100644
--- a/cs/test/Ice/serialize/serialize.csproj
+++ b/csharp/test/Ice/serialize/serialize.csproj
diff --git a/cs/test/Ice/servantLocator/.depend.mak b/csharp/test/Ice/servantLocator/.depend.mak
index ab202383ea9..ab202383ea9 100644
--- a/cs/test/Ice/servantLocator/.depend.mak
+++ b/csharp/test/Ice/servantLocator/.depend.mak
diff --git a/cs/test/Ice/servantLocator/.gitignore b/csharp/test/Ice/servantLocator/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/servantLocator/.gitignore
+++ b/csharp/test/Ice/servantLocator/.gitignore
diff --git a/cs/test/Ice/servantLocator/AllTests.cs b/csharp/test/Ice/servantLocator/AllTests.cs
index eb95d0df9e6..eb95d0df9e6 100644
--- a/cs/test/Ice/servantLocator/AllTests.cs
+++ b/csharp/test/Ice/servantLocator/AllTests.cs
diff --git a/cs/test/Ice/servantLocator/App.xaml b/csharp/test/Ice/servantLocator/App.xaml
index f879cdda87b..f879cdda87b 100644
--- a/cs/test/Ice/servantLocator/App.xaml
+++ b/csharp/test/Ice/servantLocator/App.xaml
diff --git a/cs/test/Ice/servantLocator/App.xaml.cs b/csharp/test/Ice/servantLocator/App.xaml.cs
index ccb4ce71426..ccb4ce71426 100644
--- a/cs/test/Ice/servantLocator/App.xaml.cs
+++ b/csharp/test/Ice/servantLocator/App.xaml.cs
diff --git a/cs/test/Ice/servantLocator/Client.cs b/csharp/test/Ice/servantLocator/Client.cs
index 980aba202ad..980aba202ad 100644
--- a/cs/test/Ice/servantLocator/Client.cs
+++ b/csharp/test/Ice/servantLocator/Client.cs
diff --git a/cs/test/Ice/servantLocator/Collocated.cs b/csharp/test/Ice/servantLocator/Collocated.cs
index f174dacf962..f174dacf962 100644
--- a/cs/test/Ice/servantLocator/Collocated.cs
+++ b/csharp/test/Ice/servantLocator/Collocated.cs
diff --git a/cs/test/Ice/servantLocator/CookieI.cs b/csharp/test/Ice/servantLocator/CookieI.cs
index 6766f4e7551..6766f4e7551 100644
--- a/cs/test/Ice/servantLocator/CookieI.cs
+++ b/csharp/test/Ice/servantLocator/CookieI.cs
diff --git a/cs/test/Ice/servantLocator/Makefile b/csharp/test/Ice/servantLocator/Makefile
index 9e09d317c50..9e09d317c50 100644
--- a/cs/test/Ice/servantLocator/Makefile
+++ b/csharp/test/Ice/servantLocator/Makefile
diff --git a/cs/test/Ice/servantLocator/Makefile.mak b/csharp/test/Ice/servantLocator/Makefile.mak
index 1680c624f0d..1680c624f0d 100644
--- a/cs/test/Ice/servantLocator/Makefile.mak
+++ b/csharp/test/Ice/servantLocator/Makefile.mak
diff --git a/cs/test/Ice/servantLocator/Properties/AppManifest.xml b/csharp/test/Ice/servantLocator/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/servantLocator/Properties/AppManifest.xml
+++ b/csharp/test/Ice/servantLocator/Properties/AppManifest.xml
diff --git a/cs/test/Ice/servantLocator/Properties/AssemblyInfo.cs b/csharp/test/Ice/servantLocator/Properties/AssemblyInfo.cs
index 156a8b41014..156a8b41014 100644
--- a/cs/test/Ice/servantLocator/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/servantLocator/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/servantLocator/Properties/InBrowserSettings.xml b/csharp/test/Ice/servantLocator/Properties/InBrowserSettings.xml
index 56716508bdb..56716508bdb 100644
--- a/cs/test/Ice/servantLocator/Properties/InBrowserSettings.xml
+++ b/csharp/test/Ice/servantLocator/Properties/InBrowserSettings.xml
diff --git a/cs/test/Ice/servantLocator/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/servantLocator/Properties/OutOfBrowserSettings.xml
index 3edff0640e4..3edff0640e4 100644
--- a/cs/test/Ice/servantLocator/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/servantLocator/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/servantLocator/ServantLocatorI.cs b/csharp/test/Ice/servantLocator/ServantLocatorI.cs
index 4e5c363f2eb..4e5c363f2eb 100644
--- a/cs/test/Ice/servantLocator/ServantLocatorI.cs
+++ b/csharp/test/Ice/servantLocator/ServantLocatorI.cs
diff --git a/cs/test/Ice/servantLocator/Server.cs b/csharp/test/Ice/servantLocator/Server.cs
index 54d50d75111..54d50d75111 100644
--- a/cs/test/Ice/servantLocator/Server.cs
+++ b/csharp/test/Ice/servantLocator/Server.cs
diff --git a/cs/test/Ice/servantLocator/Test.ice b/csharp/test/Ice/servantLocator/Test.ice
index f921fe4a097..f921fe4a097 100644
--- a/cs/test/Ice/servantLocator/Test.ice
+++ b/csharp/test/Ice/servantLocator/Test.ice
diff --git a/cs/test/Ice/servantLocator/TestAMD.ice b/csharp/test/Ice/servantLocator/TestAMD.ice
index c6f84aaaa58..c6f84aaaa58 100644
--- a/cs/test/Ice/servantLocator/TestAMD.ice
+++ b/csharp/test/Ice/servantLocator/TestAMD.ice
diff --git a/cs/test/Ice/servantLocator/TestAMDI.cs b/csharp/test/Ice/servantLocator/TestAMDI.cs
index c6591d5b5e5..c6591d5b5e5 100644
--- a/cs/test/Ice/servantLocator/TestAMDI.cs
+++ b/csharp/test/Ice/servantLocator/TestAMDI.cs
diff --git a/cs/test/Ice/servantLocator/TestActivationI.cs b/csharp/test/Ice/servantLocator/TestActivationI.cs
index bed76eca13c..bed76eca13c 100644
--- a/cs/test/Ice/servantLocator/TestActivationI.cs
+++ b/csharp/test/Ice/servantLocator/TestActivationI.cs
diff --git a/cs/test/Ice/servantLocator/TestI.cs b/csharp/test/Ice/servantLocator/TestI.cs
index c4a9ef52878..c4a9ef52878 100644
--- a/cs/test/Ice/servantLocator/TestI.cs
+++ b/csharp/test/Ice/servantLocator/TestI.cs
diff --git a/cs/test/Ice/servantLocator/client.exe.config b/csharp/test/Ice/servantLocator/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/servantLocator/client.exe.config
+++ b/csharp/test/Ice/servantLocator/client.exe.config
diff --git a/cs/test/Ice/servantLocator/collocated.exe.config b/csharp/test/Ice/servantLocator/collocated.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/servantLocator/collocated.exe.config
+++ b/csharp/test/Ice/servantLocator/collocated.exe.config
diff --git a/cs/test/Ice/servantLocator/generated/.gitignore b/csharp/test/Ice/servantLocator/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/servantLocator/generated/.gitignore
+++ b/csharp/test/Ice/servantLocator/generated/.gitignore
diff --git a/cs/test/Ice/servantLocator/generated/sl/.gitignore b/csharp/test/Ice/servantLocator/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/servantLocator/generated/sl/.gitignore
+++ b/csharp/test/Ice/servantLocator/generated/sl/.gitignore
diff --git a/cs/test/Ice/servantLocator/run.py b/csharp/test/Ice/servantLocator/run.py
index e80167930ef..e80167930ef 100755
--- a/cs/test/Ice/servantLocator/run.py
+++ b/csharp/test/Ice/servantLocator/run.py
diff --git a/cs/test/Ice/servantLocator/servantLocator.csproj b/csharp/test/Ice/servantLocator/servantLocator.csproj
index 0d1537698d6..0d1537698d6 100644
--- a/cs/test/Ice/servantLocator/servantLocator.csproj
+++ b/csharp/test/Ice/servantLocator/servantLocator.csproj
diff --git a/cs/test/Ice/servantLocator/server.exe.config b/csharp/test/Ice/servantLocator/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/servantLocator/server.exe.config
+++ b/csharp/test/Ice/servantLocator/server.exe.config
diff --git a/cs/test/Ice/servantLocator/serveramd.exe.config b/csharp/test/Ice/servantLocator/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/servantLocator/serveramd.exe.config
+++ b/csharp/test/Ice/servantLocator/serveramd.exe.config
diff --git a/cs/test/Ice/slicing/Makefile b/csharp/test/Ice/slicing/Makefile
index da4324768d0..da4324768d0 100644
--- a/cs/test/Ice/slicing/Makefile
+++ b/csharp/test/Ice/slicing/Makefile
diff --git a/cs/test/Ice/slicing/Makefile.mak b/csharp/test/Ice/slicing/Makefile.mak
index 2fd8f00cbbb..2fd8f00cbbb 100644
--- a/cs/test/Ice/slicing/Makefile.mak
+++ b/csharp/test/Ice/slicing/Makefile.mak
diff --git a/cs/test/Ice/slicing/exceptions/.depend.mak b/csharp/test/Ice/slicing/exceptions/.depend.mak
index 11a2c68b59b..11a2c68b59b 100644
--- a/cs/test/Ice/slicing/exceptions/.depend.mak
+++ b/csharp/test/Ice/slicing/exceptions/.depend.mak
diff --git a/cs/test/Ice/slicing/exceptions/.gitignore b/csharp/test/Ice/slicing/exceptions/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/slicing/exceptions/.gitignore
+++ b/csharp/test/Ice/slicing/exceptions/.gitignore
diff --git a/cs/test/Ice/slicing/exceptions/AllTests.cs b/csharp/test/Ice/slicing/exceptions/AllTests.cs
index 1b4c48ac11e..1b4c48ac11e 100644
--- a/cs/test/Ice/slicing/exceptions/AllTests.cs
+++ b/csharp/test/Ice/slicing/exceptions/AllTests.cs
diff --git a/cs/test/Ice/slicing/exceptions/App.xaml b/csharp/test/Ice/slicing/exceptions/App.xaml
index 41e13a49e32..41e13a49e32 100644
--- a/cs/test/Ice/slicing/exceptions/App.xaml
+++ b/csharp/test/Ice/slicing/exceptions/App.xaml
diff --git a/cs/test/Ice/slicing/exceptions/App.xaml.cs b/csharp/test/Ice/slicing/exceptions/App.xaml.cs
index e4671a453fd..e4671a453fd 100644
--- a/cs/test/Ice/slicing/exceptions/App.xaml.cs
+++ b/csharp/test/Ice/slicing/exceptions/App.xaml.cs
diff --git a/cs/test/Ice/slicing/exceptions/Client.cs b/csharp/test/Ice/slicing/exceptions/Client.cs
index da003bea9b9..da003bea9b9 100644
--- a/cs/test/Ice/slicing/exceptions/Client.cs
+++ b/csharp/test/Ice/slicing/exceptions/Client.cs
diff --git a/cs/test/Ice/slicing/exceptions/ClientPrivate.ice b/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice
index d7d016e5b65..d7d016e5b65 100644
--- a/cs/test/Ice/slicing/exceptions/ClientPrivate.ice
+++ b/csharp/test/Ice/slicing/exceptions/ClientPrivate.ice
diff --git a/cs/test/Ice/slicing/exceptions/Makefile b/csharp/test/Ice/slicing/exceptions/Makefile
index ffcaea31901..ffcaea31901 100644
--- a/cs/test/Ice/slicing/exceptions/Makefile
+++ b/csharp/test/Ice/slicing/exceptions/Makefile
diff --git a/cs/test/Ice/slicing/exceptions/Makefile.mak b/csharp/test/Ice/slicing/exceptions/Makefile.mak
index 4d8d3b77fae..4d8d3b77fae 100644
--- a/cs/test/Ice/slicing/exceptions/Makefile.mak
+++ b/csharp/test/Ice/slicing/exceptions/Makefile.mak
diff --git a/cs/test/Ice/slicing/exceptions/Properties/AppManifest.xml b/csharp/test/Ice/slicing/exceptions/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/slicing/exceptions/Properties/AppManifest.xml
+++ b/csharp/test/Ice/slicing/exceptions/Properties/AppManifest.xml
diff --git a/cs/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs b/csharp/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs
index 98389324286..98389324286 100644
--- a/cs/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/slicing/exceptions/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/slicing/exceptions/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/slicing/exceptions/Properties/OutOfBrowserSettings.xml
index 26a1a00e1d6..26a1a00e1d6 100644
--- a/cs/test/Ice/slicing/exceptions/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/slicing/exceptions/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/slicing/exceptions/Server.cs b/csharp/test/Ice/slicing/exceptions/Server.cs
index 0f4f8473543..0f4f8473543 100644
--- a/cs/test/Ice/slicing/exceptions/Server.cs
+++ b/csharp/test/Ice/slicing/exceptions/Server.cs
diff --git a/cs/test/Ice/slicing/exceptions/ServerAMD.cs b/csharp/test/Ice/slicing/exceptions/ServerAMD.cs
index dce2169714a..dce2169714a 100644
--- a/cs/test/Ice/slicing/exceptions/ServerAMD.cs
+++ b/csharp/test/Ice/slicing/exceptions/ServerAMD.cs
diff --git a/cs/test/Ice/slicing/exceptions/ServerPrivate.ice b/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice
index 23284dcda1a..23284dcda1a 100644
--- a/cs/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/csharp/test/Ice/slicing/exceptions/ServerPrivate.ice
diff --git a/cs/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index 688ceb736b3..688ceb736b3 100644
--- a/cs/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/csharp/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
diff --git a/cs/test/Ice/slicing/exceptions/Test.ice b/csharp/test/Ice/slicing/exceptions/Test.ice
index e81c34580f6..e81c34580f6 100644
--- a/cs/test/Ice/slicing/exceptions/Test.ice
+++ b/csharp/test/Ice/slicing/exceptions/Test.ice
diff --git a/cs/test/Ice/slicing/exceptions/TestAMD.ice b/csharp/test/Ice/slicing/exceptions/TestAMD.ice
index 4a564781d4a..4a564781d4a 100644
--- a/cs/test/Ice/slicing/exceptions/TestAMD.ice
+++ b/csharp/test/Ice/slicing/exceptions/TestAMD.ice
diff --git a/cs/test/Ice/slicing/exceptions/TestAMDI.cs b/csharp/test/Ice/slicing/exceptions/TestAMDI.cs
index ce882381221..ce882381221 100644
--- a/cs/test/Ice/slicing/exceptions/TestAMDI.cs
+++ b/csharp/test/Ice/slicing/exceptions/TestAMDI.cs
diff --git a/cs/test/Ice/slicing/exceptions/TestI.cs b/csharp/test/Ice/slicing/exceptions/TestI.cs
index f0965afb556..f0965afb556 100644
--- a/cs/test/Ice/slicing/exceptions/TestI.cs
+++ b/csharp/test/Ice/slicing/exceptions/TestI.cs
diff --git a/cs/test/Ice/slicing/exceptions/client.exe.config b/csharp/test/Ice/slicing/exceptions/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/slicing/exceptions/client.exe.config
+++ b/csharp/test/Ice/slicing/exceptions/client.exe.config
diff --git a/cs/test/Ice/slicing/exceptions/exceptions.csproj b/csharp/test/Ice/slicing/exceptions/exceptions.csproj
index d9e0faed872..d9e0faed872 100644
--- a/cs/test/Ice/slicing/exceptions/exceptions.csproj
+++ b/csharp/test/Ice/slicing/exceptions/exceptions.csproj
diff --git a/cs/test/Ice/slicing/exceptions/generated/.gitignore b/csharp/test/Ice/slicing/exceptions/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/slicing/exceptions/generated/.gitignore
+++ b/csharp/test/Ice/slicing/exceptions/generated/.gitignore
diff --git a/cs/test/Ice/slicing/exceptions/generated/sl/.gitignore b/csharp/test/Ice/slicing/exceptions/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/slicing/exceptions/generated/sl/.gitignore
+++ b/csharp/test/Ice/slicing/exceptions/generated/sl/.gitignore
diff --git a/cs/test/Ice/slicing/exceptions/run.py b/csharp/test/Ice/slicing/exceptions/run.py
index 53eee80b8f3..53eee80b8f3 100755
--- a/cs/test/Ice/slicing/exceptions/run.py
+++ b/csharp/test/Ice/slicing/exceptions/run.py
diff --git a/cs/test/Ice/slicing/exceptions/server.exe.config b/csharp/test/Ice/slicing/exceptions/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/slicing/exceptions/server.exe.config
+++ b/csharp/test/Ice/slicing/exceptions/server.exe.config
diff --git a/cs/test/Ice/slicing/exceptions/serveramd.exe.config b/csharp/test/Ice/slicing/exceptions/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/slicing/exceptions/serveramd.exe.config
+++ b/csharp/test/Ice/slicing/exceptions/serveramd.exe.config
diff --git a/cs/test/Ice/slicing/objects/.depend.mak b/csharp/test/Ice/slicing/objects/.depend.mak
index 4f7a33e58c9..4f7a33e58c9 100644
--- a/cs/test/Ice/slicing/objects/.depend.mak
+++ b/csharp/test/Ice/slicing/objects/.depend.mak
diff --git a/cs/test/Ice/slicing/objects/.gitignore b/csharp/test/Ice/slicing/objects/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/slicing/objects/.gitignore
+++ b/csharp/test/Ice/slicing/objects/.gitignore
diff --git a/cs/test/Ice/slicing/objects/AllTests.cs b/csharp/test/Ice/slicing/objects/AllTests.cs
index d0e15db1c76..d0e15db1c76 100644
--- a/cs/test/Ice/slicing/objects/AllTests.cs
+++ b/csharp/test/Ice/slicing/objects/AllTests.cs
diff --git a/cs/test/Ice/slicing/objects/App.xaml b/csharp/test/Ice/slicing/objects/App.xaml
index 3d9cab394e5..3d9cab394e5 100644
--- a/cs/test/Ice/slicing/objects/App.xaml
+++ b/csharp/test/Ice/slicing/objects/App.xaml
diff --git a/cs/test/Ice/slicing/objects/App.xaml.cs b/csharp/test/Ice/slicing/objects/App.xaml.cs
index 5c93c0d2437..5c93c0d2437 100644
--- a/cs/test/Ice/slicing/objects/App.xaml.cs
+++ b/csharp/test/Ice/slicing/objects/App.xaml.cs
diff --git a/cs/test/Ice/slicing/objects/Client.cs b/csharp/test/Ice/slicing/objects/Client.cs
index da003bea9b9..da003bea9b9 100644
--- a/cs/test/Ice/slicing/objects/Client.cs
+++ b/csharp/test/Ice/slicing/objects/Client.cs
diff --git a/cs/test/Ice/slicing/objects/ClientPrivate.ice b/csharp/test/Ice/slicing/objects/ClientPrivate.ice
index 3880bd583ab..3880bd583ab 100644
--- a/cs/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/csharp/test/Ice/slicing/objects/ClientPrivate.ice
diff --git a/cs/test/Ice/slicing/objects/Forward.ice b/csharp/test/Ice/slicing/objects/Forward.ice
index 89486e226cc..89486e226cc 100644
--- a/cs/test/Ice/slicing/objects/Forward.ice
+++ b/csharp/test/Ice/slicing/objects/Forward.ice
diff --git a/cs/test/Ice/slicing/objects/Makefile b/csharp/test/Ice/slicing/objects/Makefile
index 830ae6f2d64..830ae6f2d64 100644
--- a/cs/test/Ice/slicing/objects/Makefile
+++ b/csharp/test/Ice/slicing/objects/Makefile
diff --git a/cs/test/Ice/slicing/objects/Makefile.mak b/csharp/test/Ice/slicing/objects/Makefile.mak
index 983561ec190..983561ec190 100644
--- a/cs/test/Ice/slicing/objects/Makefile.mak
+++ b/csharp/test/Ice/slicing/objects/Makefile.mak
diff --git a/cs/test/Ice/slicing/objects/Properties/AppManifest.xml b/csharp/test/Ice/slicing/objects/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/slicing/objects/Properties/AppManifest.xml
+++ b/csharp/test/Ice/slicing/objects/Properties/AppManifest.xml
diff --git a/cs/test/Ice/slicing/objects/Properties/AssemblyInfo.cs b/csharp/test/Ice/slicing/objects/Properties/AssemblyInfo.cs
index 1cbcee77599..1cbcee77599 100644
--- a/cs/test/Ice/slicing/objects/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/slicing/objects/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/slicing/objects/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/slicing/objects/Properties/OutOfBrowserSettings.xml
index fa698ad4f34..fa698ad4f34 100644
--- a/cs/test/Ice/slicing/objects/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/slicing/objects/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/slicing/objects/Server.cs b/csharp/test/Ice/slicing/objects/Server.cs
index d6cb56f9b01..d6cb56f9b01 100644
--- a/cs/test/Ice/slicing/objects/Server.cs
+++ b/csharp/test/Ice/slicing/objects/Server.cs
diff --git a/cs/test/Ice/slicing/objects/ServerAMD.cs b/csharp/test/Ice/slicing/objects/ServerAMD.cs
index a7262f57995..a7262f57995 100644
--- a/cs/test/Ice/slicing/objects/ServerAMD.cs
+++ b/csharp/test/Ice/slicing/objects/ServerAMD.cs
diff --git a/cs/test/Ice/slicing/objects/ServerPrivate.ice b/csharp/test/Ice/slicing/objects/ServerPrivate.ice
index f4eb9552f0f..f4eb9552f0f 100644
--- a/cs/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/csharp/test/Ice/slicing/objects/ServerPrivate.ice
diff --git a/cs/test/Ice/slicing/objects/ServerPrivateAMD.ice b/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice
index 51746909b3f..51746909b3f 100644
--- a/cs/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/csharp/test/Ice/slicing/objects/ServerPrivateAMD.ice
diff --git a/cs/test/Ice/slicing/objects/Test.ice b/csharp/test/Ice/slicing/objects/Test.ice
index 0c3fbb3d73d..0c3fbb3d73d 100644
--- a/cs/test/Ice/slicing/objects/Test.ice
+++ b/csharp/test/Ice/slicing/objects/Test.ice
diff --git a/cs/test/Ice/slicing/objects/TestAMD.ice b/csharp/test/Ice/slicing/objects/TestAMD.ice
index b637c59009b..b637c59009b 100644
--- a/cs/test/Ice/slicing/objects/TestAMD.ice
+++ b/csharp/test/Ice/slicing/objects/TestAMD.ice
diff --git a/cs/test/Ice/slicing/objects/TestAMDI.cs b/csharp/test/Ice/slicing/objects/TestAMDI.cs
index ded18259c1c..ded18259c1c 100644
--- a/cs/test/Ice/slicing/objects/TestAMDI.cs
+++ b/csharp/test/Ice/slicing/objects/TestAMDI.cs
diff --git a/cs/test/Ice/slicing/objects/TestI.cs b/csharp/test/Ice/slicing/objects/TestI.cs
index f6f09c4daa7..f6f09c4daa7 100644
--- a/cs/test/Ice/slicing/objects/TestI.cs
+++ b/csharp/test/Ice/slicing/objects/TestI.cs
diff --git a/cs/test/Ice/slicing/objects/client.exe.config b/csharp/test/Ice/slicing/objects/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/slicing/objects/client.exe.config
+++ b/csharp/test/Ice/slicing/objects/client.exe.config
diff --git a/cs/test/Ice/slicing/objects/generated/.gitignore b/csharp/test/Ice/slicing/objects/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/slicing/objects/generated/.gitignore
+++ b/csharp/test/Ice/slicing/objects/generated/.gitignore
diff --git a/cs/test/Ice/slicing/objects/generated/sl/.gitignore b/csharp/test/Ice/slicing/objects/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/slicing/objects/generated/sl/.gitignore
+++ b/csharp/test/Ice/slicing/objects/generated/sl/.gitignore
diff --git a/cs/test/Ice/slicing/objects/objects.csproj b/csharp/test/Ice/slicing/objects/objects.csproj
index 161f5a5dce3..161f5a5dce3 100644
--- a/cs/test/Ice/slicing/objects/objects.csproj
+++ b/csharp/test/Ice/slicing/objects/objects.csproj
diff --git a/cs/test/Ice/slicing/objects/run.py b/csharp/test/Ice/slicing/objects/run.py
index 53eee80b8f3..53eee80b8f3 100755
--- a/cs/test/Ice/slicing/objects/run.py
+++ b/csharp/test/Ice/slicing/objects/run.py
diff --git a/cs/test/Ice/slicing/objects/server.exe.config b/csharp/test/Ice/slicing/objects/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/slicing/objects/server.exe.config
+++ b/csharp/test/Ice/slicing/objects/server.exe.config
diff --git a/cs/test/Ice/slicing/objects/serveramd.exe.config b/csharp/test/Ice/slicing/objects/serveramd.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/slicing/objects/serveramd.exe.config
+++ b/csharp/test/Ice/slicing/objects/serveramd.exe.config
diff --git a/cs/test/Ice/stream/.depend.mak b/csharp/test/Ice/stream/.depend.mak
index a48ca7ca548..a48ca7ca548 100644
--- a/cs/test/Ice/stream/.depend.mak
+++ b/csharp/test/Ice/stream/.depend.mak
diff --git a/cs/test/Ice/stream/.gitignore b/csharp/test/Ice/stream/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/stream/.gitignore
+++ b/csharp/test/Ice/stream/.gitignore
diff --git a/cs/test/Ice/stream/AllTests.cs b/csharp/test/Ice/stream/AllTests.cs
index 9e621417599..9e621417599 100644
--- a/cs/test/Ice/stream/AllTests.cs
+++ b/csharp/test/Ice/stream/AllTests.cs
diff --git a/cs/test/Ice/stream/App.xaml b/csharp/test/Ice/stream/App.xaml
index 759c0596ab2..759c0596ab2 100644
--- a/cs/test/Ice/stream/App.xaml
+++ b/csharp/test/Ice/stream/App.xaml
diff --git a/cs/test/Ice/stream/App.xaml.cs b/csharp/test/Ice/stream/App.xaml.cs
index ffc0536058e..ffc0536058e 100644
--- a/cs/test/Ice/stream/App.xaml.cs
+++ b/csharp/test/Ice/stream/App.xaml.cs
diff --git a/cs/test/Ice/stream/Client.cs b/csharp/test/Ice/stream/Client.cs
index ef972378031..ef972378031 100644
--- a/cs/test/Ice/stream/Client.cs
+++ b/csharp/test/Ice/stream/Client.cs
diff --git a/cs/test/Ice/stream/Makefile b/csharp/test/Ice/stream/Makefile
index fab235ac3cf..fab235ac3cf 100644
--- a/cs/test/Ice/stream/Makefile
+++ b/csharp/test/Ice/stream/Makefile
diff --git a/cs/test/Ice/stream/Makefile.mak b/csharp/test/Ice/stream/Makefile.mak
index 6329726477b..6329726477b 100644
--- a/cs/test/Ice/stream/Makefile.mak
+++ b/csharp/test/Ice/stream/Makefile.mak
diff --git a/cs/test/Ice/stream/Properties/AppManifest.xml b/csharp/test/Ice/stream/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/stream/Properties/AppManifest.xml
+++ b/csharp/test/Ice/stream/Properties/AppManifest.xml
diff --git a/cs/test/Ice/stream/Properties/AssemblyInfo.cs b/csharp/test/Ice/stream/Properties/AssemblyInfo.cs
index 3c45415cce6..3c45415cce6 100644
--- a/cs/test/Ice/stream/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/stream/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/stream/Properties/InBrowserSettings.xml b/csharp/test/Ice/stream/Properties/InBrowserSettings.xml
index 0c41b0763ad..0c41b0763ad 100644
--- a/cs/test/Ice/stream/Properties/InBrowserSettings.xml
+++ b/csharp/test/Ice/stream/Properties/InBrowserSettings.xml
diff --git a/cs/test/Ice/stream/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/stream/Properties/OutOfBrowserSettings.xml
index 5b5d9dfcaff..5b5d9dfcaff 100644
--- a/cs/test/Ice/stream/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/stream/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/stream/Serializable.cs b/csharp/test/Ice/stream/Serializable.cs
index 938deee8015..938deee8015 100644
--- a/cs/test/Ice/stream/Serializable.cs
+++ b/csharp/test/Ice/stream/Serializable.cs
diff --git a/cs/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice
index d23c8000f74..d23c8000f74 100644
--- a/cs/test/Ice/stream/Test.ice
+++ b/csharp/test/Ice/stream/Test.ice
diff --git a/cs/test/Ice/stream/client.exe.config b/csharp/test/Ice/stream/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/stream/client.exe.config
+++ b/csharp/test/Ice/stream/client.exe.config
diff --git a/cs/test/Ice/stream/generated/.gitignore b/csharp/test/Ice/stream/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/stream/generated/.gitignore
+++ b/csharp/test/Ice/stream/generated/.gitignore
diff --git a/cs/test/Ice/stream/generated/sl/.gitignore b/csharp/test/Ice/stream/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/stream/generated/sl/.gitignore
+++ b/csharp/test/Ice/stream/generated/sl/.gitignore
diff --git a/cs/test/Ice/stream/run.py b/csharp/test/Ice/stream/run.py
index fc46d72350f..fc46d72350f 100755
--- a/cs/test/Ice/stream/run.py
+++ b/csharp/test/Ice/stream/run.py
diff --git a/cs/test/Ice/stream/stream.csproj b/csharp/test/Ice/stream/stream.csproj
index de53ca8adef..de53ca8adef 100644
--- a/cs/test/Ice/stream/stream.csproj
+++ b/csharp/test/Ice/stream/stream.csproj
diff --git a/cs/test/Ice/threadPoolPriority/.depend.mak b/csharp/test/Ice/threadPoolPriority/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/threadPoolPriority/.depend.mak
+++ b/csharp/test/Ice/threadPoolPriority/.depend.mak
diff --git a/cs/test/Ice/threadPoolPriority/Client.cs b/csharp/test/Ice/threadPoolPriority/Client.cs
index f8120e4595f..f8120e4595f 100644
--- a/cs/test/Ice/threadPoolPriority/Client.cs
+++ b/csharp/test/Ice/threadPoolPriority/Client.cs
diff --git a/cs/test/Ice/threadPoolPriority/Makefile b/csharp/test/Ice/threadPoolPriority/Makefile
index fdc5056c73a..fdc5056c73a 100644
--- a/cs/test/Ice/threadPoolPriority/Makefile
+++ b/csharp/test/Ice/threadPoolPriority/Makefile
diff --git a/cs/test/Ice/threadPoolPriority/Makefile.mak b/csharp/test/Ice/threadPoolPriority/Makefile.mak
index 81831b65ad1..81831b65ad1 100644
--- a/cs/test/Ice/threadPoolPriority/Makefile.mak
+++ b/csharp/test/Ice/threadPoolPriority/Makefile.mak
diff --git a/cs/test/Ice/threadPoolPriority/PriorityI.cs b/csharp/test/Ice/threadPoolPriority/PriorityI.cs
index fc1128223f9..fc1128223f9 100644
--- a/cs/test/Ice/threadPoolPriority/PriorityI.cs
+++ b/csharp/test/Ice/threadPoolPriority/PriorityI.cs
diff --git a/cs/test/Ice/threadPoolPriority/Server.cs b/csharp/test/Ice/threadPoolPriority/Server.cs
index 4f88a4ede19..4f88a4ede19 100644
--- a/cs/test/Ice/threadPoolPriority/Server.cs
+++ b/csharp/test/Ice/threadPoolPriority/Server.cs
diff --git a/cs/test/Ice/threadPoolPriority/Test.ice b/csharp/test/Ice/threadPoolPriority/Test.ice
index d6e2a3861b5..d6e2a3861b5 100644
--- a/cs/test/Ice/threadPoolPriority/Test.ice
+++ b/csharp/test/Ice/threadPoolPriority/Test.ice
diff --git a/cs/test/Ice/threadPoolPriority/client.exe.config b/csharp/test/Ice/threadPoolPriority/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/threadPoolPriority/client.exe.config
+++ b/csharp/test/Ice/threadPoolPriority/client.exe.config
diff --git a/cs/test/Ice/threadPoolPriority/generated/.gitignore b/csharp/test/Ice/threadPoolPriority/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/threadPoolPriority/generated/.gitignore
+++ b/csharp/test/Ice/threadPoolPriority/generated/.gitignore
diff --git a/cs/test/Ice/threadPoolPriority/run.py b/csharp/test/Ice/threadPoolPriority/run.py
index 3f2e91f0009..3f2e91f0009 100644
--- a/cs/test/Ice/threadPoolPriority/run.py
+++ b/csharp/test/Ice/threadPoolPriority/run.py
diff --git a/cs/test/Ice/threadPoolPriority/server.exe.config b/csharp/test/Ice/threadPoolPriority/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/threadPoolPriority/server.exe.config
+++ b/csharp/test/Ice/threadPoolPriority/server.exe.config
diff --git a/cs/test/Ice/timeout/.depend.mak b/csharp/test/Ice/timeout/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Ice/timeout/.depend.mak
+++ b/csharp/test/Ice/timeout/.depend.mak
diff --git a/cs/test/Ice/timeout/.gitignore b/csharp/test/Ice/timeout/.gitignore
index b395406a599..b395406a599 100644
--- a/cs/test/Ice/timeout/.gitignore
+++ b/csharp/test/Ice/timeout/.gitignore
diff --git a/cs/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs
index 7a301a9e9e1..7a301a9e9e1 100644
--- a/cs/test/Ice/timeout/AllTests.cs
+++ b/csharp/test/Ice/timeout/AllTests.cs
diff --git a/cs/test/Ice/timeout/App.xaml b/csharp/test/Ice/timeout/App.xaml
index 43a28c6ba67..43a28c6ba67 100644
--- a/cs/test/Ice/timeout/App.xaml
+++ b/csharp/test/Ice/timeout/App.xaml
diff --git a/cs/test/Ice/timeout/App.xaml.cs b/csharp/test/Ice/timeout/App.xaml.cs
index 8ee917dfe47..8ee917dfe47 100644
--- a/cs/test/Ice/timeout/App.xaml.cs
+++ b/csharp/test/Ice/timeout/App.xaml.cs
diff --git a/cs/test/Ice/timeout/Client.cs b/csharp/test/Ice/timeout/Client.cs
index 27188314a31..27188314a31 100644
--- a/cs/test/Ice/timeout/Client.cs
+++ b/csharp/test/Ice/timeout/Client.cs
diff --git a/cs/test/Ice/timeout/Makefile b/csharp/test/Ice/timeout/Makefile
index 07ee843c291..07ee843c291 100644
--- a/cs/test/Ice/timeout/Makefile
+++ b/csharp/test/Ice/timeout/Makefile
diff --git a/cs/test/Ice/timeout/Makefile.mak b/csharp/test/Ice/timeout/Makefile.mak
index 1b6f1f5b3ea..1b6f1f5b3ea 100644
--- a/cs/test/Ice/timeout/Makefile.mak
+++ b/csharp/test/Ice/timeout/Makefile.mak
diff --git a/cs/test/Ice/timeout/Properties/AppManifest.xml b/csharp/test/Ice/timeout/Properties/AppManifest.xml
index 6712a117839..6712a117839 100644
--- a/cs/test/Ice/timeout/Properties/AppManifest.xml
+++ b/csharp/test/Ice/timeout/Properties/AppManifest.xml
diff --git a/cs/test/Ice/timeout/Properties/AssemblyInfo.cs b/csharp/test/Ice/timeout/Properties/AssemblyInfo.cs
index 7ac083cf255..7ac083cf255 100644
--- a/cs/test/Ice/timeout/Properties/AssemblyInfo.cs
+++ b/csharp/test/Ice/timeout/Properties/AssemblyInfo.cs
diff --git a/cs/test/Ice/timeout/Properties/OutOfBrowserSettings.xml b/csharp/test/Ice/timeout/Properties/OutOfBrowserSettings.xml
index d542ec96e49..d542ec96e49 100644
--- a/cs/test/Ice/timeout/Properties/OutOfBrowserSettings.xml
+++ b/csharp/test/Ice/timeout/Properties/OutOfBrowserSettings.xml
diff --git a/cs/test/Ice/timeout/Server.cs b/csharp/test/Ice/timeout/Server.cs
index 475304e64ff..475304e64ff 100644
--- a/cs/test/Ice/timeout/Server.cs
+++ b/csharp/test/Ice/timeout/Server.cs
diff --git a/cs/test/Ice/timeout/Test.ice b/csharp/test/Ice/timeout/Test.ice
index dc54d71c16c..dc54d71c16c 100644
--- a/cs/test/Ice/timeout/Test.ice
+++ b/csharp/test/Ice/timeout/Test.ice
diff --git a/cs/test/Ice/timeout/TimeoutI.cs b/csharp/test/Ice/timeout/TimeoutI.cs
index e5de4a1c6be..e5de4a1c6be 100644
--- a/cs/test/Ice/timeout/TimeoutI.cs
+++ b/csharp/test/Ice/timeout/TimeoutI.cs
diff --git a/cs/test/Ice/timeout/client.exe.config b/csharp/test/Ice/timeout/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/timeout/client.exe.config
+++ b/csharp/test/Ice/timeout/client.exe.config
diff --git a/cs/test/Ice/timeout/generated/.gitignore b/csharp/test/Ice/timeout/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/timeout/generated/.gitignore
+++ b/csharp/test/Ice/timeout/generated/.gitignore
diff --git a/cs/test/Ice/timeout/generated/sl/.gitignore b/csharp/test/Ice/timeout/generated/sl/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Ice/timeout/generated/sl/.gitignore
+++ b/csharp/test/Ice/timeout/generated/sl/.gitignore
diff --git a/cs/test/Ice/timeout/run.py b/csharp/test/Ice/timeout/run.py
index 3f2e91f0009..3f2e91f0009 100755
--- a/cs/test/Ice/timeout/run.py
+++ b/csharp/test/Ice/timeout/run.py
diff --git a/cs/test/Ice/timeout/server.exe.config b/csharp/test/Ice/timeout/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/timeout/server.exe.config
+++ b/csharp/test/Ice/timeout/server.exe.config
diff --git a/cs/test/Ice/timeout/timeout.csproj b/csharp/test/Ice/timeout/timeout.csproj
index cc61307cc31..cc61307cc31 100644
--- a/cs/test/Ice/timeout/timeout.csproj
+++ b/csharp/test/Ice/timeout/timeout.csproj
diff --git a/cs/test/Ice/udp/.depend.mak b/csharp/test/Ice/udp/.depend.mak
index 85238740597..85238740597 100644
--- a/cs/test/Ice/udp/.depend.mak
+++ b/csharp/test/Ice/udp/.depend.mak
diff --git a/cs/test/Ice/udp/AllTests.cs b/csharp/test/Ice/udp/AllTests.cs
index e0ac4415be3..e0ac4415be3 100644
--- a/cs/test/Ice/udp/AllTests.cs
+++ b/csharp/test/Ice/udp/AllTests.cs
diff --git a/cs/test/Ice/udp/Client.cs b/csharp/test/Ice/udp/Client.cs
index e909b9c9b21..e909b9c9b21 100644
--- a/cs/test/Ice/udp/Client.cs
+++ b/csharp/test/Ice/udp/Client.cs
diff --git a/cs/test/Ice/udp/Makefile b/csharp/test/Ice/udp/Makefile
index 30fdb4272a2..30fdb4272a2 100644
--- a/cs/test/Ice/udp/Makefile
+++ b/csharp/test/Ice/udp/Makefile
diff --git a/cs/test/Ice/udp/Makefile.mak b/csharp/test/Ice/udp/Makefile.mak
index e1a3a7c7e21..e1a3a7c7e21 100644
--- a/cs/test/Ice/udp/Makefile.mak
+++ b/csharp/test/Ice/udp/Makefile.mak
diff --git a/cs/test/Ice/udp/Server.cs b/csharp/test/Ice/udp/Server.cs
index 7429e3dfcb0..7429e3dfcb0 100644
--- a/cs/test/Ice/udp/Server.cs
+++ b/csharp/test/Ice/udp/Server.cs
diff --git a/cs/test/Ice/udp/Test.ice b/csharp/test/Ice/udp/Test.ice
index 24928d41878..24928d41878 100644
--- a/cs/test/Ice/udp/Test.ice
+++ b/csharp/test/Ice/udp/Test.ice
diff --git a/cs/test/Ice/udp/TestIntfI.cs b/csharp/test/Ice/udp/TestIntfI.cs
index 6ce03a28153..6ce03a28153 100644
--- a/cs/test/Ice/udp/TestIntfI.cs
+++ b/csharp/test/Ice/udp/TestIntfI.cs
diff --git a/cs/test/Ice/udp/client.exe.config b/csharp/test/Ice/udp/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/udp/client.exe.config
+++ b/csharp/test/Ice/udp/client.exe.config
diff --git a/cs/test/Ice/udp/generated/.gitignore b/csharp/test/Ice/udp/generated/.gitignore
index e69de29bb2d..e69de29bb2d 100644
--- a/cs/test/Ice/udp/generated/.gitignore
+++ b/csharp/test/Ice/udp/generated/.gitignore
diff --git a/cs/test/Ice/udp/run.py b/csharp/test/Ice/udp/run.py
index 47a7f585303..47a7f585303 100755
--- a/cs/test/Ice/udp/run.py
+++ b/csharp/test/Ice/udp/run.py
diff --git a/cs/test/Ice/udp/server.exe.config b/csharp/test/Ice/udp/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Ice/udp/server.exe.config
+++ b/csharp/test/Ice/udp/server.exe.config
diff --git a/cs/test/IceBox/Makefile b/csharp/test/IceBox/Makefile
index fded092f64e..fded092f64e 100644
--- a/cs/test/IceBox/Makefile
+++ b/csharp/test/IceBox/Makefile
diff --git a/cs/test/IceBox/Makefile.mak b/csharp/test/IceBox/Makefile.mak
index 2333cbe4810..2333cbe4810 100644
--- a/cs/test/IceBox/Makefile.mak
+++ b/csharp/test/IceBox/Makefile.mak
diff --git a/cs/test/IceBox/admin/.depend.mak b/csharp/test/IceBox/admin/.depend.mak
index 2f6bd05cb5a..2f6bd05cb5a 100644
--- a/cs/test/IceBox/admin/.depend.mak
+++ b/csharp/test/IceBox/admin/.depend.mak
diff --git a/cs/test/IceBox/admin/AllTests.cs b/csharp/test/IceBox/admin/AllTests.cs
index 23ab703e9f0..23ab703e9f0 100644
--- a/cs/test/IceBox/admin/AllTests.cs
+++ b/csharp/test/IceBox/admin/AllTests.cs
diff --git a/cs/test/IceBox/admin/Client.cs b/csharp/test/IceBox/admin/Client.cs
index f6283584eda..f6283584eda 100644
--- a/cs/test/IceBox/admin/Client.cs
+++ b/csharp/test/IceBox/admin/Client.cs
diff --git a/cs/test/IceBox/admin/Makefile b/csharp/test/IceBox/admin/Makefile
index ff945a98c06..ff945a98c06 100644
--- a/cs/test/IceBox/admin/Makefile
+++ b/csharp/test/IceBox/admin/Makefile
diff --git a/cs/test/IceBox/admin/Makefile.mak b/csharp/test/IceBox/admin/Makefile.mak
index f5159344e84..f5159344e84 100644
--- a/cs/test/IceBox/admin/Makefile.mak
+++ b/csharp/test/IceBox/admin/Makefile.mak
diff --git a/cs/test/IceBox/admin/Test.ice b/csharp/test/IceBox/admin/Test.ice
index 9878a2890cc..9878a2890cc 100644
--- a/cs/test/IceBox/admin/Test.ice
+++ b/csharp/test/IceBox/admin/Test.ice
diff --git a/cs/test/IceBox/admin/TestI.cs b/csharp/test/IceBox/admin/TestI.cs
index 09550f4b602..09550f4b602 100644
--- a/cs/test/IceBox/admin/TestI.cs
+++ b/csharp/test/IceBox/admin/TestI.cs
diff --git a/cs/test/IceBox/admin/TestServiceI.cs b/csharp/test/IceBox/admin/TestServiceI.cs
index 505c8136e52..505c8136e52 100644
--- a/cs/test/IceBox/admin/TestServiceI.cs
+++ b/csharp/test/IceBox/admin/TestServiceI.cs
diff --git a/cs/test/IceBox/admin/client.exe.config b/csharp/test/IceBox/admin/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceBox/admin/client.exe.config
+++ b/csharp/test/IceBox/admin/client.exe.config
diff --git a/cs/test/IceBox/admin/config.icebox b/csharp/test/IceBox/admin/config.icebox
index 0948aae9244..0948aae9244 100644
--- a/cs/test/IceBox/admin/config.icebox
+++ b/csharp/test/IceBox/admin/config.icebox
diff --git a/cs/test/IceBox/admin/config.service b/csharp/test/IceBox/admin/config.service
index 23c6f841859..23c6f841859 100644
--- a/cs/test/IceBox/admin/config.service
+++ b/csharp/test/IceBox/admin/config.service
diff --git a/cs/test/IceBox/admin/generated/.gitignore b/csharp/test/IceBox/admin/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/IceBox/admin/generated/.gitignore
+++ b/csharp/test/IceBox/admin/generated/.gitignore
diff --git a/cs/test/IceBox/admin/run.py b/csharp/test/IceBox/admin/run.py
index dbabe15264b..dbabe15264b 100755
--- a/cs/test/IceBox/admin/run.py
+++ b/csharp/test/IceBox/admin/run.py
diff --git a/cs/test/IceBox/configuration/.depend.mak b/csharp/test/IceBox/configuration/.depend.mak
index a48ca7ca548..a48ca7ca548 100644
--- a/cs/test/IceBox/configuration/.depend.mak
+++ b/csharp/test/IceBox/configuration/.depend.mak
diff --git a/cs/test/IceBox/configuration/AllTests.cs b/csharp/test/IceBox/configuration/AllTests.cs
index dd73f448e5a..dd73f448e5a 100644
--- a/cs/test/IceBox/configuration/AllTests.cs
+++ b/csharp/test/IceBox/configuration/AllTests.cs
diff --git a/cs/test/IceBox/configuration/Client.cs b/csharp/test/IceBox/configuration/Client.cs
index d32ca2f6614..d32ca2f6614 100644
--- a/cs/test/IceBox/configuration/Client.cs
+++ b/csharp/test/IceBox/configuration/Client.cs
diff --git a/cs/test/IceBox/configuration/Makefile b/csharp/test/IceBox/configuration/Makefile
index ff945a98c06..ff945a98c06 100644
--- a/cs/test/IceBox/configuration/Makefile
+++ b/csharp/test/IceBox/configuration/Makefile
diff --git a/cs/test/IceBox/configuration/Makefile.mak b/csharp/test/IceBox/configuration/Makefile.mak
index 95c040bb878..95c040bb878 100644
--- a/cs/test/IceBox/configuration/Makefile.mak
+++ b/csharp/test/IceBox/configuration/Makefile.mak
diff --git a/cs/test/IceBox/configuration/Test.ice b/csharp/test/IceBox/configuration/Test.ice
index 286b4215687..286b4215687 100644
--- a/cs/test/IceBox/configuration/Test.ice
+++ b/csharp/test/IceBox/configuration/Test.ice
diff --git a/cs/test/IceBox/configuration/TestI.cs b/csharp/test/IceBox/configuration/TestI.cs
index 35eccba593a..35eccba593a 100644
--- a/cs/test/IceBox/configuration/TestI.cs
+++ b/csharp/test/IceBox/configuration/TestI.cs
diff --git a/cs/test/IceBox/configuration/TestServiceI.cs b/csharp/test/IceBox/configuration/TestServiceI.cs
index 8892272f79f..8892272f79f 100644
--- a/cs/test/IceBox/configuration/TestServiceI.cs
+++ b/csharp/test/IceBox/configuration/TestServiceI.cs
diff --git a/cs/test/IceBox/configuration/client.exe.config b/csharp/test/IceBox/configuration/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceBox/configuration/client.exe.config
+++ b/csharp/test/IceBox/configuration/client.exe.config
diff --git a/cs/test/IceBox/configuration/config.icebox b/csharp/test/IceBox/configuration/config.icebox
index c8ced28f5dc..c8ced28f5dc 100644
--- a/cs/test/IceBox/configuration/config.icebox
+++ b/csharp/test/IceBox/configuration/config.icebox
diff --git a/cs/test/IceBox/configuration/config.icebox2 b/csharp/test/IceBox/configuration/config.icebox2
index 2e86b5c7113..2e86b5c7113 100644
--- a/cs/test/IceBox/configuration/config.icebox2
+++ b/csharp/test/IceBox/configuration/config.icebox2
diff --git a/cs/test/IceBox/configuration/config.service1 b/csharp/test/IceBox/configuration/config.service1
index 6028e615ff5..6028e615ff5 100644
--- a/cs/test/IceBox/configuration/config.service1
+++ b/csharp/test/IceBox/configuration/config.service1
diff --git a/cs/test/IceBox/configuration/config.service1-2 b/csharp/test/IceBox/configuration/config.service1-2
index c173914db2a..c173914db2a 100644
--- a/cs/test/IceBox/configuration/config.service1-2
+++ b/csharp/test/IceBox/configuration/config.service1-2
diff --git a/cs/test/IceBox/configuration/config.service2 b/csharp/test/IceBox/configuration/config.service2
index 78e08aadba6..78e08aadba6 100644
--- a/cs/test/IceBox/configuration/config.service2
+++ b/csharp/test/IceBox/configuration/config.service2
diff --git a/cs/test/IceBox/configuration/config.service2-2 b/csharp/test/IceBox/configuration/config.service2-2
index 36c8d0812cb..36c8d0812cb 100644
--- a/cs/test/IceBox/configuration/config.service2-2
+++ b/csharp/test/IceBox/configuration/config.service2-2
diff --git a/cs/test/IceBox/configuration/config.service3 b/csharp/test/IceBox/configuration/config.service3
index c93ed144701..c93ed144701 100644
--- a/cs/test/IceBox/configuration/config.service3
+++ b/csharp/test/IceBox/configuration/config.service3
diff --git a/cs/test/IceBox/configuration/config.service4 b/csharp/test/IceBox/configuration/config.service4
index 182fb3a7289..182fb3a7289 100644
--- a/cs/test/IceBox/configuration/config.service4
+++ b/csharp/test/IceBox/configuration/config.service4
diff --git a/cs/test/IceBox/configuration/generated/.gitignore b/csharp/test/IceBox/configuration/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/IceBox/configuration/generated/.gitignore
+++ b/csharp/test/IceBox/configuration/generated/.gitignore
diff --git a/cs/test/IceBox/configuration/run.py b/csharp/test/IceBox/configuration/run.py
index f94a382b71e..f94a382b71e 100755
--- a/cs/test/IceBox/configuration/run.py
+++ b/csharp/test/IceBox/configuration/run.py
diff --git a/cs/test/IceDiscovery/Makefile b/csharp/test/IceDiscovery/Makefile
index c23809bb7a9..c23809bb7a9 100644
--- a/cs/test/IceDiscovery/Makefile
+++ b/csharp/test/IceDiscovery/Makefile
diff --git a/cs/test/IceDiscovery/Makefile.mak b/csharp/test/IceDiscovery/Makefile.mak
index 3fda2ef013c..3fda2ef013c 100644
--- a/cs/test/IceDiscovery/Makefile.mak
+++ b/csharp/test/IceDiscovery/Makefile.mak
diff --git a/cs/test/IceDiscovery/simple/.depend.mak b/csharp/test/IceDiscovery/simple/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/IceDiscovery/simple/.depend.mak
+++ b/csharp/test/IceDiscovery/simple/.depend.mak
diff --git a/cs/test/IceDiscovery/simple/.gitignore b/csharp/test/IceDiscovery/simple/.gitignore
index 67872faa673..67872faa673 100644
--- a/cs/test/IceDiscovery/simple/.gitignore
+++ b/csharp/test/IceDiscovery/simple/.gitignore
diff --git a/cs/test/IceDiscovery/simple/AllTests.cs b/csharp/test/IceDiscovery/simple/AllTests.cs
index 776cedf7209..776cedf7209 100644
--- a/cs/test/IceDiscovery/simple/AllTests.cs
+++ b/csharp/test/IceDiscovery/simple/AllTests.cs
diff --git a/cs/test/IceDiscovery/simple/Client.cs b/csharp/test/IceDiscovery/simple/Client.cs
index 29898e2b69b..29898e2b69b 100644
--- a/cs/test/IceDiscovery/simple/Client.cs
+++ b/csharp/test/IceDiscovery/simple/Client.cs
diff --git a/cs/test/IceDiscovery/simple/Makefile b/csharp/test/IceDiscovery/simple/Makefile
index 8d6a8811fd9..8d6a8811fd9 100644
--- a/cs/test/IceDiscovery/simple/Makefile
+++ b/csharp/test/IceDiscovery/simple/Makefile
diff --git a/cs/test/IceDiscovery/simple/Makefile.mak b/csharp/test/IceDiscovery/simple/Makefile.mak
index d6eaff91ffc..d6eaff91ffc 100644
--- a/cs/test/IceDiscovery/simple/Makefile.mak
+++ b/csharp/test/IceDiscovery/simple/Makefile.mak
diff --git a/cs/test/IceDiscovery/simple/Server.cs b/csharp/test/IceDiscovery/simple/Server.cs
index 518c817f32e..518c817f32e 100644
--- a/cs/test/IceDiscovery/simple/Server.cs
+++ b/csharp/test/IceDiscovery/simple/Server.cs
diff --git a/cs/test/IceDiscovery/simple/Test.ice b/csharp/test/IceDiscovery/simple/Test.ice
index 259067f577d..259067f577d 100644
--- a/cs/test/IceDiscovery/simple/Test.ice
+++ b/csharp/test/IceDiscovery/simple/Test.ice
diff --git a/cs/test/IceDiscovery/simple/TestI.cs b/csharp/test/IceDiscovery/simple/TestI.cs
index de3c324c2c9..de3c324c2c9 100644
--- a/cs/test/IceDiscovery/simple/TestI.cs
+++ b/csharp/test/IceDiscovery/simple/TestI.cs
diff --git a/cs/test/IceDiscovery/simple/client.exe.config b/csharp/test/IceDiscovery/simple/client.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/IceDiscovery/simple/client.exe.config
+++ b/csharp/test/IceDiscovery/simple/client.exe.config
diff --git a/cs/test/IceDiscovery/simple/generated/.gitignore b/csharp/test/IceDiscovery/simple/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/IceDiscovery/simple/generated/.gitignore
+++ b/csharp/test/IceDiscovery/simple/generated/.gitignore
diff --git a/cs/test/IceDiscovery/simple/run.py b/csharp/test/IceDiscovery/simple/run.py
index ca2e9bb2299..ca2e9bb2299 100755
--- a/cs/test/IceDiscovery/simple/run.py
+++ b/csharp/test/IceDiscovery/simple/run.py
diff --git a/cs/test/IceDiscovery/simple/server.exe.config b/csharp/test/IceDiscovery/simple/server.exe.config
index d3fa65b4563..d3fa65b4563 100644
--- a/cs/test/IceDiscovery/simple/server.exe.config
+++ b/csharp/test/IceDiscovery/simple/server.exe.config
diff --git a/cs/test/IceGrid/Makefile b/csharp/test/IceGrid/Makefile
index c8b8f4978a3..c8b8f4978a3 100644
--- a/cs/test/IceGrid/Makefile
+++ b/csharp/test/IceGrid/Makefile
diff --git a/cs/test/IceGrid/Makefile.mak b/csharp/test/IceGrid/Makefile.mak
index 3235a491863..3235a491863 100644
--- a/cs/test/IceGrid/Makefile.mak
+++ b/csharp/test/IceGrid/Makefile.mak
diff --git a/cs/test/IceGrid/simple/.depend.mak b/csharp/test/IceGrid/simple/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/IceGrid/simple/.depend.mak
+++ b/csharp/test/IceGrid/simple/.depend.mak
diff --git a/cs/test/IceGrid/simple/.gitignore b/csharp/test/IceGrid/simple/.gitignore
index 1a5104f3c93..1a5104f3c93 100644
--- a/cs/test/IceGrid/simple/.gitignore
+++ b/csharp/test/IceGrid/simple/.gitignore
diff --git a/cs/test/IceGrid/simple/AllTests.cs b/csharp/test/IceGrid/simple/AllTests.cs
index 96af8c4bdb3..96af8c4bdb3 100644
--- a/cs/test/IceGrid/simple/AllTests.cs
+++ b/csharp/test/IceGrid/simple/AllTests.cs
diff --git a/cs/test/IceGrid/simple/Client.cs b/csharp/test/IceGrid/simple/Client.cs
index 30ade0a67af..30ade0a67af 100644
--- a/cs/test/IceGrid/simple/Client.cs
+++ b/csharp/test/IceGrid/simple/Client.cs
diff --git a/cs/test/IceGrid/simple/Makefile b/csharp/test/IceGrid/simple/Makefile
index 79c82828840..79c82828840 100644
--- a/cs/test/IceGrid/simple/Makefile
+++ b/csharp/test/IceGrid/simple/Makefile
diff --git a/cs/test/IceGrid/simple/Makefile.mak b/csharp/test/IceGrid/simple/Makefile.mak
index 31f80a183d5..31f80a183d5 100644
--- a/cs/test/IceGrid/simple/Makefile.mak
+++ b/csharp/test/IceGrid/simple/Makefile.mak
diff --git a/cs/test/IceGrid/simple/Server.cs b/csharp/test/IceGrid/simple/Server.cs
index 5296cdf8c26..5296cdf8c26 100644
--- a/cs/test/IceGrid/simple/Server.cs
+++ b/csharp/test/IceGrid/simple/Server.cs
diff --git a/cs/test/IceGrid/simple/Test.ice b/csharp/test/IceGrid/simple/Test.ice
index 3e9c67cc40b..3e9c67cc40b 100644
--- a/cs/test/IceGrid/simple/Test.ice
+++ b/csharp/test/IceGrid/simple/Test.ice
diff --git a/cs/test/IceGrid/simple/TestI.cs b/csharp/test/IceGrid/simple/TestI.cs
index 316ba86532a..316ba86532a 100644
--- a/cs/test/IceGrid/simple/TestI.cs
+++ b/csharp/test/IceGrid/simple/TestI.cs
diff --git a/cs/test/IceGrid/simple/client.exe.config b/csharp/test/IceGrid/simple/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceGrid/simple/client.exe.config
+++ b/csharp/test/IceGrid/simple/client.exe.config
diff --git a/cs/test/IceGrid/simple/db/.gitignore b/csharp/test/IceGrid/simple/db/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/IceGrid/simple/db/.gitignore
+++ b/csharp/test/IceGrid/simple/db/.gitignore
diff --git a/cs/test/IceGrid/simple/generated/.gitignore b/csharp/test/IceGrid/simple/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/IceGrid/simple/generated/.gitignore
+++ b/csharp/test/IceGrid/simple/generated/.gitignore
diff --git a/cs/test/IceGrid/simple/run.py b/csharp/test/IceGrid/simple/run.py
index b6a5698882c..b6a5698882c 100755
--- a/cs/test/IceGrid/simple/run.py
+++ b/csharp/test/IceGrid/simple/run.py
diff --git a/cs/test/IceGrid/simple/server.exe.config b/csharp/test/IceGrid/simple/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceGrid/simple/server.exe.config
+++ b/csharp/test/IceGrid/simple/server.exe.config
diff --git a/cs/test/IceGrid/simple/simple_mono_server.xml b/csharp/test/IceGrid/simple/simple_mono_server.xml
index 2dbea99b9a1..2dbea99b9a1 100644
--- a/cs/test/IceGrid/simple/simple_mono_server.xml
+++ b/csharp/test/IceGrid/simple/simple_mono_server.xml
diff --git a/cs/test/IceGrid/simple/simple_server.xml b/csharp/test/IceGrid/simple/simple_server.xml
index 8029cabe95f..8029cabe95f 100644
--- a/cs/test/IceGrid/simple/simple_server.xml
+++ b/csharp/test/IceGrid/simple/simple_server.xml
diff --git a/cs/test/IceSSL/Makefile b/csharp/test/IceSSL/Makefile
index ecd30afb0e0..ecd30afb0e0 100644
--- a/cs/test/IceSSL/Makefile
+++ b/csharp/test/IceSSL/Makefile
diff --git a/cs/test/IceSSL/Makefile.mak b/csharp/test/IceSSL/Makefile.mak
index 99b149b5823..99b149b5823 100644
--- a/cs/test/IceSSL/Makefile.mak
+++ b/csharp/test/IceSSL/Makefile.mak
diff --git a/cs/test/IceSSL/certs/c_rsa_nopass_ca1.pfx b/csharp/test/IceSSL/certs/c_rsa_nopass_ca1.pfx
index 2f8c19f0a74..2f8c19f0a74 100644
--- a/cs/test/IceSSL/certs/c_rsa_nopass_ca1.pfx
+++ b/csharp/test/IceSSL/certs/c_rsa_nopass_ca1.pfx
diff --git a/cs/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx b/csharp/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx
index 30f06e76592..30f06e76592 100644
--- a/cs/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx
+++ b/csharp/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx
diff --git a/cs/test/IceSSL/certs/c_rsa_nopass_ca2.pfx b/csharp/test/IceSSL/certs/c_rsa_nopass_ca2.pfx
index 922ed17dd5b..922ed17dd5b 100644
--- a/cs/test/IceSSL/certs/c_rsa_nopass_ca2.pfx
+++ b/csharp/test/IceSSL/certs/c_rsa_nopass_ca2.pfx
diff --git a/cs/test/IceSSL/certs/cacert1.pem b/csharp/test/IceSSL/certs/cacert1.pem
index 05771c456b1..05771c456b1 100644
--- a/cs/test/IceSSL/certs/cacert1.pem
+++ b/csharp/test/IceSSL/certs/cacert1.pem
diff --git a/cs/test/IceSSL/certs/cacert2.pem b/csharp/test/IceSSL/certs/cacert2.pem
index fc30d9970b7..fc30d9970b7 100644
--- a/cs/test/IceSSL/certs/cacert2.pem
+++ b/csharp/test/IceSSL/certs/cacert2.pem
diff --git a/cs/test/IceSSL/certs/cacert2.pfx b/csharp/test/IceSSL/certs/cacert2.pfx
index fbc0b9c0771..fbc0b9c0771 100644
--- a/cs/test/IceSSL/certs/cacert2.pfx
+++ b/csharp/test/IceSSL/certs/cacert2.pfx
diff --git a/cs/test/IceSSL/certs/makecerts.py b/csharp/test/IceSSL/certs/makecerts.py
index 839a2442ab6..839a2442ab6 100755
--- a/cs/test/IceSSL/certs/makecerts.py
+++ b/csharp/test/IceSSL/certs/makecerts.py
diff --git a/cs/test/IceSSL/certs/s_rsa_nopass_ca1.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1.pfx
index d4da4b14be9..d4da4b14be9 100644
--- a/cs/test/IceSSL/certs/s_rsa_nopass_ca1.pfx
+++ b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1.pfx
diff --git a/cs/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx
index abaf88af9cb..abaf88af9cb 100644
--- a/cs/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx
+++ b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx
diff --git a/cs/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx
index b87113ebccf..b87113ebccf 100644
--- a/cs/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx
+++ b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx
diff --git a/cs/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx
index db463ca3d75..db463ca3d75 100644
--- a/cs/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx
+++ b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx
diff --git a/cs/test/IceSSL/certs/s_rsa_nopass_ca2.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx
index 8ba6e819bd6..8ba6e819bd6 100644
--- a/cs/test/IceSSL/certs/s_rsa_nopass_ca2.pfx
+++ b/csharp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx
diff --git a/cs/test/IceSSL/configuration/.depend.mak b/csharp/test/IceSSL/configuration/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/IceSSL/configuration/.depend.mak
+++ b/csharp/test/IceSSL/configuration/.depend.mak
diff --git a/cs/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs
index 021601eeb5d..021601eeb5d 100644
--- a/cs/test/IceSSL/configuration/AllTests.cs
+++ b/csharp/test/IceSSL/configuration/AllTests.cs
diff --git a/cs/test/IceSSL/configuration/CertificateVerifierI.cs b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
index bd43a4c765e..bd43a4c765e 100644
--- a/cs/test/IceSSL/configuration/CertificateVerifierI.cs
+++ b/csharp/test/IceSSL/configuration/CertificateVerifierI.cs
diff --git a/cs/test/IceSSL/configuration/Client.cs b/csharp/test/IceSSL/configuration/Client.cs
index 9ae827b0ca3..9ae827b0ca3 100644
--- a/cs/test/IceSSL/configuration/Client.cs
+++ b/csharp/test/IceSSL/configuration/Client.cs
diff --git a/cs/test/IceSSL/configuration/Makefile b/csharp/test/IceSSL/configuration/Makefile
index 610570d9634..610570d9634 100644
--- a/cs/test/IceSSL/configuration/Makefile
+++ b/csharp/test/IceSSL/configuration/Makefile
diff --git a/cs/test/IceSSL/configuration/Makefile.mak b/csharp/test/IceSSL/configuration/Makefile.mak
index bb1f66f35e6..bb1f66f35e6 100644
--- a/cs/test/IceSSL/configuration/Makefile.mak
+++ b/csharp/test/IceSSL/configuration/Makefile.mak
diff --git a/cs/test/IceSSL/configuration/PasswordCallbackI.cs b/csharp/test/IceSSL/configuration/PasswordCallbackI.cs
index e61b60a31f8..e61b60a31f8 100644
--- a/cs/test/IceSSL/configuration/PasswordCallbackI.cs
+++ b/csharp/test/IceSSL/configuration/PasswordCallbackI.cs
diff --git a/cs/test/IceSSL/configuration/Server.cs b/csharp/test/IceSSL/configuration/Server.cs
index 7b882f02a58..7b882f02a58 100644
--- a/cs/test/IceSSL/configuration/Server.cs
+++ b/csharp/test/IceSSL/configuration/Server.cs
diff --git a/cs/test/IceSSL/configuration/Test.ice b/csharp/test/IceSSL/configuration/Test.ice
index efbf4f2417f..efbf4f2417f 100644
--- a/cs/test/IceSSL/configuration/Test.ice
+++ b/csharp/test/IceSSL/configuration/Test.ice
diff --git a/cs/test/IceSSL/configuration/TestI.cs b/csharp/test/IceSSL/configuration/TestI.cs
index 1c5a2b05d0f..1c5a2b05d0f 100644
--- a/cs/test/IceSSL/configuration/TestI.cs
+++ b/csharp/test/IceSSL/configuration/TestI.cs
diff --git a/cs/test/IceSSL/configuration/client.exe.config b/csharp/test/IceSSL/configuration/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceSSL/configuration/client.exe.config
+++ b/csharp/test/IceSSL/configuration/client.exe.config
diff --git a/cs/test/IceSSL/configuration/generated/.gitignore b/csharp/test/IceSSL/configuration/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/IceSSL/configuration/generated/.gitignore
+++ b/csharp/test/IceSSL/configuration/generated/.gitignore
diff --git a/cs/test/IceSSL/configuration/run.py b/csharp/test/IceSSL/configuration/run.py
index 60bb03f8c86..60bb03f8c86 100755
--- a/cs/test/IceSSL/configuration/run.py
+++ b/csharp/test/IceSSL/configuration/run.py
diff --git a/cs/test/IceSSL/configuration/server.exe.config b/csharp/test/IceSSL/configuration/server.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceSSL/configuration/server.exe.config
+++ b/csharp/test/IceSSL/configuration/server.exe.config
diff --git a/cs/test/IceUtil/Makefile b/csharp/test/IceUtil/Makefile
index 30cccf40d30..30cccf40d30 100644
--- a/cs/test/IceUtil/Makefile
+++ b/csharp/test/IceUtil/Makefile
diff --git a/cs/test/IceUtil/Makefile.mak b/csharp/test/IceUtil/Makefile.mak
index d4014bcf5d4..d4014bcf5d4 100644
--- a/cs/test/IceUtil/Makefile.mak
+++ b/csharp/test/IceUtil/Makefile.mak
diff --git a/cs/test/IceUtil/inputUtil/Client.cs b/csharp/test/IceUtil/inputUtil/Client.cs
index b5ef9b376fa..b5ef9b376fa 100644
--- a/cs/test/IceUtil/inputUtil/Client.cs
+++ b/csharp/test/IceUtil/inputUtil/Client.cs
diff --git a/cs/test/IceUtil/inputUtil/Makefile b/csharp/test/IceUtil/inputUtil/Makefile
index 81706ac92a0..81706ac92a0 100644
--- a/cs/test/IceUtil/inputUtil/Makefile
+++ b/csharp/test/IceUtil/inputUtil/Makefile
diff --git a/cs/test/IceUtil/inputUtil/Makefile.mak b/csharp/test/IceUtil/inputUtil/Makefile.mak
index 176baa06cd6..176baa06cd6 100644
--- a/cs/test/IceUtil/inputUtil/Makefile.mak
+++ b/csharp/test/IceUtil/inputUtil/Makefile.mak
diff --git a/cs/test/IceUtil/inputUtil/client.exe.config b/csharp/test/IceUtil/inputUtil/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/IceUtil/inputUtil/client.exe.config
+++ b/csharp/test/IceUtil/inputUtil/client.exe.config
diff --git a/cs/test/IceUtil/inputUtil/run.py b/csharp/test/IceUtil/inputUtil/run.py
index b3fdfdef643..b3fdfdef643 100755
--- a/cs/test/IceUtil/inputUtil/run.py
+++ b/csharp/test/IceUtil/inputUtil/run.py
diff --git a/cs/test/Makefile b/csharp/test/Makefile
index 7cb0402cf53..7cb0402cf53 100644
--- a/cs/test/Makefile
+++ b/csharp/test/Makefile
diff --git a/cs/test/Makefile.mak b/csharp/test/Makefile.mak
index 749fd62944d..749fd62944d 100644
--- a/cs/test/Makefile.mak
+++ b/csharp/test/Makefile.mak
diff --git a/cs/test/Slice/Makefile b/csharp/test/Slice/Makefile
index d6a470206b1..d6a470206b1 100644
--- a/cs/test/Slice/Makefile
+++ b/csharp/test/Slice/Makefile
diff --git a/cs/test/Slice/Makefile.mak b/csharp/test/Slice/Makefile.mak
index 60da426d774..60da426d774 100644
--- a/cs/test/Slice/Makefile.mak
+++ b/csharp/test/Slice/Makefile.mak
diff --git a/cs/test/Slice/keyword/.depend.mak b/csharp/test/Slice/keyword/.depend.mak
index 9f9f0d3e075..9f9f0d3e075 100644
--- a/cs/test/Slice/keyword/.depend.mak
+++ b/csharp/test/Slice/keyword/.depend.mak
diff --git a/cs/test/Slice/keyword/Client.cs b/csharp/test/Slice/keyword/Client.cs
index d398521ed17..d398521ed17 100644
--- a/cs/test/Slice/keyword/Client.cs
+++ b/csharp/test/Slice/keyword/Client.cs
diff --git a/cs/test/Slice/keyword/Key.ice b/csharp/test/Slice/keyword/Key.ice
index 0671d61383e..0671d61383e 100644
--- a/cs/test/Slice/keyword/Key.ice
+++ b/csharp/test/Slice/keyword/Key.ice
diff --git a/cs/test/Slice/keyword/Makefile b/csharp/test/Slice/keyword/Makefile
index c5e461ddfea..c5e461ddfea 100644
--- a/cs/test/Slice/keyword/Makefile
+++ b/csharp/test/Slice/keyword/Makefile
diff --git a/cs/test/Slice/keyword/Makefile.mak b/csharp/test/Slice/keyword/Makefile.mak
index e0d56e068f3..e0d56e068f3 100644
--- a/cs/test/Slice/keyword/Makefile.mak
+++ b/csharp/test/Slice/keyword/Makefile.mak
diff --git a/cs/test/Slice/keyword/client.exe.config b/csharp/test/Slice/keyword/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Slice/keyword/client.exe.config
+++ b/csharp/test/Slice/keyword/client.exe.config
diff --git a/cs/test/Slice/keyword/generated/.gitignore b/csharp/test/Slice/keyword/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Slice/keyword/generated/.gitignore
+++ b/csharp/test/Slice/keyword/generated/.gitignore
diff --git a/cs/test/Slice/keyword/run.py b/csharp/test/Slice/keyword/run.py
index 0996ede8127..0996ede8127 100755
--- a/cs/test/Slice/keyword/run.py
+++ b/csharp/test/Slice/keyword/run.py
diff --git a/cs/test/Slice/macros/.depend.mak b/csharp/test/Slice/macros/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Slice/macros/.depend.mak
+++ b/csharp/test/Slice/macros/.depend.mak
diff --git a/cs/test/Slice/macros/Client.cs b/csharp/test/Slice/macros/Client.cs
index bd639ca3fa2..bd639ca3fa2 100644
--- a/cs/test/Slice/macros/Client.cs
+++ b/csharp/test/Slice/macros/Client.cs
diff --git a/cs/test/Slice/macros/Makefile b/csharp/test/Slice/macros/Makefile
index dc9105024d0..dc9105024d0 100644
--- a/cs/test/Slice/macros/Makefile
+++ b/csharp/test/Slice/macros/Makefile
diff --git a/cs/test/Slice/macros/Makefile.mak b/csharp/test/Slice/macros/Makefile.mak
index da467e24b9c..da467e24b9c 100644
--- a/cs/test/Slice/macros/Makefile.mak
+++ b/csharp/test/Slice/macros/Makefile.mak
diff --git a/cs/test/Slice/macros/Test.ice b/csharp/test/Slice/macros/Test.ice
index bb9acbed05a..bb9acbed05a 100644
--- a/cs/test/Slice/macros/Test.ice
+++ b/csharp/test/Slice/macros/Test.ice
diff --git a/cs/test/Slice/macros/client.exe.config b/csharp/test/Slice/macros/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Slice/macros/client.exe.config
+++ b/csharp/test/Slice/macros/client.exe.config
diff --git a/cs/test/Slice/macros/generated/.gitignore b/csharp/test/Slice/macros/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Slice/macros/generated/.gitignore
+++ b/csharp/test/Slice/macros/generated/.gitignore
diff --git a/cs/test/Slice/macros/run.py b/csharp/test/Slice/macros/run.py
index 0996ede8127..0996ede8127 100755
--- a/cs/test/Slice/macros/run.py
+++ b/csharp/test/Slice/macros/run.py
diff --git a/cs/test/Slice/structure/.depend.mak b/csharp/test/Slice/structure/.depend.mak
index c84178e2d84..c84178e2d84 100644
--- a/cs/test/Slice/structure/.depend.mak
+++ b/csharp/test/Slice/structure/.depend.mak
diff --git a/cs/test/Slice/structure/Client.cs b/csharp/test/Slice/structure/Client.cs
index b40c70fe383..b40c70fe383 100644
--- a/cs/test/Slice/structure/Client.cs
+++ b/csharp/test/Slice/structure/Client.cs
diff --git a/cs/test/Slice/structure/Makefile b/csharp/test/Slice/structure/Makefile
index dc9105024d0..dc9105024d0 100644
--- a/cs/test/Slice/structure/Makefile
+++ b/csharp/test/Slice/structure/Makefile
diff --git a/cs/test/Slice/structure/Makefile.mak b/csharp/test/Slice/structure/Makefile.mak
index da467e24b9c..da467e24b9c 100644
--- a/cs/test/Slice/structure/Makefile.mak
+++ b/csharp/test/Slice/structure/Makefile.mak
diff --git a/cs/test/Slice/structure/Test.ice b/csharp/test/Slice/structure/Test.ice
index 3b26e29f415..3b26e29f415 100644
--- a/cs/test/Slice/structure/Test.ice
+++ b/csharp/test/Slice/structure/Test.ice
diff --git a/cs/test/Slice/structure/client.exe.config b/csharp/test/Slice/structure/client.exe.config
index d3fa65b4563..d3fa65b4563 100755
--- a/cs/test/Slice/structure/client.exe.config
+++ b/csharp/test/Slice/structure/client.exe.config
diff --git a/cs/test/Slice/structure/generated/.gitignore b/csharp/test/Slice/structure/generated/.gitignore
index 39af5887579..39af5887579 100644
--- a/cs/test/Slice/structure/generated/.gitignore
+++ b/csharp/test/Slice/structure/generated/.gitignore
diff --git a/cs/test/Slice/structure/run.py b/csharp/test/Slice/structure/run.py
index 0996ede8127..0996ede8127 100755
--- a/cs/test/Slice/structure/run.py
+++ b/csharp/test/Slice/structure/run.py
diff --git a/cs/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
index 40b07080979..40b07080979 100644
--- a/cs/test/TestCommon/Properties/AssemblyInfo.cs
+++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs
diff --git a/cs/test/TestCommon/TestApp.cs b/csharp/test/TestCommon/TestApp.cs
index 007fb9b83a4..007fb9b83a4 100644
--- a/cs/test/TestCommon/TestApp.cs
+++ b/csharp/test/TestCommon/TestApp.cs
diff --git a/cs/test/TestCommon/TestCommon.csproj b/csharp/test/TestCommon/TestCommon.csproj
index fcf6fa776f9..fcf6fa776f9 100644
--- a/cs/test/TestCommon/TestCommon.csproj
+++ b/csharp/test/TestCommon/TestCommon.csproj
diff --git a/cs/test/testsl.sln b/csharp/test/testsl.sln
index 111a4e743f5..111a4e743f5 100644
--- a/cs/test/testsl.sln
+++ b/csharp/test/testsl.sln
diff --git a/distribution/demoscript/csharp/IceBox/hello/expect.py b/distribution/demoscript/csharp/IceBox/hello/expect.py
index 40580816f64..1d56857439b 100755
--- a/distribution/demoscript/csharp/IceBox/hello/expect.py
+++ b/distribution/demoscript/csharp/IceBox/hello/expect.py
@@ -27,7 +27,7 @@ if Util.defaultHost:
 else:
     args = ''
 
-server = Util.spawn("%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s" % (Util.getIceBox("cs"), args))
+server = Util.spawn("%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s" % (Util.getIceBox("csharp"), args))
 server.expect('.* ready')
 client = Util.spawn('client.exe')
 client.expect('.*==>')
diff --git a/distribution/demoscript/csharp/IceGrid/icebox/expect.py b/distribution/demoscript/csharp/IceGrid/icebox/expect.py
index 08b04c7dd51..8062fd92c8e 100755
--- a/distribution/demoscript/csharp/IceGrid/icebox/expect.py
+++ b/distribution/demoscript/csharp/IceGrid/icebox/expect.py
@@ -29,7 +29,7 @@ if Util.isMono():
     fo = open(desc, "w")
     for l in fi:
         if l.find('<icebox') != -1:
-            l = '<icebox id="IceBox" exe="mono" activation="on-demand"><option>%s</option>' % Util.getIceBox("cs")
+            l = '<icebox id="IceBox" exe="mono" activation="on-demand"><option>%s</option>' % Util.getIceBox("csharp")
         fo.write(l)
     fi.close()
     fo.close()
diff --git a/distribution/demoscript/demoscript/Util.py b/distribution/demoscript/demoscript/Util.py
index a767f8ad289..43f0cc1f671 100644
--- a/distribution/demoscript/demoscript/Util.py
+++ b/distribution/demoscript/demoscript/Util.py
@@ -250,7 +250,7 @@ def configurePaths():
         # Add compiler sub-directory
         if isWin32():
             subdir = None
-            if getCppCompiler() == "VC110" and getMapping() != "py":
+            if getCppCompiler() == "VC110" and getMapping() != "python":
                 subdir = "vc110"
 
             if subdir:
@@ -281,7 +281,7 @@ def configurePaths():
     # Setting the library path is necessary for interpreters to find
     # the IceSSL library.
     #
-    if not isWin32() and iceHome != "/usr" and getMapping() in ["py", "rb", "php", "objc"]:
+    if not isWin32() and iceHome != "/usr" and getMapping() in ["python", "ruby", "php", "objective-c"]:
         libDir = os.path.join(getIceDir("cpp"), "lib")
         if isUbuntu():
             libDir = os.path.join(libDir, "x86_64-linux-gnu" if x64 else "i386-linux-gnu")
@@ -289,25 +289,25 @@ def configurePaths():
             libDir = libDir + "64"
         addLdPath(libDir)
 
-    addenv("PATH", os.path.join(getIceDir("cs"), "bin"))
+    addenv("PATH", os.path.join(getIceDir("csharp"), "bin"))
 
     #
     # On Windows, C# assemblies are found thanks to the .exe.config files.
     #
     if isWin32():
-        addenv("DEVPATH", os.path.join(getIceDir("cs"), "Assemblies"))
+        addenv("DEVPATH", os.path.join(getIceDir("csharp"), "Assemblies"))
     else:
-        addenv("MONO_PATH", os.path.join(getIceDir("cs"), "Assemblies"))
+        addenv("MONO_PATH", os.path.join(getIceDir("csharp"), "Assemblies"))
 
     #
     # On Windows x64, set PYTHONPATH to python/x64.
     #
     if isWin32() and x64:
-        addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python", "x64"))
+        addenv("PYTHONPATH", os.path.join(getIceDir("python"), "python", "x64"))
     else:
-        addenv("PYTHONPATH", os.path.join(getIceDir("py"), "python"))
+        addenv("PYTHONPATH", os.path.join(getIceDir("python"), "python"))
 
-    addenv("RUBYLIB", os.path.join(getIceDir("rb"), "ruby"))
+    addenv("RUBYLIB", os.path.join(getIceDir("ruby"), "ruby"))
 
     if getMapping() == "js":
         addenv("NODE_PATH", os.path.join(getIceDir("js"), "node_modules" if iceHome else "src"))
@@ -316,13 +316,13 @@ def configurePaths():
 def getMappingDir(mapping):
     """Get the directory containing the demos for the given mapping."""
     # In the source tree
-    if mapping == "cs":
+    if mapping == "csharp":
         return "csharp"
-    elif mapping == "objc":
+    elif mapping == "objective-c":
         return "objective-c"
-    elif mapping == "py":
+    elif mapping == "python":
         return "python"
-    elif mapping == "rb":
+    elif mapping == "ruby":
         return "ruby"
     elif mapping == "vb":
         return "visualbasic"
@@ -448,13 +448,13 @@ def getMapping():
     assert os.path.normcase(here[:len(toplevel)]) == os.path.normcase(toplevel)
     mapping = here[len(toplevel)+1:].split(os.sep)[0]
     if mapping == "csharp":
-        return "cs"
+        return "csharp"
     elif mapping == "objective-c":
-        return "objc"
+        return "objective-c"
     elif mapping == "python":
-        return "py"
+        return "python"
     elif mapping == "ruby":
-        return "rb"
+        return "ruby"
     elif mapping == "visualbasic":
         return "vb"
     else:
@@ -692,10 +692,10 @@ def getIceBox(mapping = "cpp"):
             if cpp11:
                 iceBox += "++11"
         return iceBox
-    elif mapping == "cs":
+    elif mapping == "csharp":
         if isMono():
             # Mono cannot locate icebox in the PATH. This is wrong for a demo dist.
-            return os.path.join(getIceDir("cs"), "bin", "iceboxnet.exe")
+            return os.path.join(getIceDir("csharp"), "bin", "iceboxnet.exe")
         else:
             return "iceboxnet.exe"
     assert False
@@ -746,12 +746,12 @@ def spawn(command, cwd = None, mapping = None):
         else:
             mapping = getMapping()
 
-    if mapping == "cs":
+    if mapping == "csharp":
         if isMono():
             command = "mono " + command
         else:
             command = "./" + command
-    elif mapping == "py":
+    elif mapping == "python":
         command = sys.executable + " -u " + command
     elif mapping == "vb":
         command = "./" + command
@@ -765,7 +765,7 @@ def spawn(command, cwd = None, mapping = None):
             command = command.replace("java", "java -d64", 1)
         if javaCmd != "java":
             command = command.replace("java", javaCmd, 1)
-    elif (mapping == "cpp" or mapping == "objc"):
+    elif (mapping == "cpp" or mapping == "objective-c"):
         if cwd != None:
             desc = os.path.join(cwd, desc)
         if isWin32():
diff --git a/distribution/demoscript/visualBasic/IceBox/hello/expect.py b/distribution/demoscript/visualBasic/IceBox/hello/expect.py
index 4214f2ed841..cbc8f2d01ba 100755
--- a/distribution/demoscript/visualBasic/IceBox/hello/expect.py
+++ b/distribution/demoscript/visualBasic/IceBox/hello/expect.py
@@ -27,7 +27,7 @@ if Util.defaultHost:
 else:
     args = ''
 
-server = Util.spawn('%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s' % (Util.getIceBox("cs"), args))
+server = Util.spawn('%s --Ice.Config=config.icebox --Ice.PrintAdapterReady %s' % (Util.getIceBox("csharp"), args))
 server.expect('.* ready')
 client = Util.spawn('client.exe')
 client.expect('.*==>')
diff --git a/objc/Makefile b/objective-c/Makefile
index 184244a64c7..184244a64c7 100644
--- a/objc/Makefile
+++ b/objective-c/Makefile
diff --git a/objc/allTests.py b/objective-c/allTests.py
index 51b91ea5ece..51b91ea5ece 100755
--- a/objc/allTests.py
+++ b/objective-c/allTests.py
diff --git a/objc/config/Make.rules b/objective-c/config/Make.rules
index 854a6f4084f..f0d18ad06f3 100644
--- a/objc/config/Make.rules
+++ b/objective-c/config/Make.rules
@@ -55,7 +55,7 @@ embedded_runpath ?= yes
 #
 # Common definitions
 #
-ice_language     = objc
+ice_language     = objective-c
 slice_translator = slice2objc
 
 ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0)
diff --git a/objc/config/Make.rules.Darwin b/objective-c/config/Make.rules.Darwin
index 35658cc9704..35658cc9704 100644
--- a/objc/config/Make.rules.Darwin
+++ b/objective-c/config/Make.rules.Darwin
diff --git a/objc/config/makegitignore.py b/objective-c/config/makegitignore.py
index f1c7db23238..0444f3997ad 100755
--- a/objc/config/makegitignore.py
+++ b/objective-c/config/makegitignore.py
@@ -123,13 +123,13 @@ if len(args) != 0:
 #
 for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
     toplevel = os.path.abspath(toplevel)
-    if os.path.exists(os.path.join(toplevel, "objc", "config", "makegitignore.py")):
+    if os.path.exists(os.path.join(toplevel, "objective-c", "config", "makegitignore.py")):
         break
 else:
     print("cannot find top-level directory")
     sys.exit(1)
 
-makefiles = find(os.path.join(toplevel, "objc"), "Makefile")
+makefiles = find(os.path.join(toplevel, "objective-c"), "Makefile")
 cwd = os.getcwd()
 gitIgnoreFiles = { }
 for i in makefiles:
@@ -146,7 +146,7 @@ for i in makefiles:
     
 os.chdir(cwd)
 
-excludePath = [ os.path.join(toplevel, "objc", "bin"), os.path.join(toplevel, "objc", "lib") ]
+excludePath = [ os.path.join(toplevel, "objective-c", "bin"), os.path.join(toplevel, "objective-c", "lib") ]
 for (path, files) in gitIgnoreFiles.iteritems():
     if os.path.dirname(path) in excludePath:
         continue
diff --git a/objc/include/Makefile b/objective-c/include/Makefile
index 17d4d14e2fc..17d4d14e2fc 100644
--- a/objc/include/Makefile
+++ b/objective-c/include/Makefile
diff --git a/objc/include/objc/Glacier2.h b/objective-c/include/objc/Glacier2.h
index b70e3caf3b0..b70e3caf3b0 100644
--- a/objc/include/objc/Glacier2.h
+++ b/objective-c/include/objc/Glacier2.h
diff --git a/objc/include/objc/Glacier2/.gitignore b/objective-c/include/objc/Glacier2/.gitignore
index 382c7a11d64..382c7a11d64 100644
--- a/objc/include/objc/Glacier2/.gitignore
+++ b/objective-c/include/objc/Glacier2/.gitignore
diff --git a/objc/include/objc/Glacier2/Glacier2.h b/objective-c/include/objc/Glacier2/Glacier2.h
index bde62e8c72a..bde62e8c72a 100644
--- a/objc/include/objc/Glacier2/Glacier2.h
+++ b/objective-c/include/objc/Glacier2/Glacier2.h
diff --git a/objc/include/objc/Glacier2/Makefile b/objective-c/include/objc/Glacier2/Makefile
index 320137fd7f6..320137fd7f6 100644
--- a/objc/include/objc/Glacier2/Makefile
+++ b/objective-c/include/objc/Glacier2/Makefile
diff --git a/objc/include/objc/Ice.h b/objective-c/include/objc/Ice.h
index 6de03a5e52d..6de03a5e52d 100644
--- a/objc/include/objc/Ice.h
+++ b/objective-c/include/objc/Ice.h
diff --git a/objc/include/objc/Ice/.gitignore b/objective-c/include/objc/Ice/.gitignore
index 9be90a78435..9be90a78435 100644
--- a/objc/include/objc/Ice/.gitignore
+++ b/objective-c/include/objc/Ice/.gitignore
diff --git a/objc/include/objc/Ice/Config.h b/objective-c/include/objc/Ice/Config.h
index 203440a2325..203440a2325 100644
--- a/objc/include/objc/Ice/Config.h
+++ b/objective-c/include/objc/Ice/Config.h
diff --git a/objc/include/objc/Ice/DispatchInterceptor.h b/objective-c/include/objc/Ice/DispatchInterceptor.h
index 81516efeb0a..81516efeb0a 100644
--- a/objc/include/objc/Ice/DispatchInterceptor.h
+++ b/objective-c/include/objc/Ice/DispatchInterceptor.h
diff --git a/objc/include/objc/Ice/Exception.h b/objective-c/include/objc/Ice/Exception.h
index 576cb24fe39..576cb24fe39 100644
--- a/objc/include/objc/Ice/Exception.h
+++ b/objective-c/include/objc/Ice/Exception.h
diff --git a/objc/include/objc/Ice/Format.h b/objective-c/include/objc/Ice/Format.h
index 849037a97f4..849037a97f4 100644
--- a/objc/include/objc/Ice/Format.h
+++ b/objective-c/include/objc/Ice/Format.h
diff --git a/objc/include/objc/Ice/Ice.h b/objective-c/include/objc/Ice/Ice.h
index ab2b2631dd1..ab2b2631dd1 100644
--- a/objc/include/objc/Ice/Ice.h
+++ b/objective-c/include/objc/Ice/Ice.h
diff --git a/objc/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h
index 633f8a37d03..633f8a37d03 100644
--- a/objc/include/objc/Ice/Initialize.h
+++ b/objective-c/include/objc/Ice/Initialize.h
diff --git a/objc/include/objc/Ice/LocalObject.h b/objective-c/include/objc/Ice/LocalObject.h
index 533e20c3e99..533e20c3e99 100644
--- a/objc/include/objc/Ice/LocalObject.h
+++ b/objective-c/include/objc/Ice/LocalObject.h
diff --git a/objc/include/objc/Ice/Makefile b/objective-c/include/objc/Ice/Makefile
index 579f93cece1..579f93cece1 100644
--- a/objc/include/objc/Ice/Makefile
+++ b/objective-c/include/objc/Ice/Makefile
diff --git a/objc/include/objc/Ice/NativePropertiesAdmin.h b/objective-c/include/objc/Ice/NativePropertiesAdmin.h
index 98fc4362ecb..98fc4362ecb 100644
--- a/objc/include/objc/Ice/NativePropertiesAdmin.h
+++ b/objective-c/include/objc/Ice/NativePropertiesAdmin.h
diff --git a/objc/include/objc/Ice/Object.h b/objective-c/include/objc/Ice/Object.h
index 7acc8754471..7acc8754471 100644
--- a/objc/include/objc/Ice/Object.h
+++ b/objective-c/include/objc/Ice/Object.h
diff --git a/objc/include/objc/Ice/ObjectFactory.h b/objective-c/include/objc/Ice/ObjectFactory.h
index 8463e895780..8463e895780 100644
--- a/objc/include/objc/Ice/ObjectFactory.h
+++ b/objective-c/include/objc/Ice/ObjectFactory.h
diff --git a/objc/include/objc/Ice/Proxy.h b/objective-c/include/objc/Ice/Proxy.h
index 9f501c4cd28..9f501c4cd28 100644
--- a/objc/include/objc/Ice/Proxy.h
+++ b/objective-c/include/objc/Ice/Proxy.h
diff --git a/objc/include/objc/Ice/SlicedData.h b/objective-c/include/objc/Ice/SlicedData.h
index 8124e47a53b..8124e47a53b 100644
--- a/objc/include/objc/Ice/SlicedData.h
+++ b/objective-c/include/objc/Ice/SlicedData.h
diff --git a/objc/include/objc/Ice/Stream.h b/objective-c/include/objc/Ice/Stream.h
index 71dd4c87b2b..71dd4c87b2b 100644
--- a/objc/include/objc/Ice/Stream.h
+++ b/objective-c/include/objc/Ice/Stream.h
diff --git a/objc/include/objc/IceGrid.h b/objective-c/include/objc/IceGrid.h
index c52b9c6a63b..c52b9c6a63b 100644
--- a/objc/include/objc/IceGrid.h
+++ b/objective-c/include/objc/IceGrid.h
diff --git a/objc/include/objc/IceGrid/.gitignore b/objective-c/include/objc/IceGrid/.gitignore
index 41f5d685b02..41f5d685b02 100644
--- a/objc/include/objc/IceGrid/.gitignore
+++ b/objective-c/include/objc/IceGrid/.gitignore
diff --git a/objc/include/objc/IceGrid/IceGrid.h b/objective-c/include/objc/IceGrid/IceGrid.h
index 6d3772b231d..6d3772b231d 100644
--- a/objc/include/objc/IceGrid/IceGrid.h
+++ b/objective-c/include/objc/IceGrid/IceGrid.h
diff --git a/objc/include/objc/IceGrid/Makefile b/objective-c/include/objc/IceGrid/Makefile
index 7913d2f0189..7913d2f0189 100644
--- a/objc/include/objc/IceGrid/Makefile
+++ b/objective-c/include/objc/IceGrid/Makefile
diff --git a/objc/include/objc/IceSSL.h b/objective-c/include/objc/IceSSL.h
index a41037e506e..a41037e506e 100644
--- a/objc/include/objc/IceSSL.h
+++ b/objective-c/include/objc/IceSSL.h
diff --git a/objc/include/objc/IceSSL/.gitignore b/objective-c/include/objc/IceSSL/.gitignore
index f53e54c68e3..f53e54c68e3 100644
--- a/objc/include/objc/IceSSL/.gitignore
+++ b/objective-c/include/objc/IceSSL/.gitignore
diff --git a/objc/include/objc/IceSSL/IceSSL.h b/objective-c/include/objc/IceSSL/IceSSL.h
index 9d68b586603..9d68b586603 100644
--- a/objc/include/objc/IceSSL/IceSSL.h
+++ b/objective-c/include/objc/IceSSL/IceSSL.h
diff --git a/objc/include/objc/IceSSL/Makefile b/objective-c/include/objc/IceSSL/Makefile
index 05cf5812ee6..05cf5812ee6 100644
--- a/objc/include/objc/IceSSL/Makefile
+++ b/objective-c/include/objc/IceSSL/Makefile
diff --git a/objc/include/objc/IceStorm.h b/objective-c/include/objc/IceStorm.h
index 1cd594d785b..1cd594d785b 100644
--- a/objc/include/objc/IceStorm.h
+++ b/objective-c/include/objc/IceStorm.h
diff --git a/objc/include/objc/IceStorm/.gitignore b/objective-c/include/objc/IceStorm/.gitignore
index bb5bf8a8dc7..bb5bf8a8dc7 100644
--- a/objc/include/objc/IceStorm/.gitignore
+++ b/objective-c/include/objc/IceStorm/.gitignore
diff --git a/objc/include/objc/IceStorm/Makefile b/objective-c/include/objc/IceStorm/Makefile
index 500b08e2668..500b08e2668 100644
--- a/objc/include/objc/IceStorm/Makefile
+++ b/objective-c/include/objc/IceStorm/Makefile
diff --git a/objc/include/objc/Makefile b/objective-c/include/objc/Makefile
index f2d331fd0c2..f2d331fd0c2 100644
--- a/objc/include/objc/Makefile
+++ b/objective-c/include/objc/Makefile
diff --git a/objc/lib/.gitignore b/objective-c/lib/.gitignore
index 39af5887579..39af5887579 100644
--- a/objc/lib/.gitignore
+++ b/objective-c/lib/.gitignore
diff --git a/objc/src/Glacier2/.gitignore b/objective-c/src/Glacier2/.gitignore
index ece727d3b20..ece727d3b20 100644
--- a/objc/src/Glacier2/.gitignore
+++ b/objective-c/src/Glacier2/.gitignore
diff --git a/objc/src/Glacier2/Makefile b/objective-c/src/Glacier2/Makefile
index dd942e510f2..dd942e510f2 100644
--- a/objc/src/Glacier2/Makefile
+++ b/objective-c/src/Glacier2/Makefile
diff --git a/objc/src/Ice/.gitignore b/objective-c/src/Ice/.gitignore
index 7f8d62bd8d6..7f8d62bd8d6 100644
--- a/objc/src/Ice/.gitignore
+++ b/objective-c/src/Ice/.gitignore
diff --git a/objc/src/Ice/BatchRequestInterceptor.mm b/objective-c/src/Ice/BatchRequestInterceptor.mm
index 43a72ad5f07..43a72ad5f07 100644
--- a/objc/src/Ice/BatchRequestInterceptor.mm
+++ b/objective-c/src/Ice/BatchRequestInterceptor.mm
diff --git a/objc/src/Ice/BatchRequestInterceptorI.h b/objective-c/src/Ice/BatchRequestInterceptorI.h
index 9ebcc87600e..9ebcc87600e 100644
--- a/objc/src/Ice/BatchRequestInterceptorI.h
+++ b/objective-c/src/Ice/BatchRequestInterceptorI.h
diff --git a/objc/src/Ice/CommunicatorI.h b/objective-c/src/Ice/CommunicatorI.h
index e900d52601b..e900d52601b 100644
--- a/objc/src/Ice/CommunicatorI.h
+++ b/objective-c/src/Ice/CommunicatorI.h
diff --git a/objc/src/Ice/CommunicatorI.mm b/objective-c/src/Ice/CommunicatorI.mm
index 6b19bbc862a..6b19bbc862a 100644
--- a/objc/src/Ice/CommunicatorI.mm
+++ b/objective-c/src/Ice/CommunicatorI.mm
diff --git a/objc/src/Ice/ConnectionI.h b/objective-c/src/Ice/ConnectionI.h
index 4ac8abc445a..4ac8abc445a 100644
--- a/objc/src/Ice/ConnectionI.h
+++ b/objective-c/src/Ice/ConnectionI.h
diff --git a/objc/src/Ice/ConnectionI.mm b/objective-c/src/Ice/ConnectionI.mm
index 21b4ce742f8..21b4ce742f8 100644
--- a/objc/src/Ice/ConnectionI.mm
+++ b/objective-c/src/Ice/ConnectionI.mm
diff --git a/objc/src/Ice/CurrentI.h b/objective-c/src/Ice/CurrentI.h
index 3c9fdf7dafe..3c9fdf7dafe 100644
--- a/objc/src/Ice/CurrentI.h
+++ b/objective-c/src/Ice/CurrentI.h
diff --git a/objc/src/Ice/CurrentI.mm b/objective-c/src/Ice/CurrentI.mm
index c84a8f4f5c1..c84a8f4f5c1 100644
--- a/objc/src/Ice/CurrentI.mm
+++ b/objective-c/src/Ice/CurrentI.mm
diff --git a/objc/src/Ice/DispatchInterceptor.m b/objective-c/src/Ice/DispatchInterceptor.m
index f8c6c5a150d..f8c6c5a150d 100644
--- a/objc/src/Ice/DispatchInterceptor.m
+++ b/objective-c/src/Ice/DispatchInterceptor.m
diff --git a/objc/src/Ice/Dispatcher.mm b/objective-c/src/Ice/Dispatcher.mm
index a3a53fa9ac2..a3a53fa9ac2 100644
--- a/objc/src/Ice/Dispatcher.mm
+++ b/objective-c/src/Ice/Dispatcher.mm
diff --git a/objc/src/Ice/DispatcherI.h b/objective-c/src/Ice/DispatcherI.h
index 9ad5554add8..9ad5554add8 100644
--- a/objc/src/Ice/DispatcherI.h
+++ b/objective-c/src/Ice/DispatcherI.h
diff --git a/objc/src/Ice/EndpointI.h b/objective-c/src/Ice/EndpointI.h
index bba7cfd1bdf..bba7cfd1bdf 100644
--- a/objc/src/Ice/EndpointI.h
+++ b/objective-c/src/Ice/EndpointI.h
diff --git a/objc/src/Ice/EndpointI.mm b/objective-c/src/Ice/EndpointI.mm
index ea308e35f98..ea308e35f98 100644
--- a/objc/src/Ice/EndpointI.mm
+++ b/objective-c/src/Ice/EndpointI.mm
diff --git a/objc/src/Ice/Exception.mm b/objective-c/src/Ice/Exception.mm
index 97f265c407d..97f265c407d 100644
--- a/objc/src/Ice/Exception.mm
+++ b/objective-c/src/Ice/Exception.mm
diff --git a/objc/src/Ice/ExceptionI.h b/objective-c/src/Ice/ExceptionI.h
index fb28fb979ca..fb28fb979ca 100644
--- a/objc/src/Ice/ExceptionI.h
+++ b/objective-c/src/Ice/ExceptionI.h
diff --git a/objc/src/Ice/IdentityI.h b/objective-c/src/Ice/IdentityI.h
index c69ac138fb1..c69ac138fb1 100644
--- a/objc/src/Ice/IdentityI.h
+++ b/objective-c/src/Ice/IdentityI.h
diff --git a/objc/src/Ice/IdentityI.mm b/objective-c/src/Ice/IdentityI.mm
index 917deb91514..917deb91514 100644
--- a/objc/src/Ice/IdentityI.mm
+++ b/objective-c/src/Ice/IdentityI.mm
diff --git a/objc/src/Ice/ImplicitContextI.h b/objective-c/src/Ice/ImplicitContextI.h
index 4c4782c377f..4c4782c377f 100644
--- a/objc/src/Ice/ImplicitContextI.h
+++ b/objective-c/src/Ice/ImplicitContextI.h
diff --git a/objc/src/Ice/ImplicitContextI.mm b/objective-c/src/Ice/ImplicitContextI.mm
index b564bdc78f6..b564bdc78f6 100644
--- a/objc/src/Ice/ImplicitContextI.mm
+++ b/objective-c/src/Ice/ImplicitContextI.mm
diff --git a/objc/src/Ice/Initialize.mm b/objective-c/src/Ice/Initialize.mm
index f4bd535d367..f4bd535d367 100644
--- a/objc/src/Ice/Initialize.mm
+++ b/objective-c/src/Ice/Initialize.mm
diff --git a/objc/src/Ice/InitializeI.h b/objective-c/src/Ice/InitializeI.h
index 9fcbc87cbed..9fcbc87cbed 100644
--- a/objc/src/Ice/InitializeI.h
+++ b/objective-c/src/Ice/InitializeI.h
diff --git a/objc/src/Ice/LocalObject.mm b/objective-c/src/Ice/LocalObject.mm
index e7651c85d33..e7651c85d33 100644
--- a/objc/src/Ice/LocalObject.mm
+++ b/objective-c/src/Ice/LocalObject.mm
diff --git a/objc/src/Ice/LocalObjectI.h b/objective-c/src/Ice/LocalObjectI.h
index 1020ecd3077..1020ecd3077 100644
--- a/objc/src/Ice/LocalObjectI.h
+++ b/objective-c/src/Ice/LocalObjectI.h
diff --git a/objc/src/Ice/LoggerI.h b/objective-c/src/Ice/LoggerI.h
index cf8cd98d224..cf8cd98d224 100644
--- a/objc/src/Ice/LoggerI.h
+++ b/objective-c/src/Ice/LoggerI.h
diff --git a/objc/src/Ice/LoggerI.mm b/objective-c/src/Ice/LoggerI.mm
index 96f0006ae73..96f0006ae73 100644
--- a/objc/src/Ice/LoggerI.mm
+++ b/objective-c/src/Ice/LoggerI.mm
diff --git a/objc/src/Ice/Makefile b/objective-c/src/Ice/Makefile
index 5e61fb797a5..5e61fb797a5 100644
--- a/objc/src/Ice/Makefile
+++ b/objective-c/src/Ice/Makefile
diff --git a/objc/src/Ice/Object.mm b/objective-c/src/Ice/Object.mm
index 3f571a7b084..3f571a7b084 100644
--- a/objc/src/Ice/Object.mm
+++ b/objective-c/src/Ice/Object.mm
diff --git a/objc/src/Ice/ObjectAdapterI.h b/objective-c/src/Ice/ObjectAdapterI.h
index 8d859c4be7a..8d859c4be7a 100644
--- a/objc/src/Ice/ObjectAdapterI.h
+++ b/objective-c/src/Ice/ObjectAdapterI.h
diff --git a/objc/src/Ice/ObjectAdapterI.mm b/objective-c/src/Ice/ObjectAdapterI.mm
index 41b30a55e4e..41b30a55e4e 100644
--- a/objc/src/Ice/ObjectAdapterI.mm
+++ b/objective-c/src/Ice/ObjectAdapterI.mm
diff --git a/objc/src/Ice/ObjectI.h b/objective-c/src/Ice/ObjectI.h
index 87e9d01bd7a..87e9d01bd7a 100644
--- a/objc/src/Ice/ObjectI.h
+++ b/objective-c/src/Ice/ObjectI.h
diff --git a/objc/src/Ice/PropertiesI.h b/objective-c/src/Ice/PropertiesI.h
index c7d54756cbc..c7d54756cbc 100644
--- a/objc/src/Ice/PropertiesI.h
+++ b/objective-c/src/Ice/PropertiesI.h
diff --git a/objc/src/Ice/PropertiesI.mm b/objective-c/src/Ice/PropertiesI.mm
index 176521af234..176521af234 100644
--- a/objc/src/Ice/PropertiesI.mm
+++ b/objective-c/src/Ice/PropertiesI.mm
diff --git a/objc/src/Ice/Proxy.mm b/objective-c/src/Ice/Proxy.mm
index 04f076b9f02..04f076b9f02 100644
--- a/objc/src/Ice/Proxy.mm
+++ b/objective-c/src/Ice/Proxy.mm
diff --git a/objc/src/Ice/ProxyI.h b/objective-c/src/Ice/ProxyI.h
index 934ed6de73c..934ed6de73c 100644
--- a/objc/src/Ice/ProxyI.h
+++ b/objective-c/src/Ice/ProxyI.h
diff --git a/objc/src/Ice/Request.h b/objective-c/src/Ice/Request.h
index 0f07ca48331..0f07ca48331 100644
--- a/objc/src/Ice/Request.h
+++ b/objective-c/src/Ice/Request.h
diff --git a/objc/src/Ice/Request.m b/objective-c/src/Ice/Request.m
index 8d60870e177..8d60870e177 100644
--- a/objc/src/Ice/Request.m
+++ b/objective-c/src/Ice/Request.m
diff --git a/objc/src/Ice/SlicedData.mm b/objective-c/src/Ice/SlicedData.mm
index 91bb70a7da6..91bb70a7da6 100644
--- a/objc/src/Ice/SlicedData.mm
+++ b/objective-c/src/Ice/SlicedData.mm
diff --git a/objc/src/Ice/SlicedDataI.h b/objective-c/src/Ice/SlicedDataI.h
index 933c589ad2d..933c589ad2d 100644
--- a/objc/src/Ice/SlicedDataI.h
+++ b/objective-c/src/Ice/SlicedDataI.h
diff --git a/objc/src/Ice/Stream.mm b/objective-c/src/Ice/Stream.mm
index 2890833320c..2890833320c 100644
--- a/objc/src/Ice/Stream.mm
+++ b/objective-c/src/Ice/Stream.mm
diff --git a/objc/src/Ice/StreamI.h b/objective-c/src/Ice/StreamI.h
index 650e9c4eefb..650e9c4eefb 100644
--- a/objc/src/Ice/StreamI.h
+++ b/objective-c/src/Ice/StreamI.h
diff --git a/objc/src/Ice/Util.h b/objective-c/src/Ice/Util.h
index d1efff67f89..d1efff67f89 100644
--- a/objc/src/Ice/Util.h
+++ b/objective-c/src/Ice/Util.h
diff --git a/objc/src/Ice/Util.mm b/objective-c/src/Ice/Util.mm
index 4462431c96f..4462431c96f 100644
--- a/objc/src/Ice/Util.mm
+++ b/objective-c/src/Ice/Util.mm
diff --git a/objc/src/Ice/VersionI.h b/objective-c/src/Ice/VersionI.h
index d894260dca3..d894260dca3 100644
--- a/objc/src/Ice/VersionI.h
+++ b/objective-c/src/Ice/VersionI.h
diff --git a/objc/src/Ice/VersionI.mm b/objective-c/src/Ice/VersionI.mm
index d1c3b263f08..d1c3b263f08 100644
--- a/objc/src/Ice/VersionI.mm
+++ b/objective-c/src/Ice/VersionI.mm
diff --git a/objc/src/IceGrid/.gitignore b/objective-c/src/IceGrid/.gitignore
index 1d8a22c0997..1d8a22c0997 100644
--- a/objc/src/IceGrid/.gitignore
+++ b/objective-c/src/IceGrid/.gitignore
diff --git a/objc/src/IceGrid/Makefile b/objective-c/src/IceGrid/Makefile
index 6aca248fa09..6aca248fa09 100644
--- a/objc/src/IceGrid/Makefile
+++ b/objective-c/src/IceGrid/Makefile
diff --git a/objc/src/IceSSL/.gitignore b/objective-c/src/IceSSL/.gitignore
index 6252a80b316..6252a80b316 100644
--- a/objc/src/IceSSL/.gitignore
+++ b/objective-c/src/IceSSL/.gitignore
diff --git a/objc/src/IceSSL/ConnectionInfoI.mm b/objective-c/src/IceSSL/ConnectionInfoI.mm
index 20b88aa5551..20b88aa5551 100644
--- a/objc/src/IceSSL/ConnectionInfoI.mm
+++ b/objective-c/src/IceSSL/ConnectionInfoI.mm
diff --git a/objc/src/IceSSL/EndpointInfoI.mm b/objective-c/src/IceSSL/EndpointInfoI.mm
index ca65883d7a0..ca65883d7a0 100644
--- a/objc/src/IceSSL/EndpointInfoI.mm
+++ b/objective-c/src/IceSSL/EndpointInfoI.mm
diff --git a/objc/src/IceSSL/Makefile b/objective-c/src/IceSSL/Makefile
index d25103405a1..d25103405a1 100644
--- a/objc/src/IceSSL/Makefile
+++ b/objective-c/src/IceSSL/Makefile
diff --git a/objc/src/IceStorm/.gitignore b/objective-c/src/IceStorm/.gitignore
index 166500719d4..166500719d4 100644
--- a/objc/src/IceStorm/.gitignore
+++ b/objective-c/src/IceStorm/.gitignore
diff --git a/objc/src/IceStorm/Makefile b/objective-c/src/IceStorm/Makefile
index 1c55d69ffae..1c55d69ffae 100644
--- a/objc/src/IceStorm/Makefile
+++ b/objective-c/src/IceStorm/Makefile
diff --git a/objc/src/Makefile b/objective-c/src/Makefile
index ef3ea47451d..ef3ea47451d 100644
--- a/objc/src/Makefile
+++ b/objective-c/src/Makefile
diff --git a/objc/test/Common/.gitignore b/objective-c/test/Common/.gitignore
index 3a412ca89c7..3a412ca89c7 100644
--- a/objc/test/Common/.gitignore
+++ b/objective-c/test/Common/.gitignore
diff --git a/objc/test/Common/Makefile b/objective-c/test/Common/Makefile
index f9051634da0..f9051634da0 100644
--- a/objc/test/Common/Makefile
+++ b/objective-c/test/Common/Makefile
diff --git a/objc/test/Common/TestCommon.m b/objective-c/test/Common/TestCommon.m
index fad9e6da5e3..fad9e6da5e3 100644
--- a/objc/test/Common/TestCommon.m
+++ b/objective-c/test/Common/TestCommon.m
diff --git a/objc/test/Ice/Makefile b/objective-c/test/Ice/Makefile
index 270f6c79dbf..270f6c79dbf 100644
--- a/objc/test/Ice/Makefile
+++ b/objective-c/test/Ice/Makefile
diff --git a/objc/test/Ice/acm/.gitignore b/objective-c/test/Ice/acm/.gitignore
index 3fdb6d1ddfc..3fdb6d1ddfc 100644
--- a/objc/test/Ice/acm/.gitignore
+++ b/objective-c/test/Ice/acm/.gitignore
diff --git a/objc/test/Ice/acm/ACMTest.ice b/objective-c/test/Ice/acm/ACMTest.ice
index 1e6bcd7eb69..1e6bcd7eb69 100644
--- a/objc/test/Ice/acm/ACMTest.ice
+++ b/objective-c/test/Ice/acm/ACMTest.ice
diff --git a/objc/test/Ice/acm/AllTests.m b/objective-c/test/Ice/acm/AllTests.m
index ca9d73278db..ca9d73278db 100644
--- a/objc/test/Ice/acm/AllTests.m
+++ b/objective-c/test/Ice/acm/AllTests.m
diff --git a/objc/test/Ice/acm/Client.m b/objective-c/test/Ice/acm/Client.m
index c709d687245..c709d687245 100644
--- a/objc/test/Ice/acm/Client.m
+++ b/objective-c/test/Ice/acm/Client.m
diff --git a/objc/test/Ice/acm/Makefile b/objective-c/test/Ice/acm/Makefile
index ba45e28b131..ba45e28b131 100644
--- a/objc/test/Ice/acm/Makefile
+++ b/objective-c/test/Ice/acm/Makefile
diff --git a/objc/test/Ice/acm/Server.m b/objective-c/test/Ice/acm/Server.m
index 1d4e7a0a31a..1d4e7a0a31a 100644
--- a/objc/test/Ice/acm/Server.m
+++ b/objective-c/test/Ice/acm/Server.m
diff --git a/objc/test/Ice/acm/TestI.h b/objective-c/test/Ice/acm/TestI.h
index 4f933ed32c5..4f933ed32c5 100644
--- a/objc/test/Ice/acm/TestI.h
+++ b/objective-c/test/Ice/acm/TestI.h
diff --git a/objc/test/Ice/acm/TestI.m b/objective-c/test/Ice/acm/TestI.m
index 5de0e0eeb88..5de0e0eeb88 100644
--- a/objc/test/Ice/acm/TestI.m
+++ b/objective-c/test/Ice/acm/TestI.m
diff --git a/objc/test/Ice/acm/run.py b/objective-c/test/Ice/acm/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/acm/run.py
+++ b/objective-c/test/Ice/acm/run.py
diff --git a/objc/test/Ice/adapterDeactivation/.gitignore b/objective-c/test/Ice/adapterDeactivation/.gitignore
index cd60a278305..cd60a278305 100644
--- a/objc/test/Ice/adapterDeactivation/.gitignore
+++ b/objective-c/test/Ice/adapterDeactivation/.gitignore
diff --git a/objc/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
index 1f269b93af7..1f269b93af7 100644
--- a/objc/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
+++ b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
diff --git a/objc/test/Ice/adapterDeactivation/AllTests.m b/objective-c/test/Ice/adapterDeactivation/AllTests.m
index 25f93e1936f..25f93e1936f 100644
--- a/objc/test/Ice/adapterDeactivation/AllTests.m
+++ b/objective-c/test/Ice/adapterDeactivation/AllTests.m
diff --git a/objc/test/Ice/adapterDeactivation/Client.m b/objective-c/test/Ice/adapterDeactivation/Client.m
index 3572a11bb90..3572a11bb90 100644
--- a/objc/test/Ice/adapterDeactivation/Client.m
+++ b/objective-c/test/Ice/adapterDeactivation/Client.m
diff --git a/objc/test/Ice/adapterDeactivation/Collocated.m b/objective-c/test/Ice/adapterDeactivation/Collocated.m
index 468a6f8bbf8..468a6f8bbf8 100644
--- a/objc/test/Ice/adapterDeactivation/Collocated.m
+++ b/objective-c/test/Ice/adapterDeactivation/Collocated.m
diff --git a/objc/test/Ice/adapterDeactivation/Makefile b/objective-c/test/Ice/adapterDeactivation/Makefile
index 5c2173a9d94..5c2173a9d94 100644
--- a/objc/test/Ice/adapterDeactivation/Makefile
+++ b/objective-c/test/Ice/adapterDeactivation/Makefile
diff --git a/objc/test/Ice/adapterDeactivation/Server.m b/objective-c/test/Ice/adapterDeactivation/Server.m
index d66fd41c1c3..d66fd41c1c3 100644
--- a/objc/test/Ice/adapterDeactivation/Server.m
+++ b/objective-c/test/Ice/adapterDeactivation/Server.m
diff --git a/objc/test/Ice/adapterDeactivation/TestI.h b/objective-c/test/Ice/adapterDeactivation/TestI.h
index 7b24da28a7e..7b24da28a7e 100644
--- a/objc/test/Ice/adapterDeactivation/TestI.h
+++ b/objective-c/test/Ice/adapterDeactivation/TestI.h
diff --git a/objc/test/Ice/adapterDeactivation/TestI.m b/objective-c/test/Ice/adapterDeactivation/TestI.m
index bc4c24c87c9..bc4c24c87c9 100644
--- a/objc/test/Ice/adapterDeactivation/TestI.m
+++ b/objective-c/test/Ice/adapterDeactivation/TestI.m
diff --git a/objc/test/Ice/adapterDeactivation/run.py b/objective-c/test/Ice/adapterDeactivation/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/adapterDeactivation/run.py
+++ b/objective-c/test/Ice/adapterDeactivation/run.py
diff --git a/objc/test/Ice/admin/.gitignore b/objective-c/test/Ice/admin/.gitignore
index a064c4256c8..a064c4256c8 100644
--- a/objc/test/Ice/admin/.gitignore
+++ b/objective-c/test/Ice/admin/.gitignore
diff --git a/objc/test/Ice/admin/AdminTest.ice b/objective-c/test/Ice/admin/AdminTest.ice
index 5456fece9bd..5456fece9bd 100644
--- a/objc/test/Ice/admin/AdminTest.ice
+++ b/objective-c/test/Ice/admin/AdminTest.ice
diff --git a/objc/test/Ice/admin/AllTests.m b/objective-c/test/Ice/admin/AllTests.m
index 006af8832b3..006af8832b3 100644
--- a/objc/test/Ice/admin/AllTests.m
+++ b/objective-c/test/Ice/admin/AllTests.m
diff --git a/objc/test/Ice/admin/Client.m b/objective-c/test/Ice/admin/Client.m
index 490d51f8a88..490d51f8a88 100644
--- a/objc/test/Ice/admin/Client.m
+++ b/objective-c/test/Ice/admin/Client.m
diff --git a/objc/test/Ice/admin/Makefile b/objective-c/test/Ice/admin/Makefile
index af39c7ba045..af39c7ba045 100644
--- a/objc/test/Ice/admin/Makefile
+++ b/objective-c/test/Ice/admin/Makefile
diff --git a/objc/test/Ice/admin/Server.m b/objective-c/test/Ice/admin/Server.m
index f2dff2b9ec5..f2dff2b9ec5 100644
--- a/objc/test/Ice/admin/Server.m
+++ b/objective-c/test/Ice/admin/Server.m
diff --git a/objc/test/Ice/admin/TestI.h b/objective-c/test/Ice/admin/TestI.h
index 5dbd0808187..5dbd0808187 100644
--- a/objc/test/Ice/admin/TestI.h
+++ b/objective-c/test/Ice/admin/TestI.h
diff --git a/objc/test/Ice/admin/TestI.m b/objective-c/test/Ice/admin/TestI.m
index a63a31db733..a63a31db733 100644
--- a/objc/test/Ice/admin/TestI.m
+++ b/objective-c/test/Ice/admin/TestI.m
diff --git a/objc/test/Ice/admin/run.py b/objective-c/test/Ice/admin/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/admin/run.py
+++ b/objective-c/test/Ice/admin/run.py
diff --git a/objc/test/Ice/ami/.gitignore b/objective-c/test/Ice/ami/.gitignore
index a8a4ccc28db..a8a4ccc28db 100644
--- a/objc/test/Ice/ami/.gitignore
+++ b/objective-c/test/Ice/ami/.gitignore
diff --git a/objc/test/Ice/ami/AMITest.ice b/objective-c/test/Ice/ami/AMITest.ice
index b0c0e8606fe..b0c0e8606fe 100644
--- a/objc/test/Ice/ami/AMITest.ice
+++ b/objective-c/test/Ice/ami/AMITest.ice
diff --git a/objc/test/Ice/ami/AllTests.m b/objective-c/test/Ice/ami/AllTests.m
index acfc5fe6abc..acfc5fe6abc 100644
--- a/objc/test/Ice/ami/AllTests.m
+++ b/objective-c/test/Ice/ami/AllTests.m
diff --git a/objc/test/Ice/ami/Client.m b/objective-c/test/Ice/ami/Client.m
index ef45b481b37..ef45b481b37 100644
--- a/objc/test/Ice/ami/Client.m
+++ b/objective-c/test/Ice/ami/Client.m
diff --git a/objc/test/Ice/ami/Collocated.m b/objective-c/test/Ice/ami/Collocated.m
index d28473cfce9..d28473cfce9 100644
--- a/objc/test/Ice/ami/Collocated.m
+++ b/objective-c/test/Ice/ami/Collocated.m
diff --git a/objc/test/Ice/ami/Makefile b/objective-c/test/Ice/ami/Makefile
index 0667e0e7055..0667e0e7055 100644
--- a/objc/test/Ice/ami/Makefile
+++ b/objective-c/test/Ice/ami/Makefile
diff --git a/objc/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m
index d663915732d..d663915732d 100644
--- a/objc/test/Ice/ami/Server.m
+++ b/objective-c/test/Ice/ami/Server.m
diff --git a/objc/test/Ice/ami/TestI.h b/objective-c/test/Ice/ami/TestI.h
index 88d8f6026a7..88d8f6026a7 100644
--- a/objc/test/Ice/ami/TestI.h
+++ b/objective-c/test/Ice/ami/TestI.h
diff --git a/objc/test/Ice/ami/TestI.m b/objective-c/test/Ice/ami/TestI.m
index 1c4c493540a..1c4c493540a 100644
--- a/objc/test/Ice/ami/TestI.m
+++ b/objective-c/test/Ice/ami/TestI.m
diff --git a/objc/test/Ice/ami/run.py b/objective-c/test/Ice/ami/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/ami/run.py
+++ b/objective-c/test/Ice/ami/run.py
diff --git a/objc/test/Ice/binding/.gitignore b/objective-c/test/Ice/binding/.gitignore
index 111134fb8e1..111134fb8e1 100644
--- a/objc/test/Ice/binding/.gitignore
+++ b/objective-c/test/Ice/binding/.gitignore
diff --git a/objc/test/Ice/binding/AllTests.m b/objective-c/test/Ice/binding/AllTests.m
index ea148bbf5e3..ea148bbf5e3 100644
--- a/objc/test/Ice/binding/AllTests.m
+++ b/objective-c/test/Ice/binding/AllTests.m
diff --git a/objc/test/Ice/binding/BindingTest.ice b/objective-c/test/Ice/binding/BindingTest.ice
index 65be70c52df..65be70c52df 100644
--- a/objc/test/Ice/binding/BindingTest.ice
+++ b/objective-c/test/Ice/binding/BindingTest.ice
diff --git a/objc/test/Ice/binding/Client.m b/objective-c/test/Ice/binding/Client.m
index 375e6f2f18b..375e6f2f18b 100644
--- a/objc/test/Ice/binding/Client.m
+++ b/objective-c/test/Ice/binding/Client.m
diff --git a/objc/test/Ice/binding/Makefile b/objective-c/test/Ice/binding/Makefile
index a9da9aad0c7..a9da9aad0c7 100644
--- a/objc/test/Ice/binding/Makefile
+++ b/objective-c/test/Ice/binding/Makefile
diff --git a/objc/test/Ice/binding/Server.m b/objective-c/test/Ice/binding/Server.m
index 695129c7173..695129c7173 100644
--- a/objc/test/Ice/binding/Server.m
+++ b/objective-c/test/Ice/binding/Server.m
diff --git a/objc/test/Ice/binding/TestI.h b/objective-c/test/Ice/binding/TestI.h
index 1b6e28598b5..1b6e28598b5 100644
--- a/objc/test/Ice/binding/TestI.h
+++ b/objective-c/test/Ice/binding/TestI.h
diff --git a/objc/test/Ice/binding/TestI.m b/objective-c/test/Ice/binding/TestI.m
index 1547ecc5181..1547ecc5181 100644
--- a/objc/test/Ice/binding/TestI.m
+++ b/objective-c/test/Ice/binding/TestI.m
diff --git a/objc/test/Ice/binding/run.py b/objective-c/test/Ice/binding/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/binding/run.py
+++ b/objective-c/test/Ice/binding/run.py
diff --git a/objc/test/Ice/defaultServant/.gitignore b/objective-c/test/Ice/defaultServant/.gitignore
index f330ebd1012..f330ebd1012 100644
--- a/objc/test/Ice/defaultServant/.gitignore
+++ b/objective-c/test/Ice/defaultServant/.gitignore
diff --git a/objc/test/Ice/defaultServant/Client.m b/objective-c/test/Ice/defaultServant/Client.m
index 4baeb27d6e0..4baeb27d6e0 100644
--- a/objc/test/Ice/defaultServant/Client.m
+++ b/objective-c/test/Ice/defaultServant/Client.m
diff --git a/objc/test/Ice/defaultServant/DefaultServantTest.ice b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
index 580787d52a3..580787d52a3 100644
--- a/objc/test/Ice/defaultServant/DefaultServantTest.ice
+++ b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
diff --git a/objc/test/Ice/defaultServant/Makefile b/objective-c/test/Ice/defaultServant/Makefile
index 76982f8e7d8..76982f8e7d8 100644
--- a/objc/test/Ice/defaultServant/Makefile
+++ b/objective-c/test/Ice/defaultServant/Makefile
diff --git a/objc/test/Ice/defaultServant/MyObjectI.h b/objective-c/test/Ice/defaultServant/MyObjectI.h
index 4cbfb538f60..4cbfb538f60 100644
--- a/objc/test/Ice/defaultServant/MyObjectI.h
+++ b/objective-c/test/Ice/defaultServant/MyObjectI.h
diff --git a/objc/test/Ice/defaultServant/MyObjectI.m b/objective-c/test/Ice/defaultServant/MyObjectI.m
index e4b6868a97e..e4b6868a97e 100644
--- a/objc/test/Ice/defaultServant/MyObjectI.m
+++ b/objective-c/test/Ice/defaultServant/MyObjectI.m
diff --git a/objc/test/Ice/defaultServant/run.py b/objective-c/test/Ice/defaultServant/run.py
index b155d75909d..b155d75909d 100755
--- a/objc/test/Ice/defaultServant/run.py
+++ b/objective-c/test/Ice/defaultServant/run.py
diff --git a/objc/test/Ice/defaultValue/.gitignore b/objective-c/test/Ice/defaultValue/.gitignore
index e4c2ca683a3..e4c2ca683a3 100644
--- a/objc/test/Ice/defaultValue/.gitignore
+++ b/objective-c/test/Ice/defaultValue/.gitignore
diff --git a/objc/test/Ice/defaultValue/AllTests.m b/objective-c/test/Ice/defaultValue/AllTests.m
index 31be19f650b..31be19f650b 100644
--- a/objc/test/Ice/defaultValue/AllTests.m
+++ b/objective-c/test/Ice/defaultValue/AllTests.m
diff --git a/objc/test/Ice/defaultValue/Client.m b/objective-c/test/Ice/defaultValue/Client.m
index 68350320cb3..68350320cb3 100644
--- a/objc/test/Ice/defaultValue/Client.m
+++ b/objective-c/test/Ice/defaultValue/Client.m
diff --git a/objc/test/Ice/defaultValue/DefaultValueTest.ice b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
index 876b763a393..876b763a393 100644
--- a/objc/test/Ice/defaultValue/DefaultValueTest.ice
+++ b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
diff --git a/objc/test/Ice/defaultValue/Makefile b/objective-c/test/Ice/defaultValue/Makefile
index 0fb65a35f58..0fb65a35f58 100644
--- a/objc/test/Ice/defaultValue/Makefile
+++ b/objective-c/test/Ice/defaultValue/Makefile
diff --git a/objc/test/Ice/defaultValue/run.py b/objective-c/test/Ice/defaultValue/run.py
index e925f3c7010..e925f3c7010 100755
--- a/objc/test/Ice/defaultValue/run.py
+++ b/objective-c/test/Ice/defaultValue/run.py
diff --git a/objc/test/Ice/dispatcher/.gitignore b/objective-c/test/Ice/dispatcher/.gitignore
index 6d0e4a9258e..6d0e4a9258e 100644
--- a/objc/test/Ice/dispatcher/.gitignore
+++ b/objective-c/test/Ice/dispatcher/.gitignore
diff --git a/objc/test/Ice/dispatcher/AllTests.m b/objective-c/test/Ice/dispatcher/AllTests.m
index 4689a7b4e04..4689a7b4e04 100644
--- a/objc/test/Ice/dispatcher/AllTests.m
+++ b/objective-c/test/Ice/dispatcher/AllTests.m
diff --git a/objc/test/Ice/dispatcher/Client.m b/objective-c/test/Ice/dispatcher/Client.m
index 31e47345614..31e47345614 100644
--- a/objc/test/Ice/dispatcher/Client.m
+++ b/objective-c/test/Ice/dispatcher/Client.m
diff --git a/objc/test/Ice/dispatcher/Collocated.m b/objective-c/test/Ice/dispatcher/Collocated.m
index ca8ef93b01f..ca8ef93b01f 100644
--- a/objc/test/Ice/dispatcher/Collocated.m
+++ b/objective-c/test/Ice/dispatcher/Collocated.m
diff --git a/objc/test/Ice/dispatcher/DispatcherTest.ice b/objective-c/test/Ice/dispatcher/DispatcherTest.ice
index bc75ee0ee73..bc75ee0ee73 100644
--- a/objc/test/Ice/dispatcher/DispatcherTest.ice
+++ b/objective-c/test/Ice/dispatcher/DispatcherTest.ice
diff --git a/objc/test/Ice/dispatcher/Makefile b/objective-c/test/Ice/dispatcher/Makefile
index f8da9df04cd..f8da9df04cd 100644
--- a/objc/test/Ice/dispatcher/Makefile
+++ b/objective-c/test/Ice/dispatcher/Makefile
diff --git a/objc/test/Ice/dispatcher/Server.m b/objective-c/test/Ice/dispatcher/Server.m
index 1457f69c077..1457f69c077 100644
--- a/objc/test/Ice/dispatcher/Server.m
+++ b/objective-c/test/Ice/dispatcher/Server.m
diff --git a/objc/test/Ice/dispatcher/TestI.h b/objective-c/test/Ice/dispatcher/TestI.h
index 087d1695895..087d1695895 100644
--- a/objc/test/Ice/dispatcher/TestI.h
+++ b/objective-c/test/Ice/dispatcher/TestI.h
diff --git a/objc/test/Ice/dispatcher/TestI.m b/objective-c/test/Ice/dispatcher/TestI.m
index 3f0a23eeff6..3f0a23eeff6 100644
--- a/objc/test/Ice/dispatcher/TestI.m
+++ b/objective-c/test/Ice/dispatcher/TestI.m
diff --git a/objc/test/Ice/dispatcher/run.py b/objective-c/test/Ice/dispatcher/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/dispatcher/run.py
+++ b/objective-c/test/Ice/dispatcher/run.py
diff --git a/objc/test/Ice/enums/.gitignore b/objective-c/test/Ice/enums/.gitignore
index 657ea9d677b..657ea9d677b 100644
--- a/objc/test/Ice/enums/.gitignore
+++ b/objective-c/test/Ice/enums/.gitignore
diff --git a/objc/test/Ice/enums/AllTests.m b/objective-c/test/Ice/enums/AllTests.m
index 4ce24b2b959..4ce24b2b959 100644
--- a/objc/test/Ice/enums/AllTests.m
+++ b/objective-c/test/Ice/enums/AllTests.m
diff --git a/objc/test/Ice/enums/Client.m b/objective-c/test/Ice/enums/Client.m
index d11c5cac461..d11c5cac461 100644
--- a/objc/test/Ice/enums/Client.m
+++ b/objective-c/test/Ice/enums/Client.m
diff --git a/objc/test/Ice/enums/EnumTest.ice b/objective-c/test/Ice/enums/EnumTest.ice
index e22e6cd367e..e22e6cd367e 100644
--- a/objc/test/Ice/enums/EnumTest.ice
+++ b/objective-c/test/Ice/enums/EnumTest.ice
diff --git a/objc/test/Ice/enums/Makefile b/objective-c/test/Ice/enums/Makefile
index 14ab68894c1..14ab68894c1 100644
--- a/objc/test/Ice/enums/Makefile
+++ b/objective-c/test/Ice/enums/Makefile
diff --git a/objc/test/Ice/enums/Server.m b/objective-c/test/Ice/enums/Server.m
index bb90ed96f70..bb90ed96f70 100644
--- a/objc/test/Ice/enums/Server.m
+++ b/objective-c/test/Ice/enums/Server.m
diff --git a/objc/test/Ice/enums/TestI.h b/objective-c/test/Ice/enums/TestI.h
index 880ad26630b..880ad26630b 100644
--- a/objc/test/Ice/enums/TestI.h
+++ b/objective-c/test/Ice/enums/TestI.h
diff --git a/objc/test/Ice/enums/TestI.m b/objective-c/test/Ice/enums/TestI.m
index 6cec06b7c4e..6cec06b7c4e 100644
--- a/objc/test/Ice/enums/TestI.m
+++ b/objective-c/test/Ice/enums/TestI.m
diff --git a/objc/test/Ice/enums/run.py b/objective-c/test/Ice/enums/run.py
index ad8767bd99e..ad8767bd99e 100755
--- a/objc/test/Ice/enums/run.py
+++ b/objective-c/test/Ice/enums/run.py
diff --git a/objc/test/Ice/exceptions/.gitignore b/objective-c/test/Ice/exceptions/.gitignore
index 2d0da9fe75b..2d0da9fe75b 100644
--- a/objc/test/Ice/exceptions/.gitignore
+++ b/objective-c/test/Ice/exceptions/.gitignore
diff --git a/objc/test/Ice/exceptions/AllTests.m b/objective-c/test/Ice/exceptions/AllTests.m
index 1d88483961a..1d88483961a 100644
--- a/objc/test/Ice/exceptions/AllTests.m
+++ b/objective-c/test/Ice/exceptions/AllTests.m
diff --git a/objc/test/Ice/exceptions/Client.m b/objective-c/test/Ice/exceptions/Client.m
index d9f710f7a59..d9f710f7a59 100644
--- a/objc/test/Ice/exceptions/Client.m
+++ b/objective-c/test/Ice/exceptions/Client.m
diff --git a/objc/test/Ice/exceptions/Collocated.m b/objective-c/test/Ice/exceptions/Collocated.m
index 9b0f5e0ed20..9b0f5e0ed20 100644
--- a/objc/test/Ice/exceptions/Collocated.m
+++ b/objective-c/test/Ice/exceptions/Collocated.m
diff --git a/objc/test/Ice/exceptions/ExceptionsTest.ice b/objective-c/test/Ice/exceptions/ExceptionsTest.ice
index 7cdc47b8bcf..7cdc47b8bcf 100644
--- a/objc/test/Ice/exceptions/ExceptionsTest.ice
+++ b/objective-c/test/Ice/exceptions/ExceptionsTest.ice
diff --git a/objc/test/Ice/exceptions/Makefile b/objective-c/test/Ice/exceptions/Makefile
index 55f32b2a5c2..55f32b2a5c2 100644
--- a/objc/test/Ice/exceptions/Makefile
+++ b/objective-c/test/Ice/exceptions/Makefile
diff --git a/objc/test/Ice/exceptions/Server.m b/objective-c/test/Ice/exceptions/Server.m
index 59bf900786d..59bf900786d 100644
--- a/objc/test/Ice/exceptions/Server.m
+++ b/objective-c/test/Ice/exceptions/Server.m
diff --git a/objc/test/Ice/exceptions/TestI.h b/objective-c/test/Ice/exceptions/TestI.h
index 902d695dafe..902d695dafe 100644
--- a/objc/test/Ice/exceptions/TestI.h
+++ b/objective-c/test/Ice/exceptions/TestI.h
diff --git a/objc/test/Ice/exceptions/TestI.m b/objective-c/test/Ice/exceptions/TestI.m
index 14730261070..14730261070 100644
--- a/objc/test/Ice/exceptions/TestI.m
+++ b/objective-c/test/Ice/exceptions/TestI.m
diff --git a/objc/test/Ice/exceptions/run.py b/objective-c/test/Ice/exceptions/run.py
index 6014ec1878d..6014ec1878d 100755
--- a/objc/test/Ice/exceptions/run.py
+++ b/objective-c/test/Ice/exceptions/run.py
diff --git a/objc/test/Ice/facets/.gitignore b/objective-c/test/Ice/facets/.gitignore
index 461935cd9dd..461935cd9dd 100644
--- a/objc/test/Ice/facets/.gitignore
+++ b/objective-c/test/Ice/facets/.gitignore
diff --git a/objc/test/Ice/facets/AllTests.m b/objective-c/test/Ice/facets/AllTests.m
index 97d4e366003..97d4e366003 100644
--- a/objc/test/Ice/facets/AllTests.m
+++ b/objective-c/test/Ice/facets/AllTests.m
diff --git a/objc/test/Ice/facets/Client.m b/objective-c/test/Ice/facets/Client.m
index 715e578fcc5..715e578fcc5 100644
--- a/objc/test/Ice/facets/Client.m
+++ b/objective-c/test/Ice/facets/Client.m
diff --git a/objc/test/Ice/facets/Collocated.m b/objective-c/test/Ice/facets/Collocated.m
index 99227d99e5a..99227d99e5a 100644
--- a/objc/test/Ice/facets/Collocated.m
+++ b/objective-c/test/Ice/facets/Collocated.m
diff --git a/objc/test/Ice/facets/FacetsTest.ice b/objective-c/test/Ice/facets/FacetsTest.ice
index 216108d235c..216108d235c 100644
--- a/objc/test/Ice/facets/FacetsTest.ice
+++ b/objective-c/test/Ice/facets/FacetsTest.ice
diff --git a/objc/test/Ice/facets/Makefile b/objective-c/test/Ice/facets/Makefile
index 1ed32b66172..1ed32b66172 100644
--- a/objc/test/Ice/facets/Makefile
+++ b/objective-c/test/Ice/facets/Makefile
diff --git a/objc/test/Ice/facets/Server.m b/objective-c/test/Ice/facets/Server.m
index 257a70be27d..257a70be27d 100644
--- a/objc/test/Ice/facets/Server.m
+++ b/objective-c/test/Ice/facets/Server.m
diff --git a/objc/test/Ice/facets/TestI.h b/objective-c/test/Ice/facets/TestI.h
index f0a7d73a5c6..f0a7d73a5c6 100644
--- a/objc/test/Ice/facets/TestI.h
+++ b/objective-c/test/Ice/facets/TestI.h
diff --git a/objc/test/Ice/facets/TestI.m b/objective-c/test/Ice/facets/TestI.m
index d46d0518725..d46d0518725 100644
--- a/objc/test/Ice/facets/TestI.m
+++ b/objective-c/test/Ice/facets/TestI.m
diff --git a/objc/test/Ice/facets/run.py b/objective-c/test/Ice/facets/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/facets/run.py
+++ b/objective-c/test/Ice/facets/run.py
diff --git a/objc/test/Ice/faultTolerance/.gitignore b/objective-c/test/Ice/faultTolerance/.gitignore
index aa38efcc5dc..aa38efcc5dc 100644
--- a/objc/test/Ice/faultTolerance/.gitignore
+++ b/objective-c/test/Ice/faultTolerance/.gitignore
diff --git a/objc/test/Ice/faultTolerance/AllTests.m b/objective-c/test/Ice/faultTolerance/AllTests.m
index 767816d2d74..767816d2d74 100644
--- a/objc/test/Ice/faultTolerance/AllTests.m
+++ b/objective-c/test/Ice/faultTolerance/AllTests.m
diff --git a/objc/test/Ice/faultTolerance/Client.m b/objective-c/test/Ice/faultTolerance/Client.m
index 6875b4f46c3..6875b4f46c3 100644
--- a/objc/test/Ice/faultTolerance/Client.m
+++ b/objective-c/test/Ice/faultTolerance/Client.m
diff --git a/objc/test/Ice/faultTolerance/Makefile b/objective-c/test/Ice/faultTolerance/Makefile
index 4c7d3b3c6e1..4c7d3b3c6e1 100644
--- a/objc/test/Ice/faultTolerance/Makefile
+++ b/objective-c/test/Ice/faultTolerance/Makefile
diff --git a/objc/test/Ice/faultTolerance/Server.m b/objective-c/test/Ice/faultTolerance/Server.m
index 4e31bd74eb8..4e31bd74eb8 100644
--- a/objc/test/Ice/faultTolerance/Server.m
+++ b/objective-c/test/Ice/faultTolerance/Server.m
diff --git a/objc/test/Ice/faultTolerance/Test.ice b/objective-c/test/Ice/faultTolerance/Test.ice
index d5488ad5726..d5488ad5726 100644
--- a/objc/test/Ice/faultTolerance/Test.ice
+++ b/objective-c/test/Ice/faultTolerance/Test.ice
diff --git a/objc/test/Ice/faultTolerance/TestI.h b/objective-c/test/Ice/faultTolerance/TestI.h
index dc238000725..dc238000725 100644
--- a/objc/test/Ice/faultTolerance/TestI.h
+++ b/objective-c/test/Ice/faultTolerance/TestI.h
diff --git a/objc/test/Ice/faultTolerance/TestI.m b/objective-c/test/Ice/faultTolerance/TestI.m
index 22045e610d7..22045e610d7 100644
--- a/objc/test/Ice/faultTolerance/TestI.m
+++ b/objective-c/test/Ice/faultTolerance/TestI.m
diff --git a/objc/test/Ice/faultTolerance/run.py b/objective-c/test/Ice/faultTolerance/run.py
index 440686d85ed..440686d85ed 100755
--- a/objc/test/Ice/faultTolerance/run.py
+++ b/objective-c/test/Ice/faultTolerance/run.py
diff --git a/objc/test/Ice/hash/.gitignore b/objective-c/test/Ice/hash/.gitignore
index be837f9fdf3..be837f9fdf3 100644
--- a/objc/test/Ice/hash/.gitignore
+++ b/objective-c/test/Ice/hash/.gitignore
diff --git a/objc/test/Ice/hash/AllTests.m b/objective-c/test/Ice/hash/AllTests.m
index 79bed007c11..79bed007c11 100644
--- a/objc/test/Ice/hash/AllTests.m
+++ b/objective-c/test/Ice/hash/AllTests.m
diff --git a/objc/test/Ice/hash/Client.m b/objective-c/test/Ice/hash/Client.m
index e13461b3759..e13461b3759 100644
--- a/objc/test/Ice/hash/Client.m
+++ b/objective-c/test/Ice/hash/Client.m
diff --git a/objc/test/Ice/hash/HashTest.ice b/objective-c/test/Ice/hash/HashTest.ice
index 15af694446f..15af694446f 100644
--- a/objc/test/Ice/hash/HashTest.ice
+++ b/objective-c/test/Ice/hash/HashTest.ice
diff --git a/objc/test/Ice/hash/Makefile b/objective-c/test/Ice/hash/Makefile
index 36e3431b261..36e3431b261 100644
--- a/objc/test/Ice/hash/Makefile
+++ b/objective-c/test/Ice/hash/Makefile
diff --git a/objc/test/Ice/hash/run.py b/objective-c/test/Ice/hash/run.py
index e925f3c7010..e925f3c7010 100755
--- a/objc/test/Ice/hash/run.py
+++ b/objective-c/test/Ice/hash/run.py
diff --git a/objc/test/Ice/hold/.gitignore b/objective-c/test/Ice/hold/.gitignore
index 4e573bb9e5f..4e573bb9e5f 100644
--- a/objc/test/Ice/hold/.gitignore
+++ b/objective-c/test/Ice/hold/.gitignore
diff --git a/objc/test/Ice/hold/AllTests.m b/objective-c/test/Ice/hold/AllTests.m
index 43ca15c5b90..43ca15c5b90 100644
--- a/objc/test/Ice/hold/AllTests.m
+++ b/objective-c/test/Ice/hold/AllTests.m
diff --git a/objc/test/Ice/hold/Client.m b/objective-c/test/Ice/hold/Client.m
index 2e426594e95..2e426594e95 100644
--- a/objc/test/Ice/hold/Client.m
+++ b/objective-c/test/Ice/hold/Client.m
diff --git a/objc/test/Ice/hold/HoldTest.ice b/objective-c/test/Ice/hold/HoldTest.ice
index f872dec06a3..f872dec06a3 100644
--- a/objc/test/Ice/hold/HoldTest.ice
+++ b/objective-c/test/Ice/hold/HoldTest.ice
diff --git a/objc/test/Ice/hold/Makefile b/objective-c/test/Ice/hold/Makefile
index c3a2e3766ea..c3a2e3766ea 100644
--- a/objc/test/Ice/hold/Makefile
+++ b/objective-c/test/Ice/hold/Makefile
diff --git a/objc/test/Ice/hold/Server.m b/objective-c/test/Ice/hold/Server.m
index aa9c9d99530..aa9c9d99530 100644
--- a/objc/test/Ice/hold/Server.m
+++ b/objective-c/test/Ice/hold/Server.m
diff --git a/objc/test/Ice/hold/TestI.h b/objective-c/test/Ice/hold/TestI.h
index a07d2f49f17..a07d2f49f17 100644
--- a/objc/test/Ice/hold/TestI.h
+++ b/objective-c/test/Ice/hold/TestI.h
diff --git a/objc/test/Ice/hold/TestI.m b/objective-c/test/Ice/hold/TestI.m
index e91f5690e54..e91f5690e54 100644
--- a/objc/test/Ice/hold/TestI.m
+++ b/objective-c/test/Ice/hold/TestI.m
diff --git a/objc/test/Ice/hold/run.py b/objective-c/test/Ice/hold/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/hold/run.py
+++ b/objective-c/test/Ice/hold/run.py
diff --git a/objc/test/Ice/info/.gitignore b/objective-c/test/Ice/info/.gitignore
index 23a7fa22453..23a7fa22453 100644
--- a/objc/test/Ice/info/.gitignore
+++ b/objective-c/test/Ice/info/.gitignore
diff --git a/objc/test/Ice/info/AllTests.m b/objective-c/test/Ice/info/AllTests.m
index d320287b6fe..d320287b6fe 100644
--- a/objc/test/Ice/info/AllTests.m
+++ b/objective-c/test/Ice/info/AllTests.m
diff --git a/objc/test/Ice/info/Client.m b/objective-c/test/Ice/info/Client.m
index 7b9dc2e9b72..7b9dc2e9b72 100644
--- a/objc/test/Ice/info/Client.m
+++ b/objective-c/test/Ice/info/Client.m
diff --git a/objc/test/Ice/info/InfoTest.ice b/objective-c/test/Ice/info/InfoTest.ice
index fc209177419..fc209177419 100644
--- a/objc/test/Ice/info/InfoTest.ice
+++ b/objective-c/test/Ice/info/InfoTest.ice
diff --git a/objc/test/Ice/info/Makefile b/objective-c/test/Ice/info/Makefile
index 5c5a231ecc6..5c5a231ecc6 100644
--- a/objc/test/Ice/info/Makefile
+++ b/objective-c/test/Ice/info/Makefile
diff --git a/objc/test/Ice/info/Server.m b/objective-c/test/Ice/info/Server.m
index d93eea40179..d93eea40179 100644
--- a/objc/test/Ice/info/Server.m
+++ b/objective-c/test/Ice/info/Server.m
diff --git a/objc/test/Ice/info/TestI.h b/objective-c/test/Ice/info/TestI.h
index 9c30ba2081e..9c30ba2081e 100644
--- a/objc/test/Ice/info/TestI.h
+++ b/objective-c/test/Ice/info/TestI.h
diff --git a/objc/test/Ice/info/TestI.m b/objective-c/test/Ice/info/TestI.m
index cbc6a257664..cbc6a257664 100644
--- a/objc/test/Ice/info/TestI.m
+++ b/objective-c/test/Ice/info/TestI.m
diff --git a/objc/test/Ice/info/run.py b/objective-c/test/Ice/info/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/info/run.py
+++ b/objective-c/test/Ice/info/run.py
diff --git a/objc/test/Ice/inheritance/.gitignore b/objective-c/test/Ice/inheritance/.gitignore
index 400a2a0d5c4..400a2a0d5c4 100644
--- a/objc/test/Ice/inheritance/.gitignore
+++ b/objective-c/test/Ice/inheritance/.gitignore
diff --git a/objc/test/Ice/inheritance/AllTests.m b/objective-c/test/Ice/inheritance/AllTests.m
index 546aac37184..546aac37184 100644
--- a/objc/test/Ice/inheritance/AllTests.m
+++ b/objective-c/test/Ice/inheritance/AllTests.m
diff --git a/objc/test/Ice/inheritance/Client.m b/objective-c/test/Ice/inheritance/Client.m
index 61e79feab68..61e79feab68 100644
--- a/objc/test/Ice/inheritance/Client.m
+++ b/objective-c/test/Ice/inheritance/Client.m
diff --git a/objc/test/Ice/inheritance/Collocated.m b/objective-c/test/Ice/inheritance/Collocated.m
index d851e2fb3e3..d851e2fb3e3 100644
--- a/objc/test/Ice/inheritance/Collocated.m
+++ b/objective-c/test/Ice/inheritance/Collocated.m
diff --git a/objc/test/Ice/inheritance/InheritanceTest.ice b/objective-c/test/Ice/inheritance/InheritanceTest.ice
index 84d41d9e571..84d41d9e571 100644
--- a/objc/test/Ice/inheritance/InheritanceTest.ice
+++ b/objective-c/test/Ice/inheritance/InheritanceTest.ice
diff --git a/objc/test/Ice/inheritance/Makefile b/objective-c/test/Ice/inheritance/Makefile
index 19c3ee7806a..19c3ee7806a 100644
--- a/objc/test/Ice/inheritance/Makefile
+++ b/objective-c/test/Ice/inheritance/Makefile
diff --git a/objc/test/Ice/inheritance/Server.m b/objective-c/test/Ice/inheritance/Server.m
index 3d9fb79d3d8..3d9fb79d3d8 100644
--- a/objc/test/Ice/inheritance/Server.m
+++ b/objective-c/test/Ice/inheritance/Server.m
diff --git a/objc/test/Ice/inheritance/TestI.h b/objective-c/test/Ice/inheritance/TestI.h
index 29cb798e6b0..29cb798e6b0 100644
--- a/objc/test/Ice/inheritance/TestI.h
+++ b/objective-c/test/Ice/inheritance/TestI.h
diff --git a/objc/test/Ice/inheritance/TestI.m b/objective-c/test/Ice/inheritance/TestI.m
index a1fd4e0badf..a1fd4e0badf 100644
--- a/objc/test/Ice/inheritance/TestI.m
+++ b/objective-c/test/Ice/inheritance/TestI.m
diff --git a/objc/test/Ice/inheritance/run.py b/objective-c/test/Ice/inheritance/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/inheritance/run.py
+++ b/objective-c/test/Ice/inheritance/run.py
diff --git a/objc/test/Ice/interceptor/.gitignore b/objective-c/test/Ice/interceptor/.gitignore
index a7aee74ccef..a7aee74ccef 100644
--- a/objc/test/Ice/interceptor/.gitignore
+++ b/objective-c/test/Ice/interceptor/.gitignore
diff --git a/objc/test/Ice/interceptor/Client.m b/objective-c/test/Ice/interceptor/Client.m
index 520852aacbd..520852aacbd 100644
--- a/objc/test/Ice/interceptor/Client.m
+++ b/objective-c/test/Ice/interceptor/Client.m
diff --git a/objc/test/Ice/interceptor/InterceptorI.h b/objective-c/test/Ice/interceptor/InterceptorI.h
index 74b1b070488..74b1b070488 100644
--- a/objc/test/Ice/interceptor/InterceptorI.h
+++ b/objective-c/test/Ice/interceptor/InterceptorI.h
diff --git a/objc/test/Ice/interceptor/InterceptorI.m b/objective-c/test/Ice/interceptor/InterceptorI.m
index 08bde68b89d..08bde68b89d 100644
--- a/objc/test/Ice/interceptor/InterceptorI.m
+++ b/objective-c/test/Ice/interceptor/InterceptorI.m
diff --git a/objc/test/Ice/interceptor/InterceptorTest.ice b/objective-c/test/Ice/interceptor/InterceptorTest.ice
index 08c11f392b7..08c11f392b7 100644
--- a/objc/test/Ice/interceptor/InterceptorTest.ice
+++ b/objective-c/test/Ice/interceptor/InterceptorTest.ice
diff --git a/objc/test/Ice/interceptor/Makefile b/objective-c/test/Ice/interceptor/Makefile
index 5b75eed1931..5b75eed1931 100644
--- a/objc/test/Ice/interceptor/Makefile
+++ b/objective-c/test/Ice/interceptor/Makefile
diff --git a/objc/test/Ice/interceptor/MyObjectI.h b/objective-c/test/Ice/interceptor/MyObjectI.h
index 913e8068c63..913e8068c63 100644
--- a/objc/test/Ice/interceptor/MyObjectI.h
+++ b/objective-c/test/Ice/interceptor/MyObjectI.h
diff --git a/objc/test/Ice/interceptor/MyObjectI.m b/objective-c/test/Ice/interceptor/MyObjectI.m
index 7932e828d1f..7932e828d1f 100644
--- a/objc/test/Ice/interceptor/MyObjectI.m
+++ b/objective-c/test/Ice/interceptor/MyObjectI.m
diff --git a/objc/test/Ice/interceptor/run.py b/objective-c/test/Ice/interceptor/run.py
index e7ab1bd2fe0..e7ab1bd2fe0 100755
--- a/objc/test/Ice/interceptor/run.py
+++ b/objective-c/test/Ice/interceptor/run.py
diff --git a/objc/test/Ice/invoke/.gitignore b/objective-c/test/Ice/invoke/.gitignore
index 76608e6287a..76608e6287a 100644
--- a/objc/test/Ice/invoke/.gitignore
+++ b/objective-c/test/Ice/invoke/.gitignore
diff --git a/objc/test/Ice/invoke/AllTests.m b/objective-c/test/Ice/invoke/AllTests.m
index f6108bef90d..f6108bef90d 100644
--- a/objc/test/Ice/invoke/AllTests.m
+++ b/objective-c/test/Ice/invoke/AllTests.m
diff --git a/objc/test/Ice/invoke/BlobjectI.h b/objective-c/test/Ice/invoke/BlobjectI.h
index 1291c2eebf7..1291c2eebf7 100644
--- a/objc/test/Ice/invoke/BlobjectI.h
+++ b/objective-c/test/Ice/invoke/BlobjectI.h
diff --git a/objc/test/Ice/invoke/BlobjectI.m b/objective-c/test/Ice/invoke/BlobjectI.m
index 7c043bc768a..7c043bc768a 100644
--- a/objc/test/Ice/invoke/BlobjectI.m
+++ b/objective-c/test/Ice/invoke/BlobjectI.m
diff --git a/objc/test/Ice/invoke/Client.m b/objective-c/test/Ice/invoke/Client.m
index c8a9d74a779..c8a9d74a779 100644
--- a/objc/test/Ice/invoke/Client.m
+++ b/objective-c/test/Ice/invoke/Client.m
diff --git a/objc/test/Ice/invoke/InvokeTest.ice b/objective-c/test/Ice/invoke/InvokeTest.ice
index c8e28f400ff..c8e28f400ff 100644
--- a/objc/test/Ice/invoke/InvokeTest.ice
+++ b/objective-c/test/Ice/invoke/InvokeTest.ice
diff --git a/objc/test/Ice/invoke/Makefile b/objective-c/test/Ice/invoke/Makefile
index 4131daa6bf3..4131daa6bf3 100644
--- a/objc/test/Ice/invoke/Makefile
+++ b/objective-c/test/Ice/invoke/Makefile
diff --git a/objc/test/Ice/invoke/Server.m b/objective-c/test/Ice/invoke/Server.m
index 648b68b59b0..648b68b59b0 100644
--- a/objc/test/Ice/invoke/Server.m
+++ b/objective-c/test/Ice/invoke/Server.m
diff --git a/objc/test/Ice/invoke/run.py b/objective-c/test/Ice/invoke/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/invoke/run.py
+++ b/objective-c/test/Ice/invoke/run.py
diff --git a/objc/test/Ice/location/.gitignore b/objective-c/test/Ice/location/.gitignore
index cd321e6c61d..cd321e6c61d 100644
--- a/objc/test/Ice/location/.gitignore
+++ b/objective-c/test/Ice/location/.gitignore
diff --git a/objc/test/Ice/location/AllTests.m b/objective-c/test/Ice/location/AllTests.m
index 515a5209909..515a5209909 100644
--- a/objc/test/Ice/location/AllTests.m
+++ b/objective-c/test/Ice/location/AllTests.m
diff --git a/objc/test/Ice/location/Client.m b/objective-c/test/Ice/location/Client.m
index 7e4b548a124..7e4b548a124 100644
--- a/objc/test/Ice/location/Client.m
+++ b/objective-c/test/Ice/location/Client.m
diff --git a/objc/test/Ice/location/LocationTest.ice b/objective-c/test/Ice/location/LocationTest.ice
index 41ba5f39410..41ba5f39410 100644
--- a/objc/test/Ice/location/LocationTest.ice
+++ b/objective-c/test/Ice/location/LocationTest.ice
diff --git a/objc/test/Ice/location/Makefile b/objective-c/test/Ice/location/Makefile
index aedb3040ca3..aedb3040ca3 100644
--- a/objc/test/Ice/location/Makefile
+++ b/objective-c/test/Ice/location/Makefile
diff --git a/objc/test/Ice/location/Server.m b/objective-c/test/Ice/location/Server.m
index a676af82932..a676af82932 100644
--- a/objc/test/Ice/location/Server.m
+++ b/objective-c/test/Ice/location/Server.m
diff --git a/objc/test/Ice/location/ServerLocator.h b/objective-c/test/Ice/location/ServerLocator.h
index d9d9447469d..d9d9447469d 100644
--- a/objc/test/Ice/location/ServerLocator.h
+++ b/objective-c/test/Ice/location/ServerLocator.h
diff --git a/objc/test/Ice/location/ServerLocator.m b/objective-c/test/Ice/location/ServerLocator.m
index 6363f2c849b..6363f2c849b 100644
--- a/objc/test/Ice/location/ServerLocator.m
+++ b/objective-c/test/Ice/location/ServerLocator.m
diff --git a/objc/test/Ice/location/TestI.h b/objective-c/test/Ice/location/TestI.h
index daa5bd9268f..daa5bd9268f 100644
--- a/objc/test/Ice/location/TestI.h
+++ b/objective-c/test/Ice/location/TestI.h
diff --git a/objc/test/Ice/location/TestI.m b/objective-c/test/Ice/location/TestI.m
index 37b8f6f655f..37b8f6f655f 100644
--- a/objc/test/Ice/location/TestI.m
+++ b/objective-c/test/Ice/location/TestI.m
diff --git a/objc/test/Ice/location/run.py b/objective-c/test/Ice/location/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/location/run.py
+++ b/objective-c/test/Ice/location/run.py
diff --git a/objc/test/Ice/metrics/.gitignore b/objective-c/test/Ice/metrics/.gitignore
index 919d41acc0f..919d41acc0f 100644
--- a/objc/test/Ice/metrics/.gitignore
+++ b/objective-c/test/Ice/metrics/.gitignore
diff --git a/objc/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m
index 2feab5f5aae..2feab5f5aae 100644
--- a/objc/test/Ice/metrics/AllTests.m
+++ b/objective-c/test/Ice/metrics/AllTests.m
diff --git a/objc/test/Ice/metrics/Client.m b/objective-c/test/Ice/metrics/Client.m
index f7b5bfdbb65..f7b5bfdbb65 100644
--- a/objc/test/Ice/metrics/Client.m
+++ b/objective-c/test/Ice/metrics/Client.m
diff --git a/objc/test/Ice/metrics/Makefile b/objective-c/test/Ice/metrics/Makefile
index 4903fcb6485..4903fcb6485 100644
--- a/objc/test/Ice/metrics/Makefile
+++ b/objective-c/test/Ice/metrics/Makefile
diff --git a/objc/test/Ice/metrics/MetricsTest.ice b/objective-c/test/Ice/metrics/MetricsTest.ice
index 405a570c0c9..405a570c0c9 100644
--- a/objc/test/Ice/metrics/MetricsTest.ice
+++ b/objective-c/test/Ice/metrics/MetricsTest.ice
diff --git a/objc/test/Ice/metrics/Server.m b/objective-c/test/Ice/metrics/Server.m
index 89b72ab1d97..89b72ab1d97 100644
--- a/objc/test/Ice/metrics/Server.m
+++ b/objective-c/test/Ice/metrics/Server.m
diff --git a/objc/test/Ice/metrics/TestI.h b/objective-c/test/Ice/metrics/TestI.h
index a6e09119ce3..a6e09119ce3 100644
--- a/objc/test/Ice/metrics/TestI.h
+++ b/objective-c/test/Ice/metrics/TestI.h
diff --git a/objc/test/Ice/metrics/TestI.m b/objective-c/test/Ice/metrics/TestI.m
index 88c5c25c6f3..88c5c25c6f3 100644
--- a/objc/test/Ice/metrics/TestI.m
+++ b/objective-c/test/Ice/metrics/TestI.m
diff --git a/objc/test/Ice/metrics/run.py b/objective-c/test/Ice/metrics/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/metrics/run.py
+++ b/objective-c/test/Ice/metrics/run.py
diff --git a/objc/test/Ice/objects/.gitignore b/objective-c/test/Ice/objects/.gitignore
index 77d9ac7c381..77d9ac7c381 100644
--- a/objc/test/Ice/objects/.gitignore
+++ b/objective-c/test/Ice/objects/.gitignore
diff --git a/objc/test/Ice/objects/AllTests.m b/objective-c/test/Ice/objects/AllTests.m
index 47c9e574d91..47c9e574d91 100644
--- a/objc/test/Ice/objects/AllTests.m
+++ b/objective-c/test/Ice/objects/AllTests.m
diff --git a/objc/test/Ice/objects/Client.m b/objective-c/test/Ice/objects/Client.m
index aeabb134b02..aeabb134b02 100644
--- a/objc/test/Ice/objects/Client.m
+++ b/objective-c/test/Ice/objects/Client.m
diff --git a/objc/test/Ice/objects/Collocated.m b/objective-c/test/Ice/objects/Collocated.m
index 1506c1c3293..1506c1c3293 100644
--- a/objc/test/Ice/objects/Collocated.m
+++ b/objective-c/test/Ice/objects/Collocated.m
diff --git a/objc/test/Ice/objects/Makefile b/objective-c/test/Ice/objects/Makefile
index 6dbc4fdb29d..6dbc4fdb29d 100644
--- a/objc/test/Ice/objects/Makefile
+++ b/objective-c/test/Ice/objects/Makefile
diff --git a/objc/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice
index afe41d9d904..afe41d9d904 100644
--- a/objc/test/Ice/objects/ObjectsTest.ice
+++ b/objective-c/test/Ice/objects/ObjectsTest.ice
diff --git a/objc/test/Ice/objects/Server.m b/objective-c/test/Ice/objects/Server.m
index a8431a61509..a8431a61509 100644
--- a/objc/test/Ice/objects/Server.m
+++ b/objective-c/test/Ice/objects/Server.m
diff --git a/objc/test/Ice/objects/TestI.h b/objective-c/test/Ice/objects/TestI.h
index b0ddf730f3b..b0ddf730f3b 100644
--- a/objc/test/Ice/objects/TestI.h
+++ b/objective-c/test/Ice/objects/TestI.h
diff --git a/objc/test/Ice/objects/TestI.m b/objective-c/test/Ice/objects/TestI.m
index 3b3b10a69d9..3b3b10a69d9 100644
--- a/objc/test/Ice/objects/TestI.m
+++ b/objective-c/test/Ice/objects/TestI.m
diff --git a/objc/test/Ice/objects/run.py b/objective-c/test/Ice/objects/run.py
index 74e15b483a3..74e15b483a3 100755
--- a/objc/test/Ice/objects/run.py
+++ b/objective-c/test/Ice/objects/run.py
diff --git a/objc/test/Ice/objects/test.log b/objective-c/test/Ice/objects/test.log
index 3150beca6c7..3150beca6c7 100644
--- a/objc/test/Ice/objects/test.log
+++ b/objective-c/test/Ice/objects/test.log
diff --git a/objc/test/Ice/operations/.gitignore b/objective-c/test/Ice/operations/.gitignore
index 0b3e86fe293..0b3e86fe293 100644
--- a/objc/test/Ice/operations/.gitignore
+++ b/objective-c/test/Ice/operations/.gitignore
diff --git a/objc/test/Ice/operations/AllTests.m b/objective-c/test/Ice/operations/AllTests.m
index 5674a8bd4cb..5674a8bd4cb 100644
--- a/objc/test/Ice/operations/AllTests.m
+++ b/objective-c/test/Ice/operations/AllTests.m
diff --git a/objc/test/Ice/operations/BatchOneways.m b/objective-c/test/Ice/operations/BatchOneways.m
index 13f1ae25195..13f1ae25195 100644
--- a/objc/test/Ice/operations/BatchOneways.m
+++ b/objective-c/test/Ice/operations/BatchOneways.m
diff --git a/objc/test/Ice/operations/BatchOnewaysAMI.m b/objective-c/test/Ice/operations/BatchOnewaysAMI.m
index 347000b9d8c..347000b9d8c 100644
--- a/objc/test/Ice/operations/BatchOnewaysAMI.m
+++ b/objective-c/test/Ice/operations/BatchOnewaysAMI.m
diff --git a/objc/test/Ice/operations/Client.m b/objective-c/test/Ice/operations/Client.m
index ea2e0e1dad9..ea2e0e1dad9 100644
--- a/objc/test/Ice/operations/Client.m
+++ b/objective-c/test/Ice/operations/Client.m
diff --git a/objc/test/Ice/operations/Collocated.m b/objective-c/test/Ice/operations/Collocated.m
index d1693cd21c9..d1693cd21c9 100644
--- a/objc/test/Ice/operations/Collocated.m
+++ b/objective-c/test/Ice/operations/Collocated.m
diff --git a/objc/test/Ice/operations/Makefile b/objective-c/test/Ice/operations/Makefile
index 3bab9f10ded..3bab9f10ded 100644
--- a/objc/test/Ice/operations/Makefile
+++ b/objective-c/test/Ice/operations/Makefile
diff --git a/objc/test/Ice/operations/Oneways.m b/objective-c/test/Ice/operations/Oneways.m
index d8318f47597..d8318f47597 100644
--- a/objc/test/Ice/operations/Oneways.m
+++ b/objective-c/test/Ice/operations/Oneways.m
diff --git a/objc/test/Ice/operations/OnewaysNewAMI.m b/objective-c/test/Ice/operations/OnewaysNewAMI.m
index 43c04c88dac..43c04c88dac 100644
--- a/objc/test/Ice/operations/OnewaysNewAMI.m
+++ b/objective-c/test/Ice/operations/OnewaysNewAMI.m
diff --git a/objc/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice
index 7f8a084184b..7f8a084184b 100644
--- a/objc/test/Ice/operations/OperationsTest.ice
+++ b/objective-c/test/Ice/operations/OperationsTest.ice
diff --git a/objc/test/Ice/operations/Server.m b/objective-c/test/Ice/operations/Server.m
index e6aefe0a16d..e6aefe0a16d 100644
--- a/objc/test/Ice/operations/Server.m
+++ b/objective-c/test/Ice/operations/Server.m
diff --git a/objc/test/Ice/operations/TestI.h b/objective-c/test/Ice/operations/TestI.h
index faa1c8634dd..faa1c8634dd 100644
--- a/objc/test/Ice/operations/TestI.h
+++ b/objective-c/test/Ice/operations/TestI.h
diff --git a/objc/test/Ice/operations/TestI.m b/objective-c/test/Ice/operations/TestI.m
index e04a68e8c37..e04a68e8c37 100644
--- a/objc/test/Ice/operations/TestI.m
+++ b/objective-c/test/Ice/operations/TestI.m
diff --git a/objc/test/Ice/operations/Twoways.m b/objective-c/test/Ice/operations/Twoways.m
index f067dbe0159..f067dbe0159 100644
--- a/objc/test/Ice/operations/Twoways.m
+++ b/objective-c/test/Ice/operations/Twoways.m
diff --git a/objc/test/Ice/operations/TwowaysNewAMI.m b/objective-c/test/Ice/operations/TwowaysNewAMI.m
index a3eade4e93c..a3eade4e93c 100644
--- a/objc/test/Ice/operations/TwowaysNewAMI.m
+++ b/objective-c/test/Ice/operations/TwowaysNewAMI.m
diff --git a/objc/test/Ice/operations/run.py b/objective-c/test/Ice/operations/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/operations/run.py
+++ b/objective-c/test/Ice/operations/run.py
diff --git a/objc/test/Ice/optional/.gitignore b/objective-c/test/Ice/optional/.gitignore
index 7096f056538..7096f056538 100644
--- a/objc/test/Ice/optional/.gitignore
+++ b/objective-c/test/Ice/optional/.gitignore
diff --git a/objc/test/Ice/optional/AllTests.m b/objective-c/test/Ice/optional/AllTests.m
index 83fd2ca0bc3..83fd2ca0bc3 100644
--- a/objc/test/Ice/optional/AllTests.m
+++ b/objective-c/test/Ice/optional/AllTests.m
diff --git a/objc/test/Ice/optional/Client.m b/objective-c/test/Ice/optional/Client.m
index c78fe1729b9..c78fe1729b9 100644
--- a/objc/test/Ice/optional/Client.m
+++ b/objective-c/test/Ice/optional/Client.m
diff --git a/objc/test/Ice/optional/Makefile b/objective-c/test/Ice/optional/Makefile
index 0a40f34414b..0a40f34414b 100644
--- a/objc/test/Ice/optional/Makefile
+++ b/objective-c/test/Ice/optional/Makefile
diff --git a/objc/test/Ice/optional/OptionalTest.ice b/objective-c/test/Ice/optional/OptionalTest.ice
index 624b5860673..624b5860673 100644
--- a/objc/test/Ice/optional/OptionalTest.ice
+++ b/objective-c/test/Ice/optional/OptionalTest.ice
diff --git a/objc/test/Ice/optional/Server.m b/objective-c/test/Ice/optional/Server.m
index c83691ebd83..c83691ebd83 100644
--- a/objc/test/Ice/optional/Server.m
+++ b/objective-c/test/Ice/optional/Server.m
diff --git a/objc/test/Ice/optional/TestI.h b/objective-c/test/Ice/optional/TestI.h
index 1cda632e774..1cda632e774 100644
--- a/objc/test/Ice/optional/TestI.h
+++ b/objective-c/test/Ice/optional/TestI.h
diff --git a/objc/test/Ice/optional/TestI.m b/objective-c/test/Ice/optional/TestI.m
index 2139322e270..2139322e270 100644
--- a/objc/test/Ice/optional/TestI.m
+++ b/objective-c/test/Ice/optional/TestI.m
diff --git a/objc/test/Ice/optional/run.py b/objective-c/test/Ice/optional/run.py
index 121ce5fd8b0..121ce5fd8b0 100755
--- a/objc/test/Ice/optional/run.py
+++ b/objective-c/test/Ice/optional/run.py
diff --git a/objc/test/Ice/proxy/.gitignore b/objective-c/test/Ice/proxy/.gitignore
index ced1dc09cab..ced1dc09cab 100644
--- a/objc/test/Ice/proxy/.gitignore
+++ b/objective-c/test/Ice/proxy/.gitignore
diff --git a/objc/test/Ice/proxy/AllTests.m b/objective-c/test/Ice/proxy/AllTests.m
index 3c2d2a11f1b..3c2d2a11f1b 100644
--- a/objc/test/Ice/proxy/AllTests.m
+++ b/objective-c/test/Ice/proxy/AllTests.m
diff --git a/objc/test/Ice/proxy/Client.m b/objective-c/test/Ice/proxy/Client.m
index ad4491304e3..ad4491304e3 100644
--- a/objc/test/Ice/proxy/Client.m
+++ b/objective-c/test/Ice/proxy/Client.m
diff --git a/objc/test/Ice/proxy/Collocated.m b/objective-c/test/Ice/proxy/Collocated.m
index c3dd73ba5ef..c3dd73ba5ef 100644
--- a/objc/test/Ice/proxy/Collocated.m
+++ b/objective-c/test/Ice/proxy/Collocated.m
diff --git a/objc/test/Ice/proxy/Makefile b/objective-c/test/Ice/proxy/Makefile
index 1ecb047ee9e..1ecb047ee9e 100644
--- a/objc/test/Ice/proxy/Makefile
+++ b/objective-c/test/Ice/proxy/Makefile
diff --git a/objc/test/Ice/proxy/ProxyTest.ice b/objective-c/test/Ice/proxy/ProxyTest.ice
index 8c8037a2beb..8c8037a2beb 100644
--- a/objc/test/Ice/proxy/ProxyTest.ice
+++ b/objective-c/test/Ice/proxy/ProxyTest.ice
diff --git a/objc/test/Ice/proxy/Server.m b/objective-c/test/Ice/proxy/Server.m
index 8a59cf702ef..8a59cf702ef 100644
--- a/objc/test/Ice/proxy/Server.m
+++ b/objective-c/test/Ice/proxy/Server.m
diff --git a/objc/test/Ice/proxy/TestI.h b/objective-c/test/Ice/proxy/TestI.h
index c7acd9f63f9..c7acd9f63f9 100644
--- a/objc/test/Ice/proxy/TestI.h
+++ b/objective-c/test/Ice/proxy/TestI.h
diff --git a/objc/test/Ice/proxy/TestI.m b/objective-c/test/Ice/proxy/TestI.m
index b7eee6797b7..b7eee6797b7 100644
--- a/objc/test/Ice/proxy/TestI.m
+++ b/objective-c/test/Ice/proxy/TestI.m
diff --git a/objc/test/Ice/proxy/run.py b/objective-c/test/Ice/proxy/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/proxy/run.py
+++ b/objective-c/test/Ice/proxy/run.py
diff --git a/objc/test/Ice/retry/.gitignore b/objective-c/test/Ice/retry/.gitignore
index 5559f16dfd5..5559f16dfd5 100644
--- a/objc/test/Ice/retry/.gitignore
+++ b/objective-c/test/Ice/retry/.gitignore
diff --git a/objc/test/Ice/retry/AllTests.m b/objective-c/test/Ice/retry/AllTests.m
index 9b70b3e6899..9b70b3e6899 100644
--- a/objc/test/Ice/retry/AllTests.m
+++ b/objective-c/test/Ice/retry/AllTests.m
diff --git a/objc/test/Ice/retry/Client.m b/objective-c/test/Ice/retry/Client.m
index ac73829d61e..ac73829d61e 100644
--- a/objc/test/Ice/retry/Client.m
+++ b/objective-c/test/Ice/retry/Client.m
diff --git a/objc/test/Ice/retry/Collocated.m b/objective-c/test/Ice/retry/Collocated.m
index 7789017e457..7789017e457 100644
--- a/objc/test/Ice/retry/Collocated.m
+++ b/objective-c/test/Ice/retry/Collocated.m
diff --git a/objc/test/Ice/retry/Makefile b/objective-c/test/Ice/retry/Makefile
index f96056146bc..f96056146bc 100644
--- a/objc/test/Ice/retry/Makefile
+++ b/objective-c/test/Ice/retry/Makefile
diff --git a/objc/test/Ice/retry/RetryTest.ice b/objective-c/test/Ice/retry/RetryTest.ice
index a5f64fe05e6..a5f64fe05e6 100644
--- a/objc/test/Ice/retry/RetryTest.ice
+++ b/objective-c/test/Ice/retry/RetryTest.ice
diff --git a/objc/test/Ice/retry/Server.m b/objective-c/test/Ice/retry/Server.m
index 5de72255761..5de72255761 100644
--- a/objc/test/Ice/retry/Server.m
+++ b/objective-c/test/Ice/retry/Server.m
diff --git a/objc/test/Ice/retry/TestI.h b/objective-c/test/Ice/retry/TestI.h
index 5b691a745b9..5b691a745b9 100644
--- a/objc/test/Ice/retry/TestI.h
+++ b/objective-c/test/Ice/retry/TestI.h
diff --git a/objc/test/Ice/retry/TestI.m b/objective-c/test/Ice/retry/TestI.m
index 4523c31d3eb..4523c31d3eb 100644
--- a/objc/test/Ice/retry/TestI.m
+++ b/objective-c/test/Ice/retry/TestI.m
diff --git a/objc/test/Ice/retry/run.py b/objective-c/test/Ice/retry/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/retry/run.py
+++ b/objective-c/test/Ice/retry/run.py
diff --git a/objc/test/Ice/servantLocator/.gitignore b/objective-c/test/Ice/servantLocator/.gitignore
index 1dedfd23f4d..1dedfd23f4d 100644
--- a/objc/test/Ice/servantLocator/.gitignore
+++ b/objective-c/test/Ice/servantLocator/.gitignore
diff --git a/objc/test/Ice/servantLocator/AllTests.m b/objective-c/test/Ice/servantLocator/AllTests.m
index 3cc3fca14c2..3cc3fca14c2 100644
--- a/objc/test/Ice/servantLocator/AllTests.m
+++ b/objective-c/test/Ice/servantLocator/AllTests.m
diff --git a/objc/test/Ice/servantLocator/Client.m b/objective-c/test/Ice/servantLocator/Client.m
index fcc65bd470b..fcc65bd470b 100644
--- a/objc/test/Ice/servantLocator/Client.m
+++ b/objective-c/test/Ice/servantLocator/Client.m
diff --git a/objc/test/Ice/servantLocator/Collocated.m b/objective-c/test/Ice/servantLocator/Collocated.m
index 1a3fc1d513f..1a3fc1d513f 100644
--- a/objc/test/Ice/servantLocator/Collocated.m
+++ b/objective-c/test/Ice/servantLocator/Collocated.m
diff --git a/objc/test/Ice/servantLocator/Makefile b/objective-c/test/Ice/servantLocator/Makefile
index 0a0fdea6eed..0a0fdea6eed 100644
--- a/objc/test/Ice/servantLocator/Makefile
+++ b/objective-c/test/Ice/servantLocator/Makefile
diff --git a/objc/test/Ice/servantLocator/ServantLocatorI.h b/objective-c/test/Ice/servantLocator/ServantLocatorI.h
index 243d8383200..243d8383200 100644
--- a/objc/test/Ice/servantLocator/ServantLocatorI.h
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorI.h
diff --git a/objc/test/Ice/servantLocator/ServantLocatorI.m b/objective-c/test/Ice/servantLocator/ServantLocatorI.m
index 9835ff42626..9835ff42626 100644
--- a/objc/test/Ice/servantLocator/ServantLocatorI.m
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorI.m
diff --git a/objc/test/Ice/servantLocator/ServantLocatorTest.ice b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
index 7ecd72e2dfa..7ecd72e2dfa 100644
--- a/objc/test/Ice/servantLocator/ServantLocatorTest.ice
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
diff --git a/objc/test/Ice/servantLocator/Server.m b/objective-c/test/Ice/servantLocator/Server.m
index 4e43663893e..4e43663893e 100644
--- a/objc/test/Ice/servantLocator/Server.m
+++ b/objective-c/test/Ice/servantLocator/Server.m
diff --git a/objc/test/Ice/servantLocator/TestI.h b/objective-c/test/Ice/servantLocator/TestI.h
index 3253e97b5cd..3253e97b5cd 100644
--- a/objc/test/Ice/servantLocator/TestI.h
+++ b/objective-c/test/Ice/servantLocator/TestI.h
diff --git a/objc/test/Ice/servantLocator/TestI.m b/objective-c/test/Ice/servantLocator/TestI.m
index db2b2081bad..db2b2081bad 100644
--- a/objc/test/Ice/servantLocator/TestI.m
+++ b/objective-c/test/Ice/servantLocator/TestI.m
diff --git a/objc/test/Ice/servantLocator/run.py b/objective-c/test/Ice/servantLocator/run.py
index 0816938a196..0816938a196 100755
--- a/objc/test/Ice/servantLocator/run.py
+++ b/objective-c/test/Ice/servantLocator/run.py
diff --git a/objc/test/Ice/services/.gitignore b/objective-c/test/Ice/services/.gitignore
index 67ac8b78837..67ac8b78837 100644
--- a/objc/test/Ice/services/.gitignore
+++ b/objective-c/test/Ice/services/.gitignore
diff --git a/objc/test/Ice/services/AllTests.m b/objective-c/test/Ice/services/AllTests.m
index 3f895a300eb..3f895a300eb 100644
--- a/objc/test/Ice/services/AllTests.m
+++ b/objective-c/test/Ice/services/AllTests.m
diff --git a/objc/test/Ice/services/Client.m b/objective-c/test/Ice/services/Client.m
index bff0fd9089a..bff0fd9089a 100644
--- a/objc/test/Ice/services/Client.m
+++ b/objective-c/test/Ice/services/Client.m
diff --git a/objc/test/Ice/services/Makefile b/objective-c/test/Ice/services/Makefile
index ced9094f279..ced9094f279 100644
--- a/objc/test/Ice/services/Makefile
+++ b/objective-c/test/Ice/services/Makefile
diff --git a/objc/test/Ice/services/ServicesTest.ice b/objective-c/test/Ice/services/ServicesTest.ice
index d9b21684d59..d9b21684d59 100644
--- a/objc/test/Ice/services/ServicesTest.ice
+++ b/objective-c/test/Ice/services/ServicesTest.ice
diff --git a/objc/test/Ice/services/run.py b/objective-c/test/Ice/services/run.py
index e925f3c7010..e925f3c7010 100755
--- a/objc/test/Ice/services/run.py
+++ b/objective-c/test/Ice/services/run.py
diff --git a/objc/test/Ice/slicing/Makefile b/objective-c/test/Ice/slicing/Makefile
index 87f0aaf069b..87f0aaf069b 100644
--- a/objc/test/Ice/slicing/Makefile
+++ b/objective-c/test/Ice/slicing/Makefile
diff --git a/objc/test/Ice/slicing/exceptions/.gitignore b/objective-c/test/Ice/slicing/exceptions/.gitignore
index 0962671d892..0962671d892 100644
--- a/objc/test/Ice/slicing/exceptions/.gitignore
+++ b/objective-c/test/Ice/slicing/exceptions/.gitignore
diff --git a/objc/test/Ice/slicing/exceptions/AllTests.m b/objective-c/test/Ice/slicing/exceptions/AllTests.m
index 84d5d1f12fa..84d5d1f12fa 100644
--- a/objc/test/Ice/slicing/exceptions/AllTests.m
+++ b/objective-c/test/Ice/slicing/exceptions/AllTests.m
diff --git a/objc/test/Ice/slicing/exceptions/Client.m b/objective-c/test/Ice/slicing/exceptions/Client.m
index da49e96ff3a..da49e96ff3a 100644
--- a/objc/test/Ice/slicing/exceptions/Client.m
+++ b/objective-c/test/Ice/slicing/exceptions/Client.m
diff --git a/objc/test/Ice/slicing/exceptions/Makefile b/objective-c/test/Ice/slicing/exceptions/Makefile
index b67fcc04b3c..b67fcc04b3c 100644
--- a/objc/test/Ice/slicing/exceptions/Makefile
+++ b/objective-c/test/Ice/slicing/exceptions/Makefile
diff --git a/objc/test/Ice/slicing/exceptions/Server.m b/objective-c/test/Ice/slicing/exceptions/Server.m
index bda4add3635..bda4add3635 100644
--- a/objc/test/Ice/slicing/exceptions/Server.m
+++ b/objective-c/test/Ice/slicing/exceptions/Server.m
diff --git a/objc/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
index 96b58c02114..96b58c02114 100644
--- a/objc/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
+++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
diff --git a/objc/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
index e80aff5598f..e80aff5598f 100644
--- a/objc/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
+++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
diff --git a/objc/test/Ice/slicing/exceptions/TestI.h b/objective-c/test/Ice/slicing/exceptions/TestI.h
index 719b4db0914..719b4db0914 100644
--- a/objc/test/Ice/slicing/exceptions/TestI.h
+++ b/objective-c/test/Ice/slicing/exceptions/TestI.h
diff --git a/objc/test/Ice/slicing/exceptions/TestI.m b/objective-c/test/Ice/slicing/exceptions/TestI.m
index ac7dc14380a..ac7dc14380a 100644
--- a/objc/test/Ice/slicing/exceptions/TestI.m
+++ b/objective-c/test/Ice/slicing/exceptions/TestI.m
diff --git a/objc/test/Ice/slicing/exceptions/run.py b/objective-c/test/Ice/slicing/exceptions/run.py
index 15c789db2b5..15c789db2b5 100755
--- a/objc/test/Ice/slicing/exceptions/run.py
+++ b/objective-c/test/Ice/slicing/exceptions/run.py
diff --git a/objc/test/Ice/slicing/objects/.gitignore b/objective-c/test/Ice/slicing/objects/.gitignore
index a2c2a1c0974..a2c2a1c0974 100644
--- a/objc/test/Ice/slicing/objects/.gitignore
+++ b/objective-c/test/Ice/slicing/objects/.gitignore
diff --git a/objc/test/Ice/slicing/objects/AllTests.m b/objective-c/test/Ice/slicing/objects/AllTests.m
index 979c9f11e73..979c9f11e73 100644
--- a/objc/test/Ice/slicing/objects/AllTests.m
+++ b/objective-c/test/Ice/slicing/objects/AllTests.m
diff --git a/objc/test/Ice/slicing/objects/Client.m b/objective-c/test/Ice/slicing/objects/Client.m
index 3e8147698dc..3e8147698dc 100644
--- a/objc/test/Ice/slicing/objects/Client.m
+++ b/objective-c/test/Ice/slicing/objects/Client.m
diff --git a/objc/test/Ice/slicing/objects/Makefile b/objective-c/test/Ice/slicing/objects/Makefile
index 4a2a8876ab2..4a2a8876ab2 100644
--- a/objc/test/Ice/slicing/objects/Makefile
+++ b/objective-c/test/Ice/slicing/objects/Makefile
diff --git a/objc/test/Ice/slicing/objects/Server.m b/objective-c/test/Ice/slicing/objects/Server.m
index ea75e85472b..ea75e85472b 100644
--- a/objc/test/Ice/slicing/objects/Server.m
+++ b/objective-c/test/Ice/slicing/objects/Server.m
diff --git a/objc/test/Ice/slicing/objects/SlicingObjectsForwardClient.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsForwardClient.ice
index 962607a6327..962607a6327 100644
--- a/objc/test/Ice/slicing/objects/SlicingObjectsForwardClient.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsForwardClient.ice
diff --git a/objc/test/Ice/slicing/objects/SlicingObjectsForwardServer.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsForwardServer.ice
index d579d5d701e..d579d5d701e 100644
--- a/objc/test/Ice/slicing/objects/SlicingObjectsForwardServer.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsForwardServer.ice
diff --git a/objc/test/Ice/slicing/objects/SlicingObjectsTestClient.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
index be866367184..be866367184 100644
--- a/objc/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
diff --git a/objc/test/Ice/slicing/objects/SlicingObjectsTestServer.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
index f9d21a13561..f9d21a13561 100644
--- a/objc/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
diff --git a/objc/test/Ice/slicing/objects/TestI.h b/objective-c/test/Ice/slicing/objects/TestI.h
index a7b6d0b90a7..a7b6d0b90a7 100644
--- a/objc/test/Ice/slicing/objects/TestI.h
+++ b/objective-c/test/Ice/slicing/objects/TestI.h
diff --git a/objc/test/Ice/slicing/objects/TestI.m b/objective-c/test/Ice/slicing/objects/TestI.m
index d840ef8a0ab..d840ef8a0ab 100644
--- a/objc/test/Ice/slicing/objects/TestI.m
+++ b/objective-c/test/Ice/slicing/objects/TestI.m
diff --git a/objc/test/Ice/slicing/objects/run.py b/objective-c/test/Ice/slicing/objects/run.py
index 2af0d5cf76a..2af0d5cf76a 100755
--- a/objc/test/Ice/slicing/objects/run.py
+++ b/objective-c/test/Ice/slicing/objects/run.py
diff --git a/objc/test/Ice/stream/.gitignore b/objective-c/test/Ice/stream/.gitignore
index deeebc026e0..deeebc026e0 100644
--- a/objc/test/Ice/stream/.gitignore
+++ b/objective-c/test/Ice/stream/.gitignore
diff --git a/objc/test/Ice/stream/Client.m b/objective-c/test/Ice/stream/Client.m
index 415d113787e..415d113787e 100644
--- a/objc/test/Ice/stream/Client.m
+++ b/objective-c/test/Ice/stream/Client.m
diff --git a/objc/test/Ice/stream/Makefile b/objective-c/test/Ice/stream/Makefile
index 18b89a91aab..18b89a91aab 100644
--- a/objc/test/Ice/stream/Makefile
+++ b/objective-c/test/Ice/stream/Makefile
diff --git a/objc/test/Ice/stream/StreamTest.ice b/objective-c/test/Ice/stream/StreamTest.ice
index 539af0002b2..539af0002b2 100644
--- a/objc/test/Ice/stream/StreamTest.ice
+++ b/objective-c/test/Ice/stream/StreamTest.ice
diff --git a/objc/test/Ice/stream/run.py b/objective-c/test/Ice/stream/run.py
index 365a6517aa2..365a6517aa2 100755
--- a/objc/test/Ice/stream/run.py
+++ b/objective-c/test/Ice/stream/run.py
diff --git a/objc/test/Ice/timeout/.gitignore b/objective-c/test/Ice/timeout/.gitignore
index 1c18b9822c2..1c18b9822c2 100644
--- a/objc/test/Ice/timeout/.gitignore
+++ b/objective-c/test/Ice/timeout/.gitignore
diff --git a/objc/test/Ice/timeout/AllTests.m b/objective-c/test/Ice/timeout/AllTests.m
index bd686cb1c22..bd686cb1c22 100644
--- a/objc/test/Ice/timeout/AllTests.m
+++ b/objective-c/test/Ice/timeout/AllTests.m
diff --git a/objc/test/Ice/timeout/Client.m b/objective-c/test/Ice/timeout/Client.m
index fcebbd09aa8..fcebbd09aa8 100644
--- a/objc/test/Ice/timeout/Client.m
+++ b/objective-c/test/Ice/timeout/Client.m
diff --git a/objc/test/Ice/timeout/Makefile b/objective-c/test/Ice/timeout/Makefile
index 9e6ba54dad3..9e6ba54dad3 100644
--- a/objc/test/Ice/timeout/Makefile
+++ b/objective-c/test/Ice/timeout/Makefile
diff --git a/objc/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m
index 2922e85d83f..2922e85d83f 100644
--- a/objc/test/Ice/timeout/Server.m
+++ b/objective-c/test/Ice/timeout/Server.m
diff --git a/objc/test/Ice/timeout/TestI.h b/objective-c/test/Ice/timeout/TestI.h
index a9b7a2f6372..a9b7a2f6372 100644
--- a/objc/test/Ice/timeout/TestI.h
+++ b/objective-c/test/Ice/timeout/TestI.h
diff --git a/objc/test/Ice/timeout/TestI.m b/objective-c/test/Ice/timeout/TestI.m
index 29d83e987a4..29d83e987a4 100644
--- a/objc/test/Ice/timeout/TestI.m
+++ b/objective-c/test/Ice/timeout/TestI.m
diff --git a/objc/test/Ice/timeout/TimeoutTest.ice b/objective-c/test/Ice/timeout/TimeoutTest.ice
index de22e5a132d..de22e5a132d 100644
--- a/objc/test/Ice/timeout/TimeoutTest.ice
+++ b/objective-c/test/Ice/timeout/TimeoutTest.ice
diff --git a/objc/test/Ice/timeout/run.py b/objective-c/test/Ice/timeout/run.py
index ce8c5dd4b18..ce8c5dd4b18 100755
--- a/objc/test/Ice/timeout/run.py
+++ b/objective-c/test/Ice/timeout/run.py
diff --git a/objc/test/Makefile b/objective-c/test/Makefile
index 9649b07ca0e..9649b07ca0e 100644
--- a/objc/test/Makefile
+++ b/objective-c/test/Makefile
diff --git a/objc/test/Slice/Makefile b/objective-c/test/Slice/Makefile
index 70984bbb015..70984bbb015 100644
--- a/objc/test/Slice/Makefile
+++ b/objective-c/test/Slice/Makefile
diff --git a/objc/test/Slice/keyword/.gitignore b/objective-c/test/Slice/keyword/.gitignore
index f5c78eb09c4..f5c78eb09c4 100644
--- a/objc/test/Slice/keyword/.gitignore
+++ b/objective-c/test/Slice/keyword/.gitignore
diff --git a/objc/test/Slice/keyword/Client.m b/objective-c/test/Slice/keyword/Client.m
index d58e18ecdc6..d58e18ecdc6 100644
--- a/objc/test/Slice/keyword/Client.m
+++ b/objective-c/test/Slice/keyword/Client.m
diff --git a/objc/test/Slice/keyword/Inherit.ice b/objective-c/test/Slice/keyword/Inherit.ice
index 6d5f327cd2a..6d5f327cd2a 100644
--- a/objc/test/Slice/keyword/Inherit.ice
+++ b/objective-c/test/Slice/keyword/Inherit.ice
diff --git a/objc/test/Slice/keyword/Key.ice b/objective-c/test/Slice/keyword/Key.ice
index dbb63daacf0..dbb63daacf0 100644
--- a/objc/test/Slice/keyword/Key.ice
+++ b/objective-c/test/Slice/keyword/Key.ice
diff --git a/objc/test/Slice/keyword/Makefile b/objective-c/test/Slice/keyword/Makefile
index 9b10c64c182..9b10c64c182 100644
--- a/objc/test/Slice/keyword/Makefile
+++ b/objective-c/test/Slice/keyword/Makefile
diff --git a/objc/test/Slice/keyword/run.py b/objective-c/test/Slice/keyword/run.py
index fde45700ed2..fde45700ed2 100755
--- a/objc/test/Slice/keyword/run.py
+++ b/objective-c/test/Slice/keyword/run.py
diff --git a/objc/test/include/TestCommon.h b/objective-c/test/include/TestCommon.h
index 1d4b722dcbe..1d4b722dcbe 100644
--- a/objc/test/include/TestCommon.h
+++ b/objective-c/test/include/TestCommon.h
diff --git a/py/Makefile b/python/Makefile
index 6ffd68d8d37..6ffd68d8d37 100644
--- a/py/Makefile
+++ b/python/Makefile
diff --git a/py/Makefile.mak b/python/Makefile.mak
index 052d2a10cf8..052d2a10cf8 100644
--- a/py/Makefile.mak
+++ b/python/Makefile.mak
diff --git a/py/allTests.py b/python/allTests.py
index 7ef76ff3f78..7ef76ff3f78 100755
--- a/py/allTests.py
+++ b/python/allTests.py
diff --git a/py/config/Make.rules b/python/config/Make.rules
index 6b7e709bc2c..64725d998c8 100644
--- a/py/config/Make.rules
+++ b/python/config/Make.rules
@@ -82,7 +82,7 @@ PYTHON_LIBS	    ?= -L$(PYTHON_LIB_DIR) -l$(PYTHON_LIB_NAME)
 #
 # Common definitions
 #
-ice_language     = py
+ice_language     = python
 ice_require_cpp  = yes
 slice_translator = slice2py
 
diff --git a/py/config/Make.rules.Darwin b/python/config/Make.rules.Darwin
index 426fe2ac12e..426fe2ac12e 100644
--- a/py/config/Make.rules.Darwin
+++ b/python/config/Make.rules.Darwin
diff --git a/py/config/Make.rules.Linux b/python/config/Make.rules.Linux
index 0690dd5e3e0..0690dd5e3e0 100644
--- a/py/config/Make.rules.Linux
+++ b/python/config/Make.rules.Linux
diff --git a/py/config/Make.rules.mak b/python/config/Make.rules.mak
index ecc3fecbc5c..ecc3fecbc5c 100644
--- a/py/config/Make.rules.mak
+++ b/python/config/Make.rules.mak
diff --git a/py/config/install_dir b/python/config/install_dir
index 8bb2e0c62f5..8bb2e0c62f5 100644
--- a/py/config/install_dir
+++ b/python/config/install_dir
diff --git a/py/modules/IcePy/.depend.mak b/python/modules/IcePy/.depend.mak
index f4834457aa7..f4834457aa7 100644
--- a/py/modules/IcePy/.depend.mak
+++ b/python/modules/IcePy/.depend.mak
diff --git a/py/modules/IcePy/BatchRequestInterceptor.cpp b/python/modules/IcePy/BatchRequestInterceptor.cpp
index d2a16905267..d2a16905267 100644
--- a/py/modules/IcePy/BatchRequestInterceptor.cpp
+++ b/python/modules/IcePy/BatchRequestInterceptor.cpp
diff --git a/py/modules/IcePy/BatchRequestInterceptor.h b/python/modules/IcePy/BatchRequestInterceptor.h
index 53491ab7cb3..53491ab7cb3 100644
--- a/py/modules/IcePy/BatchRequestInterceptor.h
+++ b/python/modules/IcePy/BatchRequestInterceptor.h
diff --git a/py/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp
index 919086d9ae8..919086d9ae8 100644
--- a/py/modules/IcePy/Communicator.cpp
+++ b/python/modules/IcePy/Communicator.cpp
diff --git a/py/modules/IcePy/Communicator.h b/python/modules/IcePy/Communicator.h
index 3f2ac0452c3..3f2ac0452c3 100644
--- a/py/modules/IcePy/Communicator.h
+++ b/python/modules/IcePy/Communicator.h
diff --git a/py/modules/IcePy/Config.h b/python/modules/IcePy/Config.h
index b21070b9742..b21070b9742 100644
--- a/py/modules/IcePy/Config.h
+++ b/python/modules/IcePy/Config.h
diff --git a/py/modules/IcePy/Connection.cpp b/python/modules/IcePy/Connection.cpp
index c761419993a..c761419993a 100644
--- a/py/modules/IcePy/Connection.cpp
+++ b/python/modules/IcePy/Connection.cpp
diff --git a/py/modules/IcePy/Connection.h b/python/modules/IcePy/Connection.h
index 768b98e634e..768b98e634e 100644
--- a/py/modules/IcePy/Connection.h
+++ b/python/modules/IcePy/Connection.h
diff --git a/py/modules/IcePy/ConnectionInfo.cpp b/python/modules/IcePy/ConnectionInfo.cpp
index 2381bb303ba..2381bb303ba 100644
--- a/py/modules/IcePy/ConnectionInfo.cpp
+++ b/python/modules/IcePy/ConnectionInfo.cpp
diff --git a/py/modules/IcePy/ConnectionInfo.h b/python/modules/IcePy/ConnectionInfo.h
index d3391653c81..d3391653c81 100644
--- a/py/modules/IcePy/ConnectionInfo.h
+++ b/python/modules/IcePy/ConnectionInfo.h
diff --git a/py/modules/IcePy/Current.cpp b/python/modules/IcePy/Current.cpp
index 897630bb811..897630bb811 100644
--- a/py/modules/IcePy/Current.cpp
+++ b/python/modules/IcePy/Current.cpp
diff --git a/py/modules/IcePy/Current.h b/python/modules/IcePy/Current.h
index c0f52654c30..c0f52654c30 100644
--- a/py/modules/IcePy/Current.h
+++ b/python/modules/IcePy/Current.h
diff --git a/py/modules/IcePy/Endpoint.cpp b/python/modules/IcePy/Endpoint.cpp
index 0ee59b6c757..0ee59b6c757 100644
--- a/py/modules/IcePy/Endpoint.cpp
+++ b/python/modules/IcePy/Endpoint.cpp
diff --git a/py/modules/IcePy/Endpoint.h b/python/modules/IcePy/Endpoint.h
index c3a9224391b..c3a9224391b 100644
--- a/py/modules/IcePy/Endpoint.h
+++ b/python/modules/IcePy/Endpoint.h
diff --git a/py/modules/IcePy/EndpointInfo.cpp b/python/modules/IcePy/EndpointInfo.cpp
index a712cb81186..a712cb81186 100644
--- a/py/modules/IcePy/EndpointInfo.cpp
+++ b/python/modules/IcePy/EndpointInfo.cpp
diff --git a/py/modules/IcePy/EndpointInfo.h b/python/modules/IcePy/EndpointInfo.h
index d4a773d432a..d4a773d432a 100644
--- a/py/modules/IcePy/EndpointInfo.h
+++ b/python/modules/IcePy/EndpointInfo.h
diff --git a/py/modules/IcePy/IcePy.rc b/python/modules/IcePy/IcePy.rc
index 93803e9e407..93803e9e407 100644
--- a/py/modules/IcePy/IcePy.rc
+++ b/python/modules/IcePy/IcePy.rc
diff --git a/py/modules/IcePy/ImplicitContext.cpp b/python/modules/IcePy/ImplicitContext.cpp
index b1a183b0d47..b1a183b0d47 100644
--- a/py/modules/IcePy/ImplicitContext.cpp
+++ b/python/modules/IcePy/ImplicitContext.cpp
diff --git a/py/modules/IcePy/ImplicitContext.h b/python/modules/IcePy/ImplicitContext.h
index 4301c57a7a7..4301c57a7a7 100644
--- a/py/modules/IcePy/ImplicitContext.h
+++ b/python/modules/IcePy/ImplicitContext.h
diff --git a/py/modules/IcePy/Init.cpp b/python/modules/IcePy/Init.cpp
index 4de906407c4..4de906407c4 100644
--- a/py/modules/IcePy/Init.cpp
+++ b/python/modules/IcePy/Init.cpp
diff --git a/py/modules/IcePy/Logger.cpp b/python/modules/IcePy/Logger.cpp
index e901fb40ed1..e901fb40ed1 100644
--- a/py/modules/IcePy/Logger.cpp
+++ b/python/modules/IcePy/Logger.cpp
diff --git a/py/modules/IcePy/Logger.h b/python/modules/IcePy/Logger.h
index 5e8b15a9daa..5e8b15a9daa 100644
--- a/py/modules/IcePy/Logger.h
+++ b/python/modules/IcePy/Logger.h
diff --git a/py/modules/IcePy/Makefile b/python/modules/IcePy/Makefile
index 3efba732368..3efba732368 100644
--- a/py/modules/IcePy/Makefile
+++ b/python/modules/IcePy/Makefile
diff --git a/py/modules/IcePy/Makefile.mak b/python/modules/IcePy/Makefile.mak
index f39e162a31d..f39e162a31d 100644
--- a/py/modules/IcePy/Makefile.mak
+++ b/python/modules/IcePy/Makefile.mak
diff --git a/py/modules/IcePy/ObjectAdapter.cpp b/python/modules/IcePy/ObjectAdapter.cpp
index f57c58884d1..f57c58884d1 100644
--- a/py/modules/IcePy/ObjectAdapter.cpp
+++ b/python/modules/IcePy/ObjectAdapter.cpp
diff --git a/py/modules/IcePy/ObjectAdapter.h b/python/modules/IcePy/ObjectAdapter.h
index 22edc82c929..22edc82c929 100644
--- a/py/modules/IcePy/ObjectAdapter.h
+++ b/python/modules/IcePy/ObjectAdapter.h
diff --git a/py/modules/IcePy/ObjectFactory.cpp b/python/modules/IcePy/ObjectFactory.cpp
index 1829d32956b..1829d32956b 100644
--- a/py/modules/IcePy/ObjectFactory.cpp
+++ b/python/modules/IcePy/ObjectFactory.cpp
diff --git a/py/modules/IcePy/ObjectFactory.h b/python/modules/IcePy/ObjectFactory.h
index 8445996b330..8445996b330 100644
--- a/py/modules/IcePy/ObjectFactory.h
+++ b/python/modules/IcePy/ObjectFactory.h
diff --git a/py/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index 5ca673898f4..5ca673898f4 100644
--- a/py/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
diff --git a/py/modules/IcePy/Operation.h b/python/modules/IcePy/Operation.h
index cf10184b9cb..cf10184b9cb 100644
--- a/py/modules/IcePy/Operation.h
+++ b/python/modules/IcePy/Operation.h
diff --git a/py/modules/IcePy/Properties.cpp b/python/modules/IcePy/Properties.cpp
index d990e2500ec..d990e2500ec 100644
--- a/py/modules/IcePy/Properties.cpp
+++ b/python/modules/IcePy/Properties.cpp
diff --git a/py/modules/IcePy/Properties.h b/python/modules/IcePy/Properties.h
index 7246dd25ac4..7246dd25ac4 100644
--- a/py/modules/IcePy/Properties.h
+++ b/python/modules/IcePy/Properties.h
diff --git a/py/modules/IcePy/PropertiesAdmin.cpp b/python/modules/IcePy/PropertiesAdmin.cpp
index 80995d8c864..80995d8c864 100644
--- a/py/modules/IcePy/PropertiesAdmin.cpp
+++ b/python/modules/IcePy/PropertiesAdmin.cpp
diff --git a/py/modules/IcePy/PropertiesAdmin.h b/python/modules/IcePy/PropertiesAdmin.h
index 8479060cb9a..8479060cb9a 100644
--- a/py/modules/IcePy/PropertiesAdmin.h
+++ b/python/modules/IcePy/PropertiesAdmin.h
diff --git a/py/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp
index 293c3c16de8..293c3c16de8 100644
--- a/py/modules/IcePy/Proxy.cpp
+++ b/python/modules/IcePy/Proxy.cpp
diff --git a/py/modules/IcePy/Proxy.h b/python/modules/IcePy/Proxy.h
index d648886fd99..d648886fd99 100644
--- a/py/modules/IcePy/Proxy.h
+++ b/python/modules/IcePy/Proxy.h
diff --git a/py/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp
index 9adccc5e4c3..9adccc5e4c3 100644
--- a/py/modules/IcePy/Slice.cpp
+++ b/python/modules/IcePy/Slice.cpp
diff --git a/py/modules/IcePy/Slice.h b/python/modules/IcePy/Slice.h
index 4d142906d66..4d142906d66 100644
--- a/py/modules/IcePy/Slice.h
+++ b/python/modules/IcePy/Slice.h
diff --git a/py/modules/IcePy/Thread.cpp b/python/modules/IcePy/Thread.cpp
index 379b7556e47..379b7556e47 100644
--- a/py/modules/IcePy/Thread.cpp
+++ b/python/modules/IcePy/Thread.cpp
diff --git a/py/modules/IcePy/Thread.h b/python/modules/IcePy/Thread.h
index 8b84bd5c40e..8b84bd5c40e 100644
--- a/py/modules/IcePy/Thread.h
+++ b/python/modules/IcePy/Thread.h
diff --git a/py/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp
index ed737247264..ed737247264 100644
--- a/py/modules/IcePy/Types.cpp
+++ b/python/modules/IcePy/Types.cpp
diff --git a/py/modules/IcePy/Types.h b/python/modules/IcePy/Types.h
index 9f26418b28d..9f26418b28d 100644
--- a/py/modules/IcePy/Types.h
+++ b/python/modules/IcePy/Types.h
diff --git a/py/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
index 74869df7121..74869df7121 100644
--- a/py/modules/IcePy/Util.cpp
+++ b/python/modules/IcePy/Util.cpp
diff --git a/py/modules/IcePy/Util.h b/python/modules/IcePy/Util.h
index 94f8d1b813d..94f8d1b813d 100644
--- a/py/modules/IcePy/Util.h
+++ b/python/modules/IcePy/Util.h
diff --git a/py/modules/Makefile b/python/modules/Makefile
index fe6cf9be39b..fe6cf9be39b 100644
--- a/py/modules/Makefile
+++ b/python/modules/Makefile
diff --git a/py/modules/Makefile.mak b/python/modules/Makefile.mak
index 79fb8805721..79fb8805721 100644
--- a/py/modules/Makefile.mak
+++ b/python/modules/Makefile.mak
diff --git a/py/python/.depend.mak b/python/python/.depend.mak
index e46e1645583..e46e1645583 100644
--- a/py/python/.depend.mak
+++ b/python/python/.depend.mak
diff --git a/py/python/.gitignore b/python/python/.gitignore
index 3e3f00b9453..3e3f00b9453 100644
--- a/py/python/.gitignore
+++ b/python/python/.gitignore
diff --git a/py/python/64/.gitignore b/python/python/64/.gitignore
index 39af5887579..39af5887579 100644
--- a/py/python/64/.gitignore
+++ b/python/python/64/.gitignore
diff --git a/py/python/Glacier2.py b/python/python/Glacier2.py
index 149dde48386..149dde48386 100644
--- a/py/python/Glacier2.py
+++ b/python/python/Glacier2.py
diff --git a/py/python/Ice.py b/python/python/Ice.py
index b8c9f0a8721..b8c9f0a8721 100644
--- a/py/python/Ice.py
+++ b/python/python/Ice.py
diff --git a/py/python/Makefile b/python/python/Makefile
index 523aa4e9240..523aa4e9240 100644
--- a/py/python/Makefile
+++ b/python/python/Makefile
diff --git a/py/python/Makefile.mak b/python/python/Makefile.mak
index cf85d359037..cf85d359037 100644
--- a/py/python/Makefile.mak
+++ b/python/python/Makefile.mak
diff --git a/py/test/Ice/acm/AllTests.py b/python/test/Ice/acm/AllTests.py
index 6cfae071a24..6cfae071a24 100644
--- a/py/test/Ice/acm/AllTests.py
+++ b/python/test/Ice/acm/AllTests.py
diff --git a/py/test/Ice/acm/Client.py b/python/test/Ice/acm/Client.py
index 2c49777617b..2c49777617b 100755
--- a/py/test/Ice/acm/Client.py
+++ b/python/test/Ice/acm/Client.py
diff --git a/py/test/Ice/acm/Server.py b/python/test/Ice/acm/Server.py
index 1f63722fe09..1f63722fe09 100755
--- a/py/test/Ice/acm/Server.py
+++ b/python/test/Ice/acm/Server.py
diff --git a/py/test/Ice/acm/Test.ice b/python/test/Ice/acm/Test.ice
index b1c8b749109..b1c8b749109 100644
--- a/py/test/Ice/acm/Test.ice
+++ b/python/test/Ice/acm/Test.ice
diff --git a/py/test/Ice/acm/TestI.py b/python/test/Ice/acm/TestI.py
index 6b63fd26d07..6b63fd26d07 100644
--- a/py/test/Ice/acm/TestI.py
+++ b/python/test/Ice/acm/TestI.py
diff --git a/py/test/Ice/acm/run.py b/python/test/Ice/acm/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/acm/run.py
+++ b/python/test/Ice/acm/run.py
diff --git a/py/test/Ice/adapterDeactivation/AllTests.py b/python/test/Ice/adapterDeactivation/AllTests.py
index db92fedbd02..db92fedbd02 100644
--- a/py/test/Ice/adapterDeactivation/AllTests.py
+++ b/python/test/Ice/adapterDeactivation/AllTests.py
diff --git a/py/test/Ice/adapterDeactivation/Client.py b/python/test/Ice/adapterDeactivation/Client.py
index a7aa744ec0a..a7aa744ec0a 100755
--- a/py/test/Ice/adapterDeactivation/Client.py
+++ b/python/test/Ice/adapterDeactivation/Client.py
diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/python/test/Ice/adapterDeactivation/Collocated.py
index c27c1c0915a..c27c1c0915a 100755
--- a/py/test/Ice/adapterDeactivation/Collocated.py
+++ b/python/test/Ice/adapterDeactivation/Collocated.py
diff --git a/py/test/Ice/adapterDeactivation/Server.py b/python/test/Ice/adapterDeactivation/Server.py
index 53c39294ad3..53c39294ad3 100755
--- a/py/test/Ice/adapterDeactivation/Server.py
+++ b/python/test/Ice/adapterDeactivation/Server.py
diff --git a/py/test/Ice/adapterDeactivation/Test.ice b/python/test/Ice/adapterDeactivation/Test.ice
index 7e9fecd5f89..7e9fecd5f89 100644
--- a/py/test/Ice/adapterDeactivation/Test.ice
+++ b/python/test/Ice/adapterDeactivation/Test.ice
diff --git a/py/test/Ice/adapterDeactivation/TestI.py b/python/test/Ice/adapterDeactivation/TestI.py
index 3b61867c0ba..3b61867c0ba 100644
--- a/py/test/Ice/adapterDeactivation/TestI.py
+++ b/python/test/Ice/adapterDeactivation/TestI.py
diff --git a/py/test/Ice/adapterDeactivation/run.py b/python/test/Ice/adapterDeactivation/run.py
index 9487c74a4f5..9487c74a4f5 100755
--- a/py/test/Ice/adapterDeactivation/run.py
+++ b/python/test/Ice/adapterDeactivation/run.py
diff --git a/py/test/Ice/admin/AllTests.py b/python/test/Ice/admin/AllTests.py
index c76a7d65325..c76a7d65325 100644
--- a/py/test/Ice/admin/AllTests.py
+++ b/python/test/Ice/admin/AllTests.py
diff --git a/py/test/Ice/admin/Client.py b/python/test/Ice/admin/Client.py
index 9a4a8071b56..9a4a8071b56 100644
--- a/py/test/Ice/admin/Client.py
+++ b/python/test/Ice/admin/Client.py
diff --git a/py/test/Ice/admin/Server.py b/python/test/Ice/admin/Server.py
index a310310cc19..a310310cc19 100644
--- a/py/test/Ice/admin/Server.py
+++ b/python/test/Ice/admin/Server.py
diff --git a/py/test/Ice/admin/Test.ice b/python/test/Ice/admin/Test.ice
index 92d1cf94e49..92d1cf94e49 100644
--- a/py/test/Ice/admin/Test.ice
+++ b/python/test/Ice/admin/Test.ice
diff --git a/py/test/Ice/admin/TestI.py b/python/test/Ice/admin/TestI.py
index f1f6f8880ea..f1f6f8880ea 100644
--- a/py/test/Ice/admin/TestI.py
+++ b/python/test/Ice/admin/TestI.py
diff --git a/py/test/Ice/admin/run.py b/python/test/Ice/admin/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/admin/run.py
+++ b/python/test/Ice/admin/run.py
diff --git a/py/test/Ice/ami/AllTests.py b/python/test/Ice/ami/AllTests.py
index 93d7d9573ba..93d7d9573ba 100644
--- a/py/test/Ice/ami/AllTests.py
+++ b/python/test/Ice/ami/AllTests.py
diff --git a/py/test/Ice/ami/Client.py b/python/test/Ice/ami/Client.py
index 8eeb8ed7ea5..8eeb8ed7ea5 100755
--- a/py/test/Ice/ami/Client.py
+++ b/python/test/Ice/ami/Client.py
diff --git a/py/test/Ice/ami/Collocated.py b/python/test/Ice/ami/Collocated.py
index 11a885f82f9..11a885f82f9 100755
--- a/py/test/Ice/ami/Collocated.py
+++ b/python/test/Ice/ami/Collocated.py
diff --git a/py/test/Ice/ami/Server.py b/python/test/Ice/ami/Server.py
index bae6f92fd7e..bae6f92fd7e 100755
--- a/py/test/Ice/ami/Server.py
+++ b/python/test/Ice/ami/Server.py
diff --git a/py/test/Ice/ami/Test.ice b/python/test/Ice/ami/Test.ice
index 1bf95e7798f..1bf95e7798f 100644
--- a/py/test/Ice/ami/Test.ice
+++ b/python/test/Ice/ami/Test.ice
diff --git a/py/test/Ice/ami/TestI.py b/python/test/Ice/ami/TestI.py
index c1f7642220a..c1f7642220a 100644
--- a/py/test/Ice/ami/TestI.py
+++ b/python/test/Ice/ami/TestI.py
diff --git a/py/test/Ice/ami/run.py b/python/test/Ice/ami/run.py
index 2307ecfe0a6..2307ecfe0a6 100755
--- a/py/test/Ice/ami/run.py
+++ b/python/test/Ice/ami/run.py
diff --git a/py/test/Ice/application/Client.py b/python/test/Ice/application/Client.py
index 500c03395b0..500c03395b0 100755
--- a/py/test/Ice/application/Client.py
+++ b/python/test/Ice/application/Client.py
diff --git a/py/test/Ice/binding/AllTests.py b/python/test/Ice/binding/AllTests.py
index c1ae07f7d91..c1ae07f7d91 100644
--- a/py/test/Ice/binding/AllTests.py
+++ b/python/test/Ice/binding/AllTests.py
diff --git a/py/test/Ice/binding/Client.py b/python/test/Ice/binding/Client.py
index 7cc8180a8fc..7cc8180a8fc 100755
--- a/py/test/Ice/binding/Client.py
+++ b/python/test/Ice/binding/Client.py
diff --git a/py/test/Ice/binding/Server.py b/python/test/Ice/binding/Server.py
index 25d7602fcb4..25d7602fcb4 100755
--- a/py/test/Ice/binding/Server.py
+++ b/python/test/Ice/binding/Server.py
diff --git a/py/test/Ice/binding/Test.ice b/python/test/Ice/binding/Test.ice
index bd7cbe1a971..bd7cbe1a971 100644
--- a/py/test/Ice/binding/Test.ice
+++ b/python/test/Ice/binding/Test.ice
diff --git a/py/test/Ice/binding/TestI.py b/python/test/Ice/binding/TestI.py
index c24cf074c4b..c24cf074c4b 100644
--- a/py/test/Ice/binding/TestI.py
+++ b/python/test/Ice/binding/TestI.py
diff --git a/py/test/Ice/binding/run.py b/python/test/Ice/binding/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/binding/run.py
+++ b/python/test/Ice/binding/run.py
diff --git a/py/test/Ice/blobject/Client.py b/python/test/Ice/blobject/Client.py
index 8fb5d04c61e..8fb5d04c61e 100755
--- a/py/test/Ice/blobject/Client.py
+++ b/python/test/Ice/blobject/Client.py
diff --git a/py/test/Ice/blobject/RouterI.py b/python/test/Ice/blobject/RouterI.py
index 47582a06b33..47582a06b33 100644
--- a/py/test/Ice/blobject/RouterI.py
+++ b/python/test/Ice/blobject/RouterI.py
diff --git a/py/test/Ice/blobject/Server.py b/python/test/Ice/blobject/Server.py
index 0dbd92a4b68..0dbd92a4b68 100755
--- a/py/test/Ice/blobject/Server.py
+++ b/python/test/Ice/blobject/Server.py
diff --git a/py/test/Ice/blobject/Test.ice b/python/test/Ice/blobject/Test.ice
index 967825ffbf7..967825ffbf7 100644
--- a/py/test/Ice/blobject/Test.ice
+++ b/python/test/Ice/blobject/Test.ice
diff --git a/py/test/Ice/blobject/run.py b/python/test/Ice/blobject/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/blobject/run.py
+++ b/python/test/Ice/blobject/run.py
diff --git a/py/test/Ice/checksum/AllTests.py b/python/test/Ice/checksum/AllTests.py
index cece6a1d908..cece6a1d908 100644
--- a/py/test/Ice/checksum/AllTests.py
+++ b/python/test/Ice/checksum/AllTests.py
diff --git a/py/test/Ice/checksum/CTypes.ice b/python/test/Ice/checksum/CTypes.ice
index 1dfc5f719d5..1dfc5f719d5 100644
--- a/py/test/Ice/checksum/CTypes.ice
+++ b/python/test/Ice/checksum/CTypes.ice
diff --git a/py/test/Ice/checksum/Client.py b/python/test/Ice/checksum/Client.py
index 592c84c632a..592c84c632a 100755
--- a/py/test/Ice/checksum/Client.py
+++ b/python/test/Ice/checksum/Client.py
diff --git a/py/test/Ice/checksum/STypes.ice b/python/test/Ice/checksum/STypes.ice
index 00e0b76c2ea..00e0b76c2ea 100644
--- a/py/test/Ice/checksum/STypes.ice
+++ b/python/test/Ice/checksum/STypes.ice
diff --git a/py/test/Ice/checksum/Server.py b/python/test/Ice/checksum/Server.py
index 424df6a4826..424df6a4826 100755
--- a/py/test/Ice/checksum/Server.py
+++ b/python/test/Ice/checksum/Server.py
diff --git a/py/test/Ice/checksum/Test.ice b/python/test/Ice/checksum/Test.ice
index 21639acff0f..21639acff0f 100644
--- a/py/test/Ice/checksum/Test.ice
+++ b/python/test/Ice/checksum/Test.ice
diff --git a/py/test/Ice/checksum/run.py b/python/test/Ice/checksum/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/checksum/run.py
+++ b/python/test/Ice/checksum/run.py
diff --git a/py/test/Ice/custom/AllTests.py b/python/test/Ice/custom/AllTests.py
index dd3a1437f90..dd3a1437f90 100644
--- a/py/test/Ice/custom/AllTests.py
+++ b/python/test/Ice/custom/AllTests.py
diff --git a/py/test/Ice/custom/Client.py b/python/test/Ice/custom/Client.py
index bce846df40f..bce846df40f 100755
--- a/py/test/Ice/custom/Client.py
+++ b/python/test/Ice/custom/Client.py
diff --git a/py/test/Ice/custom/Server.py b/python/test/Ice/custom/Server.py
index af0f49ebb76..af0f49ebb76 100755
--- a/py/test/Ice/custom/Server.py
+++ b/python/test/Ice/custom/Server.py
diff --git a/py/test/Ice/custom/Test.ice b/python/test/Ice/custom/Test.ice
index aa68e90f1c3..aa68e90f1c3 100644
--- a/py/test/Ice/custom/Test.ice
+++ b/python/test/Ice/custom/Test.ice
diff --git a/py/test/Ice/custom/run.py b/python/test/Ice/custom/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/custom/run.py
+++ b/python/test/Ice/custom/run.py
diff --git a/py/test/Ice/defaultServant/AllTests.py b/python/test/Ice/defaultServant/AllTests.py
index 2b3e1533d84..2b3e1533d84 100644
--- a/py/test/Ice/defaultServant/AllTests.py
+++ b/python/test/Ice/defaultServant/AllTests.py
diff --git a/py/test/Ice/defaultServant/Client.py b/python/test/Ice/defaultServant/Client.py
index 7cc8180a8fc..7cc8180a8fc 100755
--- a/py/test/Ice/defaultServant/Client.py
+++ b/python/test/Ice/defaultServant/Client.py
diff --git a/py/test/Ice/defaultServant/MyObjectI.py b/python/test/Ice/defaultServant/MyObjectI.py
index 97cbd4bbf3d..97cbd4bbf3d 100644
--- a/py/test/Ice/defaultServant/MyObjectI.py
+++ b/python/test/Ice/defaultServant/MyObjectI.py
diff --git a/py/test/Ice/defaultServant/Test.ice b/python/test/Ice/defaultServant/Test.ice
index cc90e550721..cc90e550721 100644
--- a/py/test/Ice/defaultServant/Test.ice
+++ b/python/test/Ice/defaultServant/Test.ice
diff --git a/py/test/Ice/defaultServant/run.py b/python/test/Ice/defaultServant/run.py
index 4268e9283e0..4268e9283e0 100755
--- a/py/test/Ice/defaultServant/run.py
+++ b/python/test/Ice/defaultServant/run.py
diff --git a/py/test/Ice/defaultValue/AllTests.py b/python/test/Ice/defaultValue/AllTests.py
index bc529c4b90e..bc529c4b90e 100644
--- a/py/test/Ice/defaultValue/AllTests.py
+++ b/python/test/Ice/defaultValue/AllTests.py
diff --git a/py/test/Ice/defaultValue/Client.py b/python/test/Ice/defaultValue/Client.py
index 061672f46dc..061672f46dc 100755
--- a/py/test/Ice/defaultValue/Client.py
+++ b/python/test/Ice/defaultValue/Client.py
diff --git a/py/test/Ice/defaultValue/Test.ice b/python/test/Ice/defaultValue/Test.ice
index 101a42883f3..101a42883f3 100644
--- a/py/test/Ice/defaultValue/Test.ice
+++ b/python/test/Ice/defaultValue/Test.ice
diff --git a/py/test/Ice/defaultValue/run.py b/python/test/Ice/defaultValue/run.py
index 4268e9283e0..4268e9283e0 100755
--- a/py/test/Ice/defaultValue/run.py
+++ b/python/test/Ice/defaultValue/run.py
diff --git a/py/test/Ice/enums/AllTests.py b/python/test/Ice/enums/AllTests.py
index a5dae46cff9..a5dae46cff9 100644
--- a/py/test/Ice/enums/AllTests.py
+++ b/python/test/Ice/enums/AllTests.py
diff --git a/py/test/Ice/enums/Client.py b/python/test/Ice/enums/Client.py
index acff619e914..acff619e914 100755
--- a/py/test/Ice/enums/Client.py
+++ b/python/test/Ice/enums/Client.py
diff --git a/py/test/Ice/enums/Server.py b/python/test/Ice/enums/Server.py
index f51922e12fc..f51922e12fc 100755
--- a/py/test/Ice/enums/Server.py
+++ b/python/test/Ice/enums/Server.py
diff --git a/py/test/Ice/enums/Test.ice b/python/test/Ice/enums/Test.ice
index 1cfe8c3eda8..1cfe8c3eda8 100644
--- a/py/test/Ice/enums/Test.ice
+++ b/python/test/Ice/enums/Test.ice
diff --git a/py/test/Ice/enums/run.py b/python/test/Ice/enums/run.py
index 614bfe363bf..614bfe363bf 100755
--- a/py/test/Ice/enums/run.py
+++ b/python/test/Ice/enums/run.py
diff --git a/py/test/Ice/exceptions/AllTests.py b/python/test/Ice/exceptions/AllTests.py
index 4522a0de731..4522a0de731 100644
--- a/py/test/Ice/exceptions/AllTests.py
+++ b/python/test/Ice/exceptions/AllTests.py
diff --git a/py/test/Ice/exceptions/Client.py b/python/test/Ice/exceptions/Client.py
index 3f535c2a2d7..3f535c2a2d7 100755
--- a/py/test/Ice/exceptions/Client.py
+++ b/python/test/Ice/exceptions/Client.py
diff --git a/py/test/Ice/exceptions/Collocated.py b/python/test/Ice/exceptions/Collocated.py
index d60527a3d61..d60527a3d61 100755
--- a/py/test/Ice/exceptions/Collocated.py
+++ b/python/test/Ice/exceptions/Collocated.py
diff --git a/py/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py
index ba67f7b1f55..ba67f7b1f55 100755
--- a/py/test/Ice/exceptions/Server.py
+++ b/python/test/Ice/exceptions/Server.py
diff --git a/py/test/Ice/exceptions/ServerAMD.py b/python/test/Ice/exceptions/ServerAMD.py
index 9dd180dec06..9dd180dec06 100755
--- a/py/test/Ice/exceptions/ServerAMD.py
+++ b/python/test/Ice/exceptions/ServerAMD.py
diff --git a/py/test/Ice/exceptions/Test.ice b/python/test/Ice/exceptions/Test.ice
index cb519fa50f4..cb519fa50f4 100644
--- a/py/test/Ice/exceptions/Test.ice
+++ b/python/test/Ice/exceptions/Test.ice
diff --git a/py/test/Ice/exceptions/TestAMD.ice b/python/test/Ice/exceptions/TestAMD.ice
index 6c6cd19342d..6c6cd19342d 100644
--- a/py/test/Ice/exceptions/TestAMD.ice
+++ b/python/test/Ice/exceptions/TestAMD.ice
diff --git a/py/test/Ice/exceptions/TestI.py b/python/test/Ice/exceptions/TestI.py
index 7ff371fc0b1..7ff371fc0b1 100644
--- a/py/test/Ice/exceptions/TestI.py
+++ b/python/test/Ice/exceptions/TestI.py
diff --git a/py/test/Ice/exceptions/run.py b/python/test/Ice/exceptions/run.py
index 9445951eca9..9445951eca9 100755
--- a/py/test/Ice/exceptions/run.py
+++ b/python/test/Ice/exceptions/run.py
diff --git a/py/test/Ice/facets/AllTests.py b/python/test/Ice/facets/AllTests.py
index b1059672d21..b1059672d21 100644
--- a/py/test/Ice/facets/AllTests.py
+++ b/python/test/Ice/facets/AllTests.py
diff --git a/py/test/Ice/facets/Client.py b/python/test/Ice/facets/Client.py
index 7b008b0ad8f..7b008b0ad8f 100755
--- a/py/test/Ice/facets/Client.py
+++ b/python/test/Ice/facets/Client.py
diff --git a/py/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py
index 8fbc45a0f31..8fbc45a0f31 100755
--- a/py/test/Ice/facets/Collocated.py
+++ b/python/test/Ice/facets/Collocated.py
diff --git a/py/test/Ice/facets/Server.py b/python/test/Ice/facets/Server.py
index 96145347213..96145347213 100755
--- a/py/test/Ice/facets/Server.py
+++ b/python/test/Ice/facets/Server.py
diff --git a/py/test/Ice/facets/Test.ice b/python/test/Ice/facets/Test.ice
index d73c6594829..d73c6594829 100644
--- a/py/test/Ice/facets/Test.ice
+++ b/python/test/Ice/facets/Test.ice
diff --git a/py/test/Ice/facets/TestI.py b/python/test/Ice/facets/TestI.py
index 9f709245554..9f709245554 100644
--- a/py/test/Ice/facets/TestI.py
+++ b/python/test/Ice/facets/TestI.py
diff --git a/py/test/Ice/facets/run.py b/python/test/Ice/facets/run.py
index 9487c74a4f5..9487c74a4f5 100755
--- a/py/test/Ice/facets/run.py
+++ b/python/test/Ice/facets/run.py
diff --git a/py/test/Ice/faultTolerance/AllTests.py b/python/test/Ice/faultTolerance/AllTests.py
index 04f78961b24..04f78961b24 100644
--- a/py/test/Ice/faultTolerance/AllTests.py
+++ b/python/test/Ice/faultTolerance/AllTests.py
diff --git a/py/test/Ice/faultTolerance/Client.py b/python/test/Ice/faultTolerance/Client.py
index 9fcd238c561..9fcd238c561 100755
--- a/py/test/Ice/faultTolerance/Client.py
+++ b/python/test/Ice/faultTolerance/Client.py
diff --git a/py/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py
index 3bf4b269367..3bf4b269367 100755
--- a/py/test/Ice/faultTolerance/Server.py
+++ b/python/test/Ice/faultTolerance/Server.py
diff --git a/py/test/Ice/faultTolerance/Test.ice b/python/test/Ice/faultTolerance/Test.ice
index d5488ad5726..d5488ad5726 100644
--- a/py/test/Ice/faultTolerance/Test.ice
+++ b/python/test/Ice/faultTolerance/Test.ice
diff --git a/py/test/Ice/faultTolerance/run.py b/python/test/Ice/faultTolerance/run.py
index d3db12b4e2f..d3db12b4e2f 100755
--- a/py/test/Ice/faultTolerance/run.py
+++ b/python/test/Ice/faultTolerance/run.py
diff --git a/py/test/Ice/info/AllTests.py b/python/test/Ice/info/AllTests.py
index c8c754e804b..c8c754e804b 100644
--- a/py/test/Ice/info/AllTests.py
+++ b/python/test/Ice/info/AllTests.py
diff --git a/py/test/Ice/info/Client.py b/python/test/Ice/info/Client.py
index cb71229d9da..cb71229d9da 100755
--- a/py/test/Ice/info/Client.py
+++ b/python/test/Ice/info/Client.py
diff --git a/py/test/Ice/info/Server.py b/python/test/Ice/info/Server.py
index e4d7ccf824f..e4d7ccf824f 100755
--- a/py/test/Ice/info/Server.py
+++ b/python/test/Ice/info/Server.py
diff --git a/py/test/Ice/info/Test.ice b/python/test/Ice/info/Test.ice
index a71990ba3db..a71990ba3db 100644
--- a/py/test/Ice/info/Test.ice
+++ b/python/test/Ice/info/Test.ice
diff --git a/py/test/Ice/info/TestI.py b/python/test/Ice/info/TestI.py
index c0b266a7ba4..c0b266a7ba4 100644
--- a/py/test/Ice/info/TestI.py
+++ b/python/test/Ice/info/TestI.py
diff --git a/py/test/Ice/info/run.py b/python/test/Ice/info/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/info/run.py
+++ b/python/test/Ice/info/run.py
diff --git a/py/test/Ice/inheritance/AllTests.py b/python/test/Ice/inheritance/AllTests.py
index 67922a33ff5..67922a33ff5 100644
--- a/py/test/Ice/inheritance/AllTests.py
+++ b/python/test/Ice/inheritance/AllTests.py
diff --git a/py/test/Ice/inheritance/Client.py b/python/test/Ice/inheritance/Client.py
index d3f92a4e4ed..d3f92a4e4ed 100755
--- a/py/test/Ice/inheritance/Client.py
+++ b/python/test/Ice/inheritance/Client.py
diff --git a/py/test/Ice/inheritance/Collocated.py b/python/test/Ice/inheritance/Collocated.py
index 0652f4d9169..0652f4d9169 100755
--- a/py/test/Ice/inheritance/Collocated.py
+++ b/python/test/Ice/inheritance/Collocated.py
diff --git a/py/test/Ice/inheritance/Server.py b/python/test/Ice/inheritance/Server.py
index 381c8e36ba4..381c8e36ba4 100755
--- a/py/test/Ice/inheritance/Server.py
+++ b/python/test/Ice/inheritance/Server.py
diff --git a/py/test/Ice/inheritance/Test.ice b/python/test/Ice/inheritance/Test.ice
index 7dd63ee98b6..7dd63ee98b6 100644
--- a/py/test/Ice/inheritance/Test.ice
+++ b/python/test/Ice/inheritance/Test.ice
diff --git a/py/test/Ice/inheritance/TestI.py b/python/test/Ice/inheritance/TestI.py
index 291e1b46414..291e1b46414 100644
--- a/py/test/Ice/inheritance/TestI.py
+++ b/python/test/Ice/inheritance/TestI.py
diff --git a/py/test/Ice/inheritance/run.py b/python/test/Ice/inheritance/run.py
index 9487c74a4f5..9487c74a4f5 100755
--- a/py/test/Ice/inheritance/run.py
+++ b/python/test/Ice/inheritance/run.py
diff --git a/py/test/Ice/location/AllTests.py b/python/test/Ice/location/AllTests.py
index 4fd5047e107..4fd5047e107 100644
--- a/py/test/Ice/location/AllTests.py
+++ b/python/test/Ice/location/AllTests.py
diff --git a/py/test/Ice/location/Client.py b/python/test/Ice/location/Client.py
index 9ac5b7c03d1..9ac5b7c03d1 100755
--- a/py/test/Ice/location/Client.py
+++ b/python/test/Ice/location/Client.py
diff --git a/py/test/Ice/location/Server.py b/python/test/Ice/location/Server.py
index 481621a5efc..481621a5efc 100755
--- a/py/test/Ice/location/Server.py
+++ b/python/test/Ice/location/Server.py
diff --git a/py/test/Ice/location/Test.ice b/python/test/Ice/location/Test.ice
index 82840ead2b6..82840ead2b6 100644
--- a/py/test/Ice/location/Test.ice
+++ b/python/test/Ice/location/Test.ice
diff --git a/py/test/Ice/location/run.py b/python/test/Ice/location/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/location/run.py
+++ b/python/test/Ice/location/run.py
diff --git a/py/test/Ice/objects/AllTests.py b/python/test/Ice/objects/AllTests.py
index d7de69b901c..d7de69b901c 100644
--- a/py/test/Ice/objects/AllTests.py
+++ b/python/test/Ice/objects/AllTests.py
diff --git a/py/test/Ice/objects/Client.py b/python/test/Ice/objects/Client.py
index ba3057aed04..ba3057aed04 100755
--- a/py/test/Ice/objects/Client.py
+++ b/python/test/Ice/objects/Client.py
diff --git a/py/test/Ice/objects/ClientPrivate.ice b/python/test/Ice/objects/ClientPrivate.ice
index 31d2e12d833..31d2e12d833 100644
--- a/py/test/Ice/objects/ClientPrivate.ice
+++ b/python/test/Ice/objects/ClientPrivate.ice
diff --git a/py/test/Ice/objects/Collocated.py b/python/test/Ice/objects/Collocated.py
index 321c351de56..321c351de56 100755
--- a/py/test/Ice/objects/Collocated.py
+++ b/python/test/Ice/objects/Collocated.py
diff --git a/py/test/Ice/objects/Server.py b/python/test/Ice/objects/Server.py
index d988b501d14..d988b501d14 100755
--- a/py/test/Ice/objects/Server.py
+++ b/python/test/Ice/objects/Server.py
diff --git a/py/test/Ice/objects/ServerPrivate.ice b/python/test/Ice/objects/ServerPrivate.ice
index f7920ba6de8..f7920ba6de8 100644
--- a/py/test/Ice/objects/ServerPrivate.ice
+++ b/python/test/Ice/objects/ServerPrivate.ice
diff --git a/py/test/Ice/objects/Test.ice b/python/test/Ice/objects/Test.ice
index 42852d1f75c..42852d1f75c 100644
--- a/py/test/Ice/objects/Test.ice
+++ b/python/test/Ice/objects/Test.ice
diff --git a/py/test/Ice/objects/TestI.py b/python/test/Ice/objects/TestI.py
index 5fc8b0cedca..5fc8b0cedca 100644
--- a/py/test/Ice/objects/TestI.py
+++ b/python/test/Ice/objects/TestI.py
diff --git a/py/test/Ice/objects/run.py b/python/test/Ice/objects/run.py
index 9e92332d98b..9e92332d98b 100755
--- a/py/test/Ice/objects/run.py
+++ b/python/test/Ice/objects/run.py
diff --git a/py/test/Ice/operations/AllTests.py b/python/test/Ice/operations/AllTests.py
index a3d3bac823a..a3d3bac823a 100644
--- a/py/test/Ice/operations/AllTests.py
+++ b/python/test/Ice/operations/AllTests.py
diff --git a/py/test/Ice/operations/BatchOneways.py b/python/test/Ice/operations/BatchOneways.py
index 0e73c6f1a2d..0e73c6f1a2d 100644
--- a/py/test/Ice/operations/BatchOneways.py
+++ b/python/test/Ice/operations/BatchOneways.py
diff --git a/py/test/Ice/operations/BatchOnewaysAMI.py b/python/test/Ice/operations/BatchOnewaysAMI.py
index f78bf40db04..f78bf40db04 100644
--- a/py/test/Ice/operations/BatchOnewaysAMI.py
+++ b/python/test/Ice/operations/BatchOnewaysAMI.py
diff --git a/py/test/Ice/operations/Client.py b/python/test/Ice/operations/Client.py
index 2c18f66d07d..2c18f66d07d 100755
--- a/py/test/Ice/operations/Client.py
+++ b/python/test/Ice/operations/Client.py
diff --git a/py/test/Ice/operations/Collocated.py b/python/test/Ice/operations/Collocated.py
index cabd7890618..cabd7890618 100755
--- a/py/test/Ice/operations/Collocated.py
+++ b/python/test/Ice/operations/Collocated.py
diff --git a/py/test/Ice/operations/Oneways.py b/python/test/Ice/operations/Oneways.py
index a64d9103ce9..a64d9103ce9 100644
--- a/py/test/Ice/operations/Oneways.py
+++ b/python/test/Ice/operations/Oneways.py
diff --git a/py/test/Ice/operations/OnewaysAMI.py b/python/test/Ice/operations/OnewaysAMI.py
index 1068cb2e9b0..1068cb2e9b0 100644
--- a/py/test/Ice/operations/OnewaysAMI.py
+++ b/python/test/Ice/operations/OnewaysAMI.py
diff --git a/py/test/Ice/operations/Server.py b/python/test/Ice/operations/Server.py
index b7f2045fd1b..b7f2045fd1b 100755
--- a/py/test/Ice/operations/Server.py
+++ b/python/test/Ice/operations/Server.py
diff --git a/py/test/Ice/operations/ServerAMD.py b/python/test/Ice/operations/ServerAMD.py
index 61565b37353..61565b37353 100755
--- a/py/test/Ice/operations/ServerAMD.py
+++ b/python/test/Ice/operations/ServerAMD.py
diff --git a/py/test/Ice/operations/Test.ice b/python/test/Ice/operations/Test.ice
index 324fa1bf633..324fa1bf633 100644
--- a/py/test/Ice/operations/Test.ice
+++ b/python/test/Ice/operations/Test.ice
diff --git a/py/test/Ice/operations/TestAMD.ice b/python/test/Ice/operations/TestAMD.ice
index 772343fefbb..772343fefbb 100644
--- a/py/test/Ice/operations/TestAMD.ice
+++ b/python/test/Ice/operations/TestAMD.ice
diff --git a/py/test/Ice/operations/TestI.py b/python/test/Ice/operations/TestI.py
index fac1fb228a8..fac1fb228a8 100644
--- a/py/test/Ice/operations/TestI.py
+++ b/python/test/Ice/operations/TestI.py
diff --git a/py/test/Ice/operations/Twoways.py b/python/test/Ice/operations/Twoways.py
index 1299a375d7a..1299a375d7a 100644
--- a/py/test/Ice/operations/Twoways.py
+++ b/python/test/Ice/operations/Twoways.py
diff --git a/py/test/Ice/operations/TwowaysAMI.py b/python/test/Ice/operations/TwowaysAMI.py
index 83ef333dea1..83ef333dea1 100644
--- a/py/test/Ice/operations/TwowaysAMI.py
+++ b/python/test/Ice/operations/TwowaysAMI.py
diff --git a/py/test/Ice/operations/run.py b/python/test/Ice/operations/run.py
index 767b20c0a2c..767b20c0a2c 100755
--- a/py/test/Ice/operations/run.py
+++ b/python/test/Ice/operations/run.py
diff --git a/py/test/Ice/optional/AllTests.py b/python/test/Ice/optional/AllTests.py
index 051e415e9f4..051e415e9f4 100644
--- a/py/test/Ice/optional/AllTests.py
+++ b/python/test/Ice/optional/AllTests.py
diff --git a/py/test/Ice/optional/Client.py b/python/test/Ice/optional/Client.py
index 98b5a22d66f..98b5a22d66f 100755
--- a/py/test/Ice/optional/Client.py
+++ b/python/test/Ice/optional/Client.py
diff --git a/py/test/Ice/optional/ClientPrivate.ice b/python/test/Ice/optional/ClientPrivate.ice
index c7211442401..c7211442401 100644
--- a/py/test/Ice/optional/ClientPrivate.ice
+++ b/python/test/Ice/optional/ClientPrivate.ice
diff --git a/py/test/Ice/optional/Server.py b/python/test/Ice/optional/Server.py
index 1533bd38b70..1533bd38b70 100755
--- a/py/test/Ice/optional/Server.py
+++ b/python/test/Ice/optional/Server.py
diff --git a/py/test/Ice/optional/ServerAMD.py b/python/test/Ice/optional/ServerAMD.py
index edf6701cb0e..edf6701cb0e 100755
--- a/py/test/Ice/optional/ServerAMD.py
+++ b/python/test/Ice/optional/ServerAMD.py
diff --git a/py/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice
index 2a3d25720b6..2a3d25720b6 100644
--- a/py/test/Ice/optional/Test.ice
+++ b/python/test/Ice/optional/Test.ice
diff --git a/py/test/Ice/optional/TestAMD.ice b/python/test/Ice/optional/TestAMD.ice
index cf6c62ee7f1..cf6c62ee7f1 100644
--- a/py/test/Ice/optional/TestAMD.ice
+++ b/python/test/Ice/optional/TestAMD.ice
diff --git a/py/test/Ice/optional/run.py b/python/test/Ice/optional/run.py
index 1a3f97ec2e2..1a3f97ec2e2 100755
--- a/py/test/Ice/optional/run.py
+++ b/python/test/Ice/optional/run.py
diff --git a/py/test/Ice/properties/Client.py b/python/test/Ice/properties/Client.py
index e771da6903e..e771da6903e 100644
--- a/py/test/Ice/properties/Client.py
+++ b/python/test/Ice/properties/Client.py
diff --git a/py/test/Ice/properties/config/.gitignore b/python/test/Ice/properties/config/.gitignore
index 143c64680f3..143c64680f3 100644
--- a/py/test/Ice/properties/config/.gitignore
+++ b/python/test/Ice/properties/config/.gitignore
diff --git a/py/test/Ice/properties/config/config.1 b/python/test/Ice/properties/config/config.1
index 2a20653e4c5..2a20653e4c5 100644
--- a/py/test/Ice/properties/config/config.1
+++ b/python/test/Ice/properties/config/config.1
diff --git a/py/test/Ice/properties/config/config.2 b/python/test/Ice/properties/config/config.2
index be276df6602..be276df6602 100644
--- a/py/test/Ice/properties/config/config.2
+++ b/python/test/Ice/properties/config/config.2
diff --git a/py/test/Ice/properties/config/config.3 b/python/test/Ice/properties/config/config.3
index 55c1e1123f6..55c1e1123f6 100644
--- a/py/test/Ice/properties/config/config.3
+++ b/python/test/Ice/properties/config/config.3
diff --git a/py/test/Ice/properties/config/escapes.cfg b/python/test/Ice/properties/config/escapes.cfg
index f438d2b59c8..f438d2b59c8 100644
--- a/py/test/Ice/properties/config/escapes.cfg
+++ b/python/test/Ice/properties/config/escapes.cfg
diff --git a/py/test/Ice/properties/run.py b/python/test/Ice/properties/run.py
index c6ce2b8cfad..c6ce2b8cfad 100755
--- a/py/test/Ice/properties/run.py
+++ b/python/test/Ice/properties/run.py
diff --git a/py/test/Ice/proxy/AllTests.py b/python/test/Ice/proxy/AllTests.py
index fb606824b30..fb606824b30 100644
--- a/py/test/Ice/proxy/AllTests.py
+++ b/python/test/Ice/proxy/AllTests.py
diff --git a/py/test/Ice/proxy/Client.py b/python/test/Ice/proxy/Client.py
index 442bd795711..442bd795711 100755
--- a/py/test/Ice/proxy/Client.py
+++ b/python/test/Ice/proxy/Client.py
diff --git a/py/test/Ice/proxy/Collocated.py b/python/test/Ice/proxy/Collocated.py
index a66580d803a..a66580d803a 100755
--- a/py/test/Ice/proxy/Collocated.py
+++ b/python/test/Ice/proxy/Collocated.py
diff --git a/py/test/Ice/proxy/Server.py b/python/test/Ice/proxy/Server.py
index cf5e7289225..cf5e7289225 100755
--- a/py/test/Ice/proxy/Server.py
+++ b/python/test/Ice/proxy/Server.py
diff --git a/py/test/Ice/proxy/ServerAMD.py b/python/test/Ice/proxy/ServerAMD.py
index f94496bbcb7..f94496bbcb7 100755
--- a/py/test/Ice/proxy/ServerAMD.py
+++ b/python/test/Ice/proxy/ServerAMD.py
diff --git a/py/test/Ice/proxy/Test.ice b/python/test/Ice/proxy/Test.ice
index 7f3701e81e2..7f3701e81e2 100644
--- a/py/test/Ice/proxy/Test.ice
+++ b/python/test/Ice/proxy/Test.ice
diff --git a/py/test/Ice/proxy/TestAMD.ice b/python/test/Ice/proxy/TestAMD.ice
index f69fb3a10b6..f69fb3a10b6 100644
--- a/py/test/Ice/proxy/TestAMD.ice
+++ b/python/test/Ice/proxy/TestAMD.ice
diff --git a/py/test/Ice/proxy/TestI.py b/python/test/Ice/proxy/TestI.py
index 72464f6d2ca..72464f6d2ca 100644
--- a/py/test/Ice/proxy/TestI.py
+++ b/python/test/Ice/proxy/TestI.py
diff --git a/py/test/Ice/proxy/run.py b/python/test/Ice/proxy/run.py
index 767b20c0a2c..767b20c0a2c 100755
--- a/py/test/Ice/proxy/run.py
+++ b/python/test/Ice/proxy/run.py
diff --git a/py/test/Ice/servantLocator/AllTests.py b/python/test/Ice/servantLocator/AllTests.py
index debe76df441..debe76df441 100644
--- a/py/test/Ice/servantLocator/AllTests.py
+++ b/python/test/Ice/servantLocator/AllTests.py
diff --git a/py/test/Ice/servantLocator/Client.py b/python/test/Ice/servantLocator/Client.py
index 99ec03e78c3..99ec03e78c3 100755
--- a/py/test/Ice/servantLocator/Client.py
+++ b/python/test/Ice/servantLocator/Client.py
diff --git a/py/test/Ice/servantLocator/Collocated.py b/python/test/Ice/servantLocator/Collocated.py
index ae176ff0320..ae176ff0320 100755
--- a/py/test/Ice/servantLocator/Collocated.py
+++ b/python/test/Ice/servantLocator/Collocated.py
diff --git a/py/test/Ice/servantLocator/Server.py b/python/test/Ice/servantLocator/Server.py
index 567f1e1791b..567f1e1791b 100755
--- a/py/test/Ice/servantLocator/Server.py
+++ b/python/test/Ice/servantLocator/Server.py
diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/python/test/Ice/servantLocator/ServerAMD.py
index cd233e5c039..cd233e5c039 100755
--- a/py/test/Ice/servantLocator/ServerAMD.py
+++ b/python/test/Ice/servantLocator/ServerAMD.py
diff --git a/py/test/Ice/servantLocator/Test.ice b/python/test/Ice/servantLocator/Test.ice
index 52681603e36..52681603e36 100644
--- a/py/test/Ice/servantLocator/Test.ice
+++ b/python/test/Ice/servantLocator/Test.ice
diff --git a/py/test/Ice/servantLocator/TestAMD.ice b/python/test/Ice/servantLocator/TestAMD.ice
index 83512649026..83512649026 100644
--- a/py/test/Ice/servantLocator/TestAMD.ice
+++ b/python/test/Ice/servantLocator/TestAMD.ice
diff --git a/py/test/Ice/servantLocator/TestAMDI.py b/python/test/Ice/servantLocator/TestAMDI.py
index 4ba7ca4f72f..4ba7ca4f72f 100644
--- a/py/test/Ice/servantLocator/TestAMDI.py
+++ b/python/test/Ice/servantLocator/TestAMDI.py
diff --git a/py/test/Ice/servantLocator/TestActivationAMDI.py b/python/test/Ice/servantLocator/TestActivationAMDI.py
index ade3027cb85..ade3027cb85 100644
--- a/py/test/Ice/servantLocator/TestActivationAMDI.py
+++ b/python/test/Ice/servantLocator/TestActivationAMDI.py
diff --git a/py/test/Ice/servantLocator/TestActivationI.py b/python/test/Ice/servantLocator/TestActivationI.py
index 026ec36af41..026ec36af41 100644
--- a/py/test/Ice/servantLocator/TestActivationI.py
+++ b/python/test/Ice/servantLocator/TestActivationI.py
diff --git a/py/test/Ice/servantLocator/TestI.py b/python/test/Ice/servantLocator/TestI.py
index 19e724fd5d0..19e724fd5d0 100644
--- a/py/test/Ice/servantLocator/TestI.py
+++ b/python/test/Ice/servantLocator/TestI.py
diff --git a/py/test/Ice/servantLocator/run.py b/python/test/Ice/servantLocator/run.py
index 767b20c0a2c..767b20c0a2c 100755
--- a/py/test/Ice/servantLocator/run.py
+++ b/python/test/Ice/servantLocator/run.py
diff --git a/py/test/Ice/slicing/exceptions/AllTests.py b/python/test/Ice/slicing/exceptions/AllTests.py
index 07f860aeb1b..07f860aeb1b 100644
--- a/py/test/Ice/slicing/exceptions/AllTests.py
+++ b/python/test/Ice/slicing/exceptions/AllTests.py
diff --git a/py/test/Ice/slicing/exceptions/Client.py b/python/test/Ice/slicing/exceptions/Client.py
index 2044a2d5b27..2044a2d5b27 100755
--- a/py/test/Ice/slicing/exceptions/Client.py
+++ b/python/test/Ice/slicing/exceptions/Client.py
diff --git a/py/test/Ice/slicing/exceptions/ClientPrivate.ice b/python/test/Ice/slicing/exceptions/ClientPrivate.ice
index d7d016e5b65..d7d016e5b65 100644
--- a/py/test/Ice/slicing/exceptions/ClientPrivate.ice
+++ b/python/test/Ice/slicing/exceptions/ClientPrivate.ice
diff --git a/py/test/Ice/slicing/exceptions/Server.py b/python/test/Ice/slicing/exceptions/Server.py
index 833c79bfcec..833c79bfcec 100755
--- a/py/test/Ice/slicing/exceptions/Server.py
+++ b/python/test/Ice/slicing/exceptions/Server.py
diff --git a/py/test/Ice/slicing/exceptions/ServerAMD.py b/python/test/Ice/slicing/exceptions/ServerAMD.py
index 9a82839d7e9..9a82839d7e9 100755
--- a/py/test/Ice/slicing/exceptions/ServerAMD.py
+++ b/python/test/Ice/slicing/exceptions/ServerAMD.py
diff --git a/py/test/Ice/slicing/exceptions/ServerPrivate.ice b/python/test/Ice/slicing/exceptions/ServerPrivate.ice
index 23284dcda1a..23284dcda1a 100644
--- a/py/test/Ice/slicing/exceptions/ServerPrivate.ice
+++ b/python/test/Ice/slicing/exceptions/ServerPrivate.ice
diff --git a/py/test/Ice/slicing/exceptions/ServerPrivateAMD.ice b/python/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
index 6f9a3259c09..6f9a3259c09 100644
--- a/py/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
+++ b/python/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
diff --git a/py/test/Ice/slicing/exceptions/Test.ice b/python/test/Ice/slicing/exceptions/Test.ice
index e81c34580f6..e81c34580f6 100644
--- a/py/test/Ice/slicing/exceptions/Test.ice
+++ b/python/test/Ice/slicing/exceptions/Test.ice
diff --git a/py/test/Ice/slicing/exceptions/TestAMD.ice b/python/test/Ice/slicing/exceptions/TestAMD.ice
index 4a564781d4a..4a564781d4a 100644
--- a/py/test/Ice/slicing/exceptions/TestAMD.ice
+++ b/python/test/Ice/slicing/exceptions/TestAMD.ice
diff --git a/py/test/Ice/slicing/exceptions/run.py b/python/test/Ice/slicing/exceptions/run.py
index 95757ae246f..95757ae246f 100755
--- a/py/test/Ice/slicing/exceptions/run.py
+++ b/python/test/Ice/slicing/exceptions/run.py
diff --git a/py/test/Ice/slicing/objects/AllTests.py b/python/test/Ice/slicing/objects/AllTests.py
index c73a8df0b01..c73a8df0b01 100644
--- a/py/test/Ice/slicing/objects/AllTests.py
+++ b/python/test/Ice/slicing/objects/AllTests.py
diff --git a/py/test/Ice/slicing/objects/Client.py b/python/test/Ice/slicing/objects/Client.py
index 2044a2d5b27..2044a2d5b27 100755
--- a/py/test/Ice/slicing/objects/Client.py
+++ b/python/test/Ice/slicing/objects/Client.py
diff --git a/py/test/Ice/slicing/objects/ClientPrivate.ice b/python/test/Ice/slicing/objects/ClientPrivate.ice
index 3880bd583ab..3880bd583ab 100644
--- a/py/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/python/test/Ice/slicing/objects/ClientPrivate.ice
diff --git a/py/test/Ice/slicing/objects/Forward.ice b/python/test/Ice/slicing/objects/Forward.ice
index 89486e226cc..89486e226cc 100644
--- a/py/test/Ice/slicing/objects/Forward.ice
+++ b/python/test/Ice/slicing/objects/Forward.ice
diff --git a/py/test/Ice/slicing/objects/Server.py b/python/test/Ice/slicing/objects/Server.py
index e5b7465d7af..e5b7465d7af 100755
--- a/py/test/Ice/slicing/objects/Server.py
+++ b/python/test/Ice/slicing/objects/Server.py
diff --git a/py/test/Ice/slicing/objects/ServerAMD.py b/python/test/Ice/slicing/objects/ServerAMD.py
index 9020ff30a5f..9020ff30a5f 100755
--- a/py/test/Ice/slicing/objects/ServerAMD.py
+++ b/python/test/Ice/slicing/objects/ServerAMD.py
diff --git a/py/test/Ice/slicing/objects/ServerPrivate.ice b/python/test/Ice/slicing/objects/ServerPrivate.ice
index f4eb9552f0f..f4eb9552f0f 100644
--- a/py/test/Ice/slicing/objects/ServerPrivate.ice
+++ b/python/test/Ice/slicing/objects/ServerPrivate.ice
diff --git a/py/test/Ice/slicing/objects/ServerPrivateAMD.ice b/python/test/Ice/slicing/objects/ServerPrivateAMD.ice
index 51746909b3f..51746909b3f 100644
--- a/py/test/Ice/slicing/objects/ServerPrivateAMD.ice
+++ b/python/test/Ice/slicing/objects/ServerPrivateAMD.ice
diff --git a/py/test/Ice/slicing/objects/Test.ice b/python/test/Ice/slicing/objects/Test.ice
index 3b1d13db6bd..3b1d13db6bd 100644
--- a/py/test/Ice/slicing/objects/Test.ice
+++ b/python/test/Ice/slicing/objects/Test.ice
diff --git a/py/test/Ice/slicing/objects/TestAMD.ice b/python/test/Ice/slicing/objects/TestAMD.ice
index 0d6f7eefb78..0d6f7eefb78 100644
--- a/py/test/Ice/slicing/objects/TestAMD.ice
+++ b/python/test/Ice/slicing/objects/TestAMD.ice
diff --git a/py/test/Ice/slicing/objects/run.py b/python/test/Ice/slicing/objects/run.py
index a2cb1c4544e..a2cb1c4544e 100755
--- a/py/test/Ice/slicing/objects/run.py
+++ b/python/test/Ice/slicing/objects/run.py
diff --git a/py/test/Ice/timeout/AllTests.py b/python/test/Ice/timeout/AllTests.py
index d9db6f705b1..d9db6f705b1 100644
--- a/py/test/Ice/timeout/AllTests.py
+++ b/python/test/Ice/timeout/AllTests.py
diff --git a/py/test/Ice/timeout/Client.py b/python/test/Ice/timeout/Client.py
index 0cee6a61c9e..0cee6a61c9e 100755
--- a/py/test/Ice/timeout/Client.py
+++ b/python/test/Ice/timeout/Client.py
diff --git a/py/test/Ice/timeout/Server.py b/python/test/Ice/timeout/Server.py
index 058491d9011..058491d9011 100755
--- a/py/test/Ice/timeout/Server.py
+++ b/python/test/Ice/timeout/Server.py
diff --git a/py/test/Ice/timeout/Test.ice b/python/test/Ice/timeout/Test.ice
index dc54d71c16c..dc54d71c16c 100644
--- a/py/test/Ice/timeout/Test.ice
+++ b/python/test/Ice/timeout/Test.ice
diff --git a/py/test/Ice/timeout/run.py b/python/test/Ice/timeout/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/py/test/Ice/timeout/run.py
+++ b/python/test/Ice/timeout/run.py
diff --git a/py/test/Makefile b/python/test/Makefile
index 23caa0e5bda..23caa0e5bda 100644
--- a/py/test/Makefile
+++ b/python/test/Makefile
diff --git a/py/test/Makefile.mak b/python/test/Makefile.mak
index 9830e50eb83..9830e50eb83 100644
--- a/py/test/Makefile.mak
+++ b/python/test/Makefile.mak
diff --git a/py/test/Slice/Makefile b/python/test/Slice/Makefile
index 19f18553195..19f18553195 100644
--- a/py/test/Slice/Makefile
+++ b/python/test/Slice/Makefile
diff --git a/py/test/Slice/Makefile.mak b/python/test/Slice/Makefile.mak
index 2646dddc07c..2646dddc07c 100644
--- a/py/test/Slice/Makefile.mak
+++ b/python/test/Slice/Makefile.mak
diff --git a/py/test/Slice/import/.depend.mak b/python/test/Slice/import/.depend.mak
index e69de29bb2d..e69de29bb2d 100644
--- a/py/test/Slice/import/.depend.mak
+++ b/python/test/Slice/import/.depend.mak
diff --git a/py/test/Slice/import/.gitignore b/python/test/Slice/import/.gitignore
index 88325c99134..88325c99134 100644
--- a/py/test/Slice/import/.gitignore
+++ b/python/test/Slice/import/.gitignore
diff --git a/py/test/Slice/import/Client.py b/python/test/Slice/import/Client.py
index a8f9a1956b0..a8f9a1956b0 100755
--- a/py/test/Slice/import/Client.py
+++ b/python/test/Slice/import/Client.py
diff --git a/py/test/Slice/import/Makefile b/python/test/Slice/import/Makefile
index 91581b604f5..91581b604f5 100644
--- a/py/test/Slice/import/Makefile
+++ b/python/test/Slice/import/Makefile
diff --git a/py/test/Slice/import/Makefile.mak b/python/test/Slice/import/Makefile.mak
index f56fb6a3d87..f56fb6a3d87 100644
--- a/py/test/Slice/import/Makefile.mak
+++ b/python/test/Slice/import/Makefile.mak
diff --git a/py/test/Slice/import/Test1.ice b/python/test/Slice/import/Test1.ice
index 48f6af92c8e..48f6af92c8e 100644
--- a/py/test/Slice/import/Test1.ice
+++ b/python/test/Slice/import/Test1.ice
diff --git a/py/test/Slice/import/Test2.ice b/python/test/Slice/import/Test2.ice
index 4cd0913081c..4cd0913081c 100644
--- a/py/test/Slice/import/Test2.ice
+++ b/python/test/Slice/import/Test2.ice
diff --git a/py/test/Slice/import/run.py b/python/test/Slice/import/run.py
index 2054bdd7692..2054bdd7692 100755
--- a/py/test/Slice/import/run.py
+++ b/python/test/Slice/import/run.py
diff --git a/py/test/Slice/keyword/Client.py b/python/test/Slice/keyword/Client.py
index 82560627c27..82560627c27 100755
--- a/py/test/Slice/keyword/Client.py
+++ b/python/test/Slice/keyword/Client.py
diff --git a/py/test/Slice/keyword/Key.ice b/python/test/Slice/keyword/Key.ice
index 6e46ad0748c..6e46ad0748c 100644
--- a/py/test/Slice/keyword/Key.ice
+++ b/python/test/Slice/keyword/Key.ice
diff --git a/py/test/Slice/keyword/run.py b/python/test/Slice/keyword/run.py
index 2054bdd7692..2054bdd7692 100755
--- a/py/test/Slice/keyword/run.py
+++ b/python/test/Slice/keyword/run.py
diff --git a/py/test/Slice/macros/Client.py b/python/test/Slice/macros/Client.py
index a64d7faf9b0..a64d7faf9b0 100755
--- a/py/test/Slice/macros/Client.py
+++ b/python/test/Slice/macros/Client.py
diff --git a/py/test/Slice/macros/Test.ice b/python/test/Slice/macros/Test.ice
index 825c641fffa..825c641fffa 100644
--- a/py/test/Slice/macros/Test.ice
+++ b/python/test/Slice/macros/Test.ice
diff --git a/py/test/Slice/macros/run.py b/python/test/Slice/macros/run.py
index 2054bdd7692..2054bdd7692 100755
--- a/py/test/Slice/macros/run.py
+++ b/python/test/Slice/macros/run.py
diff --git a/py/test/Slice/structure/Client.py b/python/test/Slice/structure/Client.py
index 036ce2121d1..036ce2121d1 100755
--- a/py/test/Slice/structure/Client.py
+++ b/python/test/Slice/structure/Client.py
diff --git a/py/test/Slice/structure/Test.ice b/python/test/Slice/structure/Test.ice
index 973a80ad921..973a80ad921 100644
--- a/py/test/Slice/structure/Test.ice
+++ b/python/test/Slice/structure/Test.ice
diff --git a/py/test/Slice/structure/run.py b/python/test/Slice/structure/run.py
index 2054bdd7692..2054bdd7692 100755
--- a/py/test/Slice/structure/run.py
+++ b/python/test/Slice/structure/run.py
diff --git a/rb/Makefile b/ruby/Makefile
index 034ab9b6058..034ab9b6058 100644
--- a/rb/Makefile
+++ b/ruby/Makefile
diff --git a/rb/allTests.py b/ruby/allTests.py
index 7c1922895b0..7c1922895b0 100755
--- a/rb/allTests.py
+++ b/ruby/allTests.py
diff --git a/rb/config/Make.rules b/ruby/config/Make.rules
index 70bb01f6a9c..cf90937b51d 100644
--- a/rb/config/Make.rules
+++ b/ruby/config/Make.rules
@@ -130,7 +130,7 @@ endif
 #
 # Common definitions
 #
-ice_language     = rb
+ice_language     = ruby
 ice_require_cpp  = yes
 slice_translator = slice2rb
 
diff --git a/rb/config/Make.rules.Darwin b/ruby/config/Make.rules.Darwin
index 3386f07c09e..3386f07c09e 100644
--- a/rb/config/Make.rules.Darwin
+++ b/ruby/config/Make.rules.Darwin
diff --git a/rb/config/Make.rules.Linux b/ruby/config/Make.rules.Linux
index f8dd5ee9a6b..f8dd5ee9a6b 100644
--- a/rb/config/Make.rules.Linux
+++ b/ruby/config/Make.rules.Linux
diff --git a/rb/config/Make.rules.MINGW b/ruby/config/Make.rules.MINGW
index f8a1d8dbc94..f8a1d8dbc94 100644
--- a/rb/config/Make.rules.MINGW
+++ b/ruby/config/Make.rules.MINGW
diff --git a/rb/ruby/.depend.mak b/ruby/ruby/.depend.mak
index efb8f8b91e4..efb8f8b91e4 100644
--- a/rb/ruby/.depend.mak
+++ b/ruby/ruby/.depend.mak
diff --git a/rb/ruby/.gitignore b/ruby/ruby/.gitignore
index f37e839191a..f37e839191a 100644
--- a/rb/ruby/.gitignore
+++ b/ruby/ruby/.gitignore
diff --git a/rb/ruby/Glacier2.rb b/ruby/ruby/Glacier2.rb
index bbb55a85fdd..bbb55a85fdd 100644
--- a/rb/ruby/Glacier2.rb
+++ b/ruby/ruby/Glacier2.rb
diff --git a/rb/ruby/Ice.rb b/ruby/ruby/Ice.rb
index feff1eaa60b..feff1eaa60b 100644
--- a/rb/ruby/Ice.rb
+++ b/ruby/ruby/Ice.rb
diff --git a/rb/ruby/IceBox.rb b/ruby/ruby/IceBox.rb
index 8bed0979463..8bed0979463 100644
--- a/rb/ruby/IceBox.rb
+++ b/ruby/ruby/IceBox.rb
diff --git a/rb/ruby/IceGrid.rb b/ruby/ruby/IceGrid.rb
index 365954cbf77..365954cbf77 100644
--- a/rb/ruby/IceGrid.rb
+++ b/ruby/ruby/IceGrid.rb
diff --git a/rb/ruby/IcePatch2.rb b/ruby/ruby/IcePatch2.rb
index edbffd63133..edbffd63133 100644
--- a/rb/ruby/IcePatch2.rb
+++ b/ruby/ruby/IcePatch2.rb
diff --git a/rb/ruby/IceStorm.rb b/ruby/ruby/IceStorm.rb
index e469aaa23c8..e469aaa23c8 100644
--- a/rb/ruby/IceStorm.rb
+++ b/ruby/ruby/IceStorm.rb
diff --git a/rb/ruby/Makefile b/ruby/ruby/Makefile
index 226bb46dadf..226bb46dadf 100644
--- a/rb/ruby/Makefile
+++ b/ruby/ruby/Makefile
diff --git a/rb/src/IceRuby/.depend.mak b/ruby/src/IceRuby/.depend.mak
index 5112d16c440..5112d16c440 100644
--- a/rb/src/IceRuby/.depend.mak
+++ b/ruby/src/IceRuby/.depend.mak
diff --git a/rb/src/IceRuby/Communicator.cpp b/ruby/src/IceRuby/Communicator.cpp
index 24d9629a847..24d9629a847 100644
--- a/rb/src/IceRuby/Communicator.cpp
+++ b/ruby/src/IceRuby/Communicator.cpp
diff --git a/rb/src/IceRuby/Communicator.h b/ruby/src/IceRuby/Communicator.h
index 8cb5576cf02..8cb5576cf02 100644
--- a/rb/src/IceRuby/Communicator.h
+++ b/ruby/src/IceRuby/Communicator.h
diff --git a/rb/src/IceRuby/Config.h b/ruby/src/IceRuby/Config.h
index 82e755a4fe9..82e755a4fe9 100644
--- a/rb/src/IceRuby/Config.h
+++ b/ruby/src/IceRuby/Config.h
diff --git a/rb/src/IceRuby/Connection.cpp b/ruby/src/IceRuby/Connection.cpp
index ecc5209c0d5..ecc5209c0d5 100644
--- a/rb/src/IceRuby/Connection.cpp
+++ b/ruby/src/IceRuby/Connection.cpp
diff --git a/rb/src/IceRuby/Connection.h b/ruby/src/IceRuby/Connection.h
index ec9ef7a8649..ec9ef7a8649 100644
--- a/rb/src/IceRuby/Connection.h
+++ b/ruby/src/IceRuby/Connection.h
diff --git a/rb/src/IceRuby/Endpoint.cpp b/ruby/src/IceRuby/Endpoint.cpp
index 746f87c7ba0..746f87c7ba0 100644
--- a/rb/src/IceRuby/Endpoint.cpp
+++ b/ruby/src/IceRuby/Endpoint.cpp
diff --git a/rb/src/IceRuby/Endpoint.h b/ruby/src/IceRuby/Endpoint.h
index d316487f147..d316487f147 100644
--- a/rb/src/IceRuby/Endpoint.h
+++ b/ruby/src/IceRuby/Endpoint.h
diff --git a/rb/src/IceRuby/ImplicitContext.cpp b/ruby/src/IceRuby/ImplicitContext.cpp
index a69cbe3a373..a69cbe3a373 100644
--- a/rb/src/IceRuby/ImplicitContext.cpp
+++ b/ruby/src/IceRuby/ImplicitContext.cpp
diff --git a/rb/src/IceRuby/ImplicitContext.h b/ruby/src/IceRuby/ImplicitContext.h
index 76aa3568fb7..76aa3568fb7 100644
--- a/rb/src/IceRuby/ImplicitContext.h
+++ b/ruby/src/IceRuby/ImplicitContext.h
diff --git a/rb/src/IceRuby/Init.cpp b/ruby/src/IceRuby/Init.cpp
index 2086f163383..2086f163383 100644
--- a/rb/src/IceRuby/Init.cpp
+++ b/ruby/src/IceRuby/Init.cpp
diff --git a/rb/src/IceRuby/Logger.cpp b/ruby/src/IceRuby/Logger.cpp
index 6b70881e6e8..6b70881e6e8 100644
--- a/rb/src/IceRuby/Logger.cpp
+++ b/ruby/src/IceRuby/Logger.cpp
diff --git a/rb/src/IceRuby/Logger.h b/ruby/src/IceRuby/Logger.h
index 9234928fa9e..9234928fa9e 100644
--- a/rb/src/IceRuby/Logger.h
+++ b/ruby/src/IceRuby/Logger.h
diff --git a/rb/src/IceRuby/Makefile b/ruby/src/IceRuby/Makefile
index a75e70b58aa..a75e70b58aa 100644
--- a/rb/src/IceRuby/Makefile
+++ b/ruby/src/IceRuby/Makefile
diff --git a/rb/src/IceRuby/ObjectFactory.cpp b/ruby/src/IceRuby/ObjectFactory.cpp
index 588158a64e3..588158a64e3 100644
--- a/rb/src/IceRuby/ObjectFactory.cpp
+++ b/ruby/src/IceRuby/ObjectFactory.cpp
diff --git a/rb/src/IceRuby/ObjectFactory.h b/ruby/src/IceRuby/ObjectFactory.h
index 152f73f8425..152f73f8425 100644
--- a/rb/src/IceRuby/ObjectFactory.h
+++ b/ruby/src/IceRuby/ObjectFactory.h
diff --git a/rb/src/IceRuby/Operation.cpp b/ruby/src/IceRuby/Operation.cpp
index cbfa9581070..cbfa9581070 100644
--- a/rb/src/IceRuby/Operation.cpp
+++ b/ruby/src/IceRuby/Operation.cpp
diff --git a/rb/src/IceRuby/Operation.h b/ruby/src/IceRuby/Operation.h
index 97da32e0125..97da32e0125 100644
--- a/rb/src/IceRuby/Operation.h
+++ b/ruby/src/IceRuby/Operation.h
diff --git a/rb/src/IceRuby/Properties.cpp b/ruby/src/IceRuby/Properties.cpp
index 815a9f37a16..815a9f37a16 100644
--- a/rb/src/IceRuby/Properties.cpp
+++ b/ruby/src/IceRuby/Properties.cpp
diff --git a/rb/src/IceRuby/Properties.h b/ruby/src/IceRuby/Properties.h
index 84b51f474c2..84b51f474c2 100644
--- a/rb/src/IceRuby/Properties.h
+++ b/ruby/src/IceRuby/Properties.h
diff --git a/rb/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp
index 76d4d836285..76d4d836285 100644
--- a/rb/src/IceRuby/Proxy.cpp
+++ b/ruby/src/IceRuby/Proxy.cpp
diff --git a/rb/src/IceRuby/Proxy.h b/ruby/src/IceRuby/Proxy.h
index 843d022a160..843d022a160 100644
--- a/rb/src/IceRuby/Proxy.h
+++ b/ruby/src/IceRuby/Proxy.h
diff --git a/rb/src/IceRuby/Slice.cpp b/ruby/src/IceRuby/Slice.cpp
index 06f1d232866..06f1d232866 100644
--- a/rb/src/IceRuby/Slice.cpp
+++ b/ruby/src/IceRuby/Slice.cpp
diff --git a/rb/src/IceRuby/Slice.h b/ruby/src/IceRuby/Slice.h
index e2844922f9f..e2844922f9f 100644
--- a/rb/src/IceRuby/Slice.h
+++ b/ruby/src/IceRuby/Slice.h
diff --git a/rb/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp
index 18bf6ca517b..18bf6ca517b 100644
--- a/rb/src/IceRuby/Types.cpp
+++ b/ruby/src/IceRuby/Types.cpp
diff --git a/rb/src/IceRuby/Types.h b/ruby/src/IceRuby/Types.h
index e816d38758f..e816d38758f 100644
--- a/rb/src/IceRuby/Types.h
+++ b/ruby/src/IceRuby/Types.h
diff --git a/rb/src/IceRuby/Util.cpp b/ruby/src/IceRuby/Util.cpp
index bac8daddec1..bac8daddec1 100644
--- a/rb/src/IceRuby/Util.cpp
+++ b/ruby/src/IceRuby/Util.cpp
diff --git a/rb/src/IceRuby/Util.h b/ruby/src/IceRuby/Util.h
index d69455fcb10..d69455fcb10 100644
--- a/rb/src/IceRuby/Util.h
+++ b/ruby/src/IceRuby/Util.h
diff --git a/rb/src/Makefile b/ruby/src/Makefile
index e46841bcaaa..e46841bcaaa 100644
--- a/rb/src/Makefile
+++ b/ruby/src/Makefile
diff --git a/rb/test/Ice/acm/AllTests.rb b/ruby/test/Ice/acm/AllTests.rb
index 3e64c2c3420..3e64c2c3420 100644
--- a/rb/test/Ice/acm/AllTests.rb
+++ b/ruby/test/Ice/acm/AllTests.rb
diff --git a/rb/test/Ice/acm/Client.rb b/ruby/test/Ice/acm/Client.rb
index 2676472abe8..2676472abe8 100755
--- a/rb/test/Ice/acm/Client.rb
+++ b/ruby/test/Ice/acm/Client.rb
diff --git a/rb/test/Ice/acm/Test.ice b/ruby/test/Ice/acm/Test.ice
index b1c8b749109..b1c8b749109 100644
--- a/rb/test/Ice/acm/Test.ice
+++ b/ruby/test/Ice/acm/Test.ice
diff --git a/rb/test/Ice/acm/run.py b/ruby/test/Ice/acm/run.py
index 01b4a35a996..01b4a35a996 100755
--- a/rb/test/Ice/acm/run.py
+++ b/ruby/test/Ice/acm/run.py
diff --git a/rb/test/Ice/application/Client.rb b/ruby/test/Ice/application/Client.rb
index 59cf30b56a3..59cf30b56a3 100755
--- a/rb/test/Ice/application/Client.rb
+++ b/ruby/test/Ice/application/Client.rb
diff --git a/rb/test/Ice/binding/AllTests.rb b/ruby/test/Ice/binding/AllTests.rb
index 8b376e6ea35..8b376e6ea35 100644
--- a/rb/test/Ice/binding/AllTests.rb
+++ b/ruby/test/Ice/binding/AllTests.rb
diff --git a/rb/test/Ice/binding/Client.rb b/ruby/test/Ice/binding/Client.rb
index 8f0d1decce8..8f0d1decce8 100755
--- a/rb/test/Ice/binding/Client.rb
+++ b/ruby/test/Ice/binding/Client.rb
diff --git a/rb/test/Ice/binding/Test.ice b/ruby/test/Ice/binding/Test.ice
index bd7cbe1a971..bd7cbe1a971 100644
--- a/rb/test/Ice/binding/Test.ice
+++ b/ruby/test/Ice/binding/Test.ice
diff --git a/rb/test/Ice/binding/run.py b/ruby/test/Ice/binding/run.py
index 3489faf2571..3489faf2571 100755
--- a/rb/test/Ice/binding/run.py
+++ b/ruby/test/Ice/binding/run.py
diff --git a/rb/test/Ice/checksum/AllTests.rb b/ruby/test/Ice/checksum/AllTests.rb
index 1ee8a6ad3d9..1ee8a6ad3d9 100644
--- a/rb/test/Ice/checksum/AllTests.rb
+++ b/ruby/test/Ice/checksum/AllTests.rb
diff --git a/rb/test/Ice/checksum/CTypes.ice b/ruby/test/Ice/checksum/CTypes.ice
index 1dfc5f719d5..1dfc5f719d5 100644
--- a/rb/test/Ice/checksum/CTypes.ice
+++ b/ruby/test/Ice/checksum/CTypes.ice
diff --git a/rb/test/Ice/checksum/Client.rb b/ruby/test/Ice/checksum/Client.rb
index 79dc3fdf77a..79dc3fdf77a 100755
--- a/rb/test/Ice/checksum/Client.rb
+++ b/ruby/test/Ice/checksum/Client.rb
diff --git a/rb/test/Ice/checksum/Test.ice b/ruby/test/Ice/checksum/Test.ice
index 21639acff0f..21639acff0f 100644
--- a/rb/test/Ice/checksum/Test.ice
+++ b/ruby/test/Ice/checksum/Test.ice
diff --git a/rb/test/Ice/checksum/run.py b/ruby/test/Ice/checksum/run.py
index c53680b6c1b..c53680b6c1b 100755
--- a/rb/test/Ice/checksum/run.py
+++ b/ruby/test/Ice/checksum/run.py
diff --git a/rb/test/Ice/defaultValue/AllTests.rb b/ruby/test/Ice/defaultValue/AllTests.rb
index 59f9de1d384..59f9de1d384 100644
--- a/rb/test/Ice/defaultValue/AllTests.rb
+++ b/ruby/test/Ice/defaultValue/AllTests.rb
diff --git a/rb/test/Ice/defaultValue/Client.rb b/ruby/test/Ice/defaultValue/Client.rb
index 7d36cdd2cb5..7d36cdd2cb5 100755
--- a/rb/test/Ice/defaultValue/Client.rb
+++ b/ruby/test/Ice/defaultValue/Client.rb
diff --git a/rb/test/Ice/defaultValue/Test.ice b/ruby/test/Ice/defaultValue/Test.ice
index af768270ed7..af768270ed7 100644
--- a/rb/test/Ice/defaultValue/Test.ice
+++ b/ruby/test/Ice/defaultValue/Test.ice
diff --git a/rb/test/Ice/defaultValue/run.py b/ruby/test/Ice/defaultValue/run.py
index ed19d61bed6..ed19d61bed6 100755
--- a/rb/test/Ice/defaultValue/run.py
+++ b/ruby/test/Ice/defaultValue/run.py
diff --git a/rb/test/Ice/enums/AllTests.rb b/ruby/test/Ice/enums/AllTests.rb
index c2674d4fbed..c2674d4fbed 100644
--- a/rb/test/Ice/enums/AllTests.rb
+++ b/ruby/test/Ice/enums/AllTests.rb
diff --git a/rb/test/Ice/enums/Client.rb b/ruby/test/Ice/enums/Client.rb
index 7835cbebc13..7835cbebc13 100755
--- a/rb/test/Ice/enums/Client.rb
+++ b/ruby/test/Ice/enums/Client.rb
diff --git a/rb/test/Ice/enums/Test.ice b/ruby/test/Ice/enums/Test.ice
index 1cfe8c3eda8..1cfe8c3eda8 100644
--- a/rb/test/Ice/enums/Test.ice
+++ b/ruby/test/Ice/enums/Test.ice
diff --git a/rb/test/Ice/enums/run.py b/ruby/test/Ice/enums/run.py
index 614bfe363bf..614bfe363bf 100755
--- a/rb/test/Ice/enums/run.py
+++ b/ruby/test/Ice/enums/run.py
diff --git a/rb/test/Ice/exceptions/AllTests.rb b/ruby/test/Ice/exceptions/AllTests.rb
index b0cf5e74293..b0cf5e74293 100644
--- a/rb/test/Ice/exceptions/AllTests.rb
+++ b/ruby/test/Ice/exceptions/AllTests.rb
diff --git a/rb/test/Ice/exceptions/Client.rb b/ruby/test/Ice/exceptions/Client.rb
index 26b204ace46..26b204ace46 100755
--- a/rb/test/Ice/exceptions/Client.rb
+++ b/ruby/test/Ice/exceptions/Client.rb
diff --git a/rb/test/Ice/exceptions/Test.ice b/ruby/test/Ice/exceptions/Test.ice
index 0b04dc2bca2..0b04dc2bca2 100644
--- a/rb/test/Ice/exceptions/Test.ice
+++ b/ruby/test/Ice/exceptions/Test.ice
diff --git a/rb/test/Ice/exceptions/run.py b/ruby/test/Ice/exceptions/run.py
index 0b40bb60e8b..0b40bb60e8b 100755
--- a/rb/test/Ice/exceptions/run.py
+++ b/ruby/test/Ice/exceptions/run.py
diff --git a/rb/test/Ice/facets/AllTests.rb b/ruby/test/Ice/facets/AllTests.rb
index c022f73fd14..c022f73fd14 100644
--- a/rb/test/Ice/facets/AllTests.rb
+++ b/ruby/test/Ice/facets/AllTests.rb
diff --git a/rb/test/Ice/facets/Client.rb b/ruby/test/Ice/facets/Client.rb
index 10d9648bc53..10d9648bc53 100755
--- a/rb/test/Ice/facets/Client.rb
+++ b/ruby/test/Ice/facets/Client.rb
diff --git a/rb/test/Ice/facets/Test.ice b/ruby/test/Ice/facets/Test.ice
index d73c6594829..d73c6594829 100644
--- a/rb/test/Ice/facets/Test.ice
+++ b/ruby/test/Ice/facets/Test.ice
diff --git a/rb/test/Ice/facets/run.py b/ruby/test/Ice/facets/run.py
index 3489faf2571..3489faf2571 100755
--- a/rb/test/Ice/facets/run.py
+++ b/ruby/test/Ice/facets/run.py
diff --git a/rb/test/Ice/info/AllTests.rb b/ruby/test/Ice/info/AllTests.rb
index 394ab3a5b38..394ab3a5b38 100644
--- a/rb/test/Ice/info/AllTests.rb
+++ b/ruby/test/Ice/info/AllTests.rb
diff --git a/rb/test/Ice/info/Client.rb b/ruby/test/Ice/info/Client.rb
index b3fc620ac0e..b3fc620ac0e 100755
--- a/rb/test/Ice/info/Client.rb
+++ b/ruby/test/Ice/info/Client.rb
diff --git a/rb/test/Ice/info/Test.ice b/ruby/test/Ice/info/Test.ice
index a71990ba3db..a71990ba3db 100644
--- a/rb/test/Ice/info/Test.ice
+++ b/ruby/test/Ice/info/Test.ice
diff --git a/rb/test/Ice/info/run.py b/ruby/test/Ice/info/run.py
index 74d2e5d1724..74d2e5d1724 100755
--- a/rb/test/Ice/info/run.py
+++ b/ruby/test/Ice/info/run.py
diff --git a/rb/test/Ice/inheritance/AllTests.rb b/ruby/test/Ice/inheritance/AllTests.rb
index 509e4553d39..509e4553d39 100644
--- a/rb/test/Ice/inheritance/AllTests.rb
+++ b/ruby/test/Ice/inheritance/AllTests.rb
diff --git a/rb/test/Ice/inheritance/Client.rb b/ruby/test/Ice/inheritance/Client.rb
index 88c276f1be9..88c276f1be9 100755
--- a/rb/test/Ice/inheritance/Client.rb
+++ b/ruby/test/Ice/inheritance/Client.rb
diff --git a/rb/test/Ice/inheritance/Test.ice b/ruby/test/Ice/inheritance/Test.ice
index 7dd63ee98b6..7dd63ee98b6 100644
--- a/rb/test/Ice/inheritance/Test.ice
+++ b/ruby/test/Ice/inheritance/Test.ice
diff --git a/rb/test/Ice/inheritance/run.py b/ruby/test/Ice/inheritance/run.py
index 3489faf2571..3489faf2571 100755
--- a/rb/test/Ice/inheritance/run.py
+++ b/ruby/test/Ice/inheritance/run.py
diff --git a/rb/test/Ice/location/AllTests.rb b/ruby/test/Ice/location/AllTests.rb
index 00e6fb39d44..00e6fb39d44 100644
--- a/rb/test/Ice/location/AllTests.rb
+++ b/ruby/test/Ice/location/AllTests.rb
diff --git a/rb/test/Ice/location/Client.rb b/ruby/test/Ice/location/Client.rb
index 3bd8d18371d..3bd8d18371d 100755
--- a/rb/test/Ice/location/Client.rb
+++ b/ruby/test/Ice/location/Client.rb
diff --git a/rb/test/Ice/location/Test.ice b/ruby/test/Ice/location/Test.ice
index 64fa6bdeb4f..64fa6bdeb4f 100644
--- a/rb/test/Ice/location/Test.ice
+++ b/ruby/test/Ice/location/Test.ice
diff --git a/rb/test/Ice/location/run.py b/ruby/test/Ice/location/run.py
index 3489faf2571..3489faf2571 100755
--- a/rb/test/Ice/location/run.py
+++ b/ruby/test/Ice/location/run.py
diff --git a/rb/test/Ice/objects/AllTests.rb b/ruby/test/Ice/objects/AllTests.rb
index cb009438b80..cb009438b80 100644
--- a/rb/test/Ice/objects/AllTests.rb
+++ b/ruby/test/Ice/objects/AllTests.rb
diff --git a/rb/test/Ice/objects/Client.rb b/ruby/test/Ice/objects/Client.rb
index e1c2e36f942..e1c2e36f942 100755
--- a/rb/test/Ice/objects/Client.rb
+++ b/ruby/test/Ice/objects/Client.rb
diff --git a/rb/test/Ice/objects/ClientPrivate.ice b/ruby/test/Ice/objects/ClientPrivate.ice
index 31d2e12d833..31d2e12d833 100644
--- a/rb/test/Ice/objects/ClientPrivate.ice
+++ b/ruby/test/Ice/objects/ClientPrivate.ice
diff --git a/rb/test/Ice/objects/Test.ice b/ruby/test/Ice/objects/Test.ice
index 42852d1f75c..42852d1f75c 100644
--- a/rb/test/Ice/objects/Test.ice
+++ b/ruby/test/Ice/objects/Test.ice
diff --git a/rb/test/Ice/objects/TestI.rb b/ruby/test/Ice/objects/TestI.rb
index 1f1f7f5e7aa..1f1f7f5e7aa 100644
--- a/rb/test/Ice/objects/TestI.rb
+++ b/ruby/test/Ice/objects/TestI.rb
diff --git a/rb/test/Ice/objects/run.py b/ruby/test/Ice/objects/run.py
index 19ac6f8a88c..19ac6f8a88c 100755
--- a/rb/test/Ice/objects/run.py
+++ b/ruby/test/Ice/objects/run.py
diff --git a/rb/test/Ice/operations/AllTests.rb b/ruby/test/Ice/operations/AllTests.rb
index c1cb4318897..c1cb4318897 100644
--- a/rb/test/Ice/operations/AllTests.rb
+++ b/ruby/test/Ice/operations/AllTests.rb
diff --git a/rb/test/Ice/operations/BatchOneways.rb b/ruby/test/Ice/operations/BatchOneways.rb
index dc2ec7add80..dc2ec7add80 100644
--- a/rb/test/Ice/operations/BatchOneways.rb
+++ b/ruby/test/Ice/operations/BatchOneways.rb
diff --git a/rb/test/Ice/operations/Client.rb b/ruby/test/Ice/operations/Client.rb
index 208d2e76b0e..208d2e76b0e 100755
--- a/rb/test/Ice/operations/Client.rb
+++ b/ruby/test/Ice/operations/Client.rb
diff --git a/rb/test/Ice/operations/Test.ice b/ruby/test/Ice/operations/Test.ice
index ae711d266a2..ae711d266a2 100644
--- a/rb/test/Ice/operations/Test.ice
+++ b/ruby/test/Ice/operations/Test.ice
diff --git a/rb/test/Ice/operations/Twoways.rb b/ruby/test/Ice/operations/Twoways.rb
index c11a4955fd5..c11a4955fd5 100644
--- a/rb/test/Ice/operations/Twoways.rb
+++ b/ruby/test/Ice/operations/Twoways.rb
diff --git a/rb/test/Ice/operations/run.py b/ruby/test/Ice/operations/run.py
index 541377d6ca6..541377d6ca6 100755
--- a/rb/test/Ice/operations/run.py
+++ b/ruby/test/Ice/operations/run.py
diff --git a/rb/test/Ice/optional/AllTests.rb b/ruby/test/Ice/optional/AllTests.rb
index 1a4990314b2..1a4990314b2 100644
--- a/rb/test/Ice/optional/AllTests.rb
+++ b/ruby/test/Ice/optional/AllTests.rb
diff --git a/rb/test/Ice/optional/Client.rb b/ruby/test/Ice/optional/Client.rb
index bb4043d7908..bb4043d7908 100755
--- a/rb/test/Ice/optional/Client.rb
+++ b/ruby/test/Ice/optional/Client.rb
diff --git a/rb/test/Ice/optional/ClientPrivate.ice b/ruby/test/Ice/optional/ClientPrivate.ice
index c7211442401..c7211442401 100644
--- a/rb/test/Ice/optional/ClientPrivate.ice
+++ b/ruby/test/Ice/optional/ClientPrivate.ice
diff --git a/rb/test/Ice/optional/Test.ice b/ruby/test/Ice/optional/Test.ice
index 65bbbaa18e9..65bbbaa18e9 100644
--- a/rb/test/Ice/optional/Test.ice
+++ b/ruby/test/Ice/optional/Test.ice
diff --git a/rb/test/Ice/optional/run.py b/ruby/test/Ice/optional/run.py
index d76138b1e22..d76138b1e22 100755
--- a/rb/test/Ice/optional/run.py
+++ b/ruby/test/Ice/optional/run.py
diff --git a/rb/test/Ice/properties/Client.rb b/ruby/test/Ice/properties/Client.rb
index c4d905c3723..c4d905c3723 100644
--- a/rb/test/Ice/properties/Client.rb
+++ b/ruby/test/Ice/properties/Client.rb
diff --git a/rb/test/Ice/properties/config/.gitignore b/ruby/test/Ice/properties/config/.gitignore
index 143c64680f3..143c64680f3 100644
--- a/rb/test/Ice/properties/config/.gitignore
+++ b/ruby/test/Ice/properties/config/.gitignore
diff --git a/rb/test/Ice/properties/config/config.1 b/ruby/test/Ice/properties/config/config.1
index 2a20653e4c5..2a20653e4c5 100644
--- a/rb/test/Ice/properties/config/config.1
+++ b/ruby/test/Ice/properties/config/config.1
diff --git a/rb/test/Ice/properties/config/config.2 b/ruby/test/Ice/properties/config/config.2
index be276df6602..be276df6602 100644
--- a/rb/test/Ice/properties/config/config.2
+++ b/ruby/test/Ice/properties/config/config.2
diff --git a/rb/test/Ice/properties/config/config.3 b/ruby/test/Ice/properties/config/config.3
index 55c1e1123f6..55c1e1123f6 100644
--- a/rb/test/Ice/properties/config/config.3
+++ b/ruby/test/Ice/properties/config/config.3
diff --git a/rb/test/Ice/properties/config/escapes.cfg b/ruby/test/Ice/properties/config/escapes.cfg
index f438d2b59c8..f438d2b59c8 100644
--- a/rb/test/Ice/properties/config/escapes.cfg
+++ b/ruby/test/Ice/properties/config/escapes.cfg
diff --git a/rb/test/Ice/properties/run.py b/ruby/test/Ice/properties/run.py
index c6ce2b8cfad..c6ce2b8cfad 100755
--- a/rb/test/Ice/properties/run.py
+++ b/ruby/test/Ice/properties/run.py
diff --git a/rb/test/Ice/proxy/AllTests.rb b/ruby/test/Ice/proxy/AllTests.rb
index 35131cda679..35131cda679 100644
--- a/rb/test/Ice/proxy/AllTests.rb
+++ b/ruby/test/Ice/proxy/AllTests.rb
diff --git a/rb/test/Ice/proxy/Client.rb b/ruby/test/Ice/proxy/Client.rb
index 47b08bc1a4f..47b08bc1a4f 100755
--- a/rb/test/Ice/proxy/Client.rb
+++ b/ruby/test/Ice/proxy/Client.rb
diff --git a/rb/test/Ice/proxy/Test.ice b/ruby/test/Ice/proxy/Test.ice
index 7f3701e81e2..7f3701e81e2 100644
--- a/rb/test/Ice/proxy/Test.ice
+++ b/ruby/test/Ice/proxy/Test.ice
diff --git a/rb/test/Ice/proxy/run.py b/ruby/test/Ice/proxy/run.py
index df1cbbd06d0..df1cbbd06d0 100755
--- a/rb/test/Ice/proxy/run.py
+++ b/ruby/test/Ice/proxy/run.py
diff --git a/rb/test/Ice/slicing/exceptions/AllTests.rb b/ruby/test/Ice/slicing/exceptions/AllTests.rb
index c7ca6efd6ee..c7ca6efd6ee 100644
--- a/rb/test/Ice/slicing/exceptions/AllTests.rb
+++ b/ruby/test/Ice/slicing/exceptions/AllTests.rb
diff --git a/rb/test/Ice/slicing/exceptions/Client.rb b/ruby/test/Ice/slicing/exceptions/Client.rb
index a1ab21c7411..a1ab21c7411 100755
--- a/rb/test/Ice/slicing/exceptions/Client.rb
+++ b/ruby/test/Ice/slicing/exceptions/Client.rb
diff --git a/rb/test/Ice/slicing/exceptions/Test.ice b/ruby/test/Ice/slicing/exceptions/Test.ice
index e81c34580f6..e81c34580f6 100644
--- a/rb/test/Ice/slicing/exceptions/Test.ice
+++ b/ruby/test/Ice/slicing/exceptions/Test.ice
diff --git a/rb/test/Ice/slicing/exceptions/run.py b/ruby/test/Ice/slicing/exceptions/run.py
index c40f6f06f3e..c40f6f06f3e 100755
--- a/rb/test/Ice/slicing/exceptions/run.py
+++ b/ruby/test/Ice/slicing/exceptions/run.py
diff --git a/rb/test/Ice/slicing/objects/AllTests.rb b/ruby/test/Ice/slicing/objects/AllTests.rb
index e43f52aef98..e43f52aef98 100644
--- a/rb/test/Ice/slicing/objects/AllTests.rb
+++ b/ruby/test/Ice/slicing/objects/AllTests.rb
diff --git a/rb/test/Ice/slicing/objects/Client.rb b/ruby/test/Ice/slicing/objects/Client.rb
index 015fc7aa591..015fc7aa591 100755
--- a/rb/test/Ice/slicing/objects/Client.rb
+++ b/ruby/test/Ice/slicing/objects/Client.rb
diff --git a/rb/test/Ice/slicing/objects/ClientPrivate.ice b/ruby/test/Ice/slicing/objects/ClientPrivate.ice
index 3880bd583ab..3880bd583ab 100644
--- a/rb/test/Ice/slicing/objects/ClientPrivate.ice
+++ b/ruby/test/Ice/slicing/objects/ClientPrivate.ice
diff --git a/rb/test/Ice/slicing/objects/Forward.ice b/ruby/test/Ice/slicing/objects/Forward.ice
index 89486e226cc..89486e226cc 100644
--- a/rb/test/Ice/slicing/objects/Forward.ice
+++ b/ruby/test/Ice/slicing/objects/Forward.ice
diff --git a/rb/test/Ice/slicing/objects/Test.ice b/ruby/test/Ice/slicing/objects/Test.ice
index 3b1d13db6bd..3b1d13db6bd 100644
--- a/rb/test/Ice/slicing/objects/Test.ice
+++ b/ruby/test/Ice/slicing/objects/Test.ice
diff --git a/rb/test/Ice/slicing/objects/run.py b/ruby/test/Ice/slicing/objects/run.py
index c40f6f06f3e..c40f6f06f3e 100755
--- a/rb/test/Ice/slicing/objects/run.py
+++ b/ruby/test/Ice/slicing/objects/run.py
diff --git a/rb/test/Ice/timeout/AllTests.rb b/ruby/test/Ice/timeout/AllTests.rb
index 95f8b18506d..95f8b18506d 100644
--- a/rb/test/Ice/timeout/AllTests.rb
+++ b/ruby/test/Ice/timeout/AllTests.rb
diff --git a/rb/test/Ice/timeout/Client.rb b/ruby/test/Ice/timeout/Client.rb
index 9d97518c724..9d97518c724 100755
--- a/rb/test/Ice/timeout/Client.rb
+++ b/ruby/test/Ice/timeout/Client.rb
diff --git a/rb/test/Ice/timeout/Test.ice b/ruby/test/Ice/timeout/Test.ice
index dc54d71c16c..dc54d71c16c 100644
--- a/rb/test/Ice/timeout/Test.ice
+++ b/ruby/test/Ice/timeout/Test.ice
diff --git a/rb/test/Ice/timeout/run.py b/ruby/test/Ice/timeout/run.py
index ca437762ed3..ca437762ed3 100755
--- a/rb/test/Ice/timeout/run.py
+++ b/ruby/test/Ice/timeout/run.py
diff --git a/rb/test/Slice/keyword/Client.rb b/ruby/test/Slice/keyword/Client.rb
index eee28bb0a4c..eee28bb0a4c 100755
--- a/rb/test/Slice/keyword/Client.rb
+++ b/ruby/test/Slice/keyword/Client.rb
diff --git a/rb/test/Slice/keyword/Key.ice b/ruby/test/Slice/keyword/Key.ice
index 4ae5ddc9c15..4ae5ddc9c15 100644
--- a/rb/test/Slice/keyword/Key.ice
+++ b/ruby/test/Slice/keyword/Key.ice
diff --git a/rb/test/Slice/keyword/run.py b/ruby/test/Slice/keyword/run.py
index 2d07bcb513c..2d07bcb513c 100755
--- a/rb/test/Slice/keyword/run.py
+++ b/ruby/test/Slice/keyword/run.py
diff --git a/rb/test/Slice/macros/Client.rb b/ruby/test/Slice/macros/Client.rb
index 3dc25dcf49f..3dc25dcf49f 100755
--- a/rb/test/Slice/macros/Client.rb
+++ b/ruby/test/Slice/macros/Client.rb
diff --git a/rb/test/Slice/macros/Test.ice b/ruby/test/Slice/macros/Test.ice
index 932414274f8..932414274f8 100644
--- a/rb/test/Slice/macros/Test.ice
+++ b/ruby/test/Slice/macros/Test.ice
diff --git a/rb/test/Slice/macros/run.py b/ruby/test/Slice/macros/run.py
index b426a2dd72c..b426a2dd72c 100755
--- a/rb/test/Slice/macros/run.py
+++ b/ruby/test/Slice/macros/run.py
diff --git a/rb/test/Slice/structure/Client.rb b/ruby/test/Slice/structure/Client.rb
index 9ae0482431c..9ae0482431c 100755
--- a/rb/test/Slice/structure/Client.rb
+++ b/ruby/test/Slice/structure/Client.rb
diff --git a/rb/test/Slice/structure/Test.ice b/ruby/test/Slice/structure/Test.ice
index d1be5ddc435..d1be5ddc435 100644
--- a/rb/test/Slice/structure/Test.ice
+++ b/ruby/test/Slice/structure/Test.ice
diff --git a/rb/test/Slice/structure/run.py b/ruby/test/Slice/structure/run.py
index b426a2dd72c..b426a2dd72c 100755
--- a/rb/test/Slice/structure/run.py
+++ b/ruby/test/Slice/structure/run.py
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 8932d64ed63..531942c49a4 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -234,11 +234,11 @@ def dumpenv(env, lang):
         pass
     elif lang == "java":
         vars.append("CLASSPATH")
-    elif lang == "cs":
+    elif lang == "csharp":
         vars.extend(["MONO_PATH", "DEVPATH"])
-    elif lang == "py":
+    elif lang == "python":
         vars.append("PYTHONPATH")
-    elif lang == "rb":
+    elif lang == "ruby":
         vars.append("RUBYLIB")
     elif lang == "js":
         vars.append("NODE_PATH")
@@ -488,8 +488,8 @@ def run(tests, root = False):
                 filters.append((testFilter, False))
         elif o == "--cross":
             global cross
-            if a not in ["cpp", "cs", "java", "js", "py", "rb", "objc" ]:
-                print("cross must be one of cpp, cs, java, js, py, rb or objc")
+            if a not in ["cpp", "csharp", "java", "js", "python", "ruby", "objective-c" ]:
+                print("cross must be one of cpp, csharp, java, js, python, ruby or objective-c")
                 sys.exit(1)
             cross.append(a)
         elif o == "--all" :
@@ -510,7 +510,7 @@ def run(tests, root = False):
         elif o == "--protocol":
             if a not in ( "ws", "wss", "ssl", "tcp"):
                 usage()
-            if not root and getDefaultMapping() == "cs" and (a == "ssl" or a == "wss"):
+            if not root and getDefaultMapping() == "csharp" and (a == "ssl" or a == "wss"):
                 if mono:
                     print("SSL is not supported with mono")
                     sys.exit(1)
@@ -588,9 +588,9 @@ def run(tests, root = False):
 
     if allCross:
         if len(cross) == 0:
-            cross = ["cpp", "java", "js", "cs" ]
+            cross = ["cpp", "java", "js", "csharp" ]
         if root:
-            allLang = ["cpp", "java", "js", "cs" ]
+            allLang = ["cpp", "java", "js", "csharp" ]
         else:
             allLang = [ getDefaultMapping() ]
         for lang in allLang:
@@ -608,7 +608,7 @@ def run(tests, root = False):
                     expanded.append([(name, a, testConfig(name, tests))])
 
                 # Add ssl & compress for the operations test.
-                if ((compact or mono or silverlight) and c == "cs") or (c == "js"): # Don't add the ssl tests.
+                if ((compact or mono or silverlight) and c == "csharp") or (c == "js"): # Don't add the ssl tests.
                     continue
                 a = "--cross=%s --protocol=ssl --compress %s" % (c, arg)
                 expanded.append([("%s/test/Ice/operations" % lang, a, [])])
@@ -784,11 +784,11 @@ def getIceBox():
         iceBox = os.path.join(getCppBinDir(lang), iceBox)
     elif lang == "java":
         iceBox = "IceBox.Server"
-    elif lang == "cs":
+    elif lang == "csharp":
         if compact:
-            iceBox = os.path.join(getIceDir("cs"), "bin", "cf", "iceboxnet")
+            iceBox = os.path.join(getIceDir("csharp"), "bin", "cf", "iceboxnet")
         else:
-            iceBox = os.path.join(getIceDir("cs"), "bin", "iceboxnet")
+            iceBox = os.path.join(getIceDir("csharp"), "bin", "iceboxnet")
 
     return iceBox
 
@@ -846,7 +846,7 @@ sslConfigTree = {
             "server" : " --IceSSL.Keystore=server.jks",
             "colloc" : " --IceSSL.Keystore=client.jks"
             },
-        "cs" : {
+        "csharp" : {
             "plugin" : " --Ice.Plugin.IceSSL=%(icesslcs)s:IceSSL.PluginFactory --IceSSL.CertAuthFile=cacert.pem " +
             "--IceSSL.Password=password --IceSSL.DefaultDir=%(certsdir)s --IceSSL.VerifyPeer=%(verifyPeer)s",
             "client" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.CheckCertName=0",
@@ -867,17 +867,17 @@ if isDarwin():
     sslConfigTree["cpp"]["colloc"] += " --IceSSL.Keychain=colloc.keychain --IceSSL.KeychainPassword=password"
 
 
-sslConfigTree["py"] = sslConfigTree["cpp"]
-sslConfigTree["rb"] = sslConfigTree["cpp"]
+sslConfigTree["python"] = sslConfigTree["cpp"]
+sslConfigTree["ruby"] = sslConfigTree["cpp"]
 sslConfigTree["php"] = sslConfigTree["cpp"]
-sslConfigTree["objc"] = sslConfigTree["cpp"]
+sslConfigTree["objective-c"] = sslConfigTree["cpp"]
 
 def getDefaultMapping():
     """Try and guess the language mapping out of the current path"""
     here = os.getcwd().split(os.sep)
     here.reverse()
     for i in range(0, len(here)):
-        if here[i] in ["cpp", "cs", "java", "js", "php", "py", "rb", "objc", "cppe", "javae", "icetouch", "tmp"]:
+        if here[i] in ["cpp", "csharp", "java", "js", "php", "python", "ruby", "objective-c", "icetouch", "tmp"]:
             return here[i]
     raise RuntimeError("cannot determine mapping")
 
@@ -988,7 +988,7 @@ def getCommandLineProperties(exe, config):
     #
     if config.protocol == "ssl" or config.protocol == "wss":
         sslenv = {}
-        sslenv["icesslcs"] = quoteArgument("\\\"" + os.path.join(getIceDir("cs"), "Assemblies", "IceSSL.dll") + "\\\"")
+        sslenv["icesslcs"] = quoteArgument("\\\"" + os.path.join(getIceDir("csharp"), "Assemblies", "IceSSL.dll") + "\\\"")
         sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs")))
         if winrt or config.protocol == "wss":
             sslenv["verifyPeer"] = "0"
@@ -1005,7 +1005,7 @@ def getCommandLineProperties(exe, config):
     if config.serialize:
         components.append("--Ice.ThreadPool.Server.Serialize=1")
 
-    if config.type == "server" or config.type == "colloc" and config.lang == "py":
+    if config.type == "server" or config.type == "colloc" and config.lang == "python":
         components.append("--Ice.ThreadPool.Server.Size=1")
         components.append("--Ice.ThreadPool.Server.SizeMax=3")
         components.append("--Ice.ThreadPool.Server.SizeWarn=0")
@@ -1070,14 +1070,14 @@ def getCommandLineProperties(exe, config):
 def getCommandLine(exe, config, options = "", interpreterOptions = ""):
     output = getStringIO()
 
-    if config.mono and config.lang == "cs":
+    if config.mono and config.lang == "csharp":
         output.write("mono --debug '%s.exe' " % exe)
-    elif config.lang == "rb" and config.type == "client":
+    elif config.lang == "ruby" and config.type == "client":
         output.write("ruby")
         if interpreterOptions:
             output.write(" " + interpreterOptions)
         output.write(' "%s" ' % exe)
-    elif config.silverlight and config.lang == "cs" and config.type == "client":
+    elif config.silverlight and config.lang == "csharp" and config.type == "client":
         xap = "obj/sl/%s.xap" % os.path.basename(os.getcwd())
         if os.environ.get("PROCESSOR_ARCHITECTURE") == "AMD64" or os.environ.get("PROCESSOR_ARCHITEW6432") == "":
             output.write('"%s (x86)\Microsoft Silverlight\sllauncher.exe" /emulate:%s ' % ( os.environ["PROGRAMFILES"], xap))
@@ -1093,7 +1093,7 @@ def getCommandLine(exe, config, options = "", interpreterOptions = ""):
         if interpreterOptions:
             output.write(" " + interpreterOptions)
         output.write(" " + exe + " ")
-    elif config.lang == "py":
+    elif config.lang == "python":
         output.write(sys.executable)
         if interpreterOptions:
             output.write(" " + interpreterOptions)
@@ -1156,9 +1156,9 @@ def directoryToPackage():
 
 def getDefaultServerFile():
     lang = getDefaultMapping()
-    if lang in ["js", "rb", "php", "cpp", "cs", "objc", "cppe"]:
+    if lang in ["js", "ruby", "php", "cpp", "csharp", "objective-c"]:
         return "server"
-    if lang == "py":
+    if lang == "python":
         return "Server.py"
     if lang in ["java", "javae"]:
         pkg = directoryToPackage()
@@ -1170,13 +1170,13 @@ def getDefaultServerFile():
 def getDefaultClientFile(lang = None):
     if lang is None:
         lang = getDefaultMapping()
-    if lang == "rb":
+    if lang == "ruby":
         return "Client.rb"
     if lang == "php":
         return "Client.php"
-    if lang in ["cpp", "cs", "objc", "cppe"]:
+    if lang in ["cpp", "csharp", "objective-c"]:
         return "client"
-    if lang == "py":
+    if lang == "python":
         return "Client.py"
     if lang in ["java", "javae"]:
         pkg = directoryToPackage()
@@ -1189,13 +1189,13 @@ def getDefaultClientFile(lang = None):
 
 def getDefaultCollocatedFile():
     lang = getDefaultMapping()
-    if lang == "rb":
+    if lang == "ruby":
         return "Collocated.rb"
     if lang == "php":
         return "Collocated.php"
-    if lang in ["cpp", "cs", "cppe", "objc"]:
+    if lang in ["cpp", "csharp", "objective-c"]:
         return "collocated"
-    if lang == "py":
+    if lang == "python":
         return "Collocated.py"
     if lang in ["java", "javae"]:
         return directoryToPackage() + ".Collocated"
@@ -1407,7 +1407,7 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
     testdir = os.getcwd()
 
     # Setup the server.
-    if lang in ["rb", "php", "js"]:
+    if lang in ["ruby", "php", "js"]:
         serverdir = getMirrorDir(testdir, "cpp")
     else:
         serverdir = testdir
@@ -1415,7 +1415,7 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
         server = os.path.join(serverdir, server)
 
     if serverenv is None:
-        if lang in ["rb", "php", "js"]:
+        if lang in ["ruby", "php", "js"]:
             serverenv = getTestEnv("cpp", serverdir)
         else:
             serverenv = getTestEnv(lang, serverdir)
@@ -1472,7 +1472,7 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
         sys.stdout.write("starting " + serverDesc + "... ")
         sys.stdout.flush()
         serverCfg = DriverConfig("server")
-        if lang in ["rb", "php", "js"]:
+        if lang in ["ruby", "php", "js"]:
             serverCfg.lang = "cpp"
         server = getCommandLine(server, serverCfg, additionalServerOptions, interpreterOptions)
         serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx)
@@ -1546,7 +1546,7 @@ def clientEchoTest(additionalServerOptions = "", additionalClientOptions = "",
     testdir = os.getcwd()
 
     # Setup the server.
-    if lang in ["rb", "php", "js"]:
+    if lang in ["ruby", "php", "js"]:
         serverdir = getMappingDir(testdir, "cpp", ["test", "Ice", "echo"])
     else:
         serverdir = testdir
@@ -1554,7 +1554,7 @@ def clientEchoTest(additionalServerOptions = "", additionalClientOptions = "",
         server = os.path.join(serverdir, server)
 
     if serverenv is None:
-        if lang in ["rb", "php", "js"]:
+        if lang in ["ruby", "php", "js"]:
             serverenv = getTestEnv("cpp", serverdir)
         else:
             serverenv = getTestEnv(lang, serverdir)
@@ -1607,7 +1607,7 @@ def clientEchoTest(additionalServerOptions = "", additionalClientOptions = "",
         sys.stdout.write("starting " + serverDesc + "... ")
         sys.stdout.flush()
         serverCfg = DriverConfig("server")
-        if lang in ["rb", "php", "js"]:
+        if lang in ["ruby", "php", "js"]:
             serverCfg.lang = "cpp"
         server = getCommandLine(server, serverCfg, additionalServerOptions)
         serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx)
@@ -1709,7 +1709,7 @@ def getCppBinDir(lang = None):
     if iceHome:
         if lang == None:
             lang = getDefaultMapping()
-        if isVC110() and lang != "py":
+        if isVC110() and lang != "python":
             binDir = os.path.join(binDir, "vc110")
         if x64:
             if isSolaris():
@@ -1793,8 +1793,8 @@ def getTestEnv(lang, testdir):
     env["CLASSPATH"] = sanitize(os.getenv("CLASSPATH", ""))
 
     # Make sure bzip2 can be found by x86 C# builds on x64 platforms
-    if lang == "cs" and not x64:
-        addPathToEnv("PATH", os.path.join(getCppBinDir("cs"), "x64"), env)
+    if lang == "csharp" and not x64:
+        addPathToEnv("PATH", os.path.join(getCppBinDir("csharp"), "x64"), env)
 
     # Add test directory to env
     if lang == "cpp":
@@ -1844,7 +1844,7 @@ def getTestEnv(lang, testdir):
     #
     if isWin32():
         addLdPath(getCppLibDir(lang), env)
-    elif lang in ["py", "rb", "php", "js", "objc"]:
+    elif lang in ["python", "ruby", "php", "js", "objective-c"]:
         addLdPath(getCppLibDir(lang), env)
 
     if lang == "javae":
@@ -1861,19 +1861,19 @@ def getTestEnv(lang, testdir):
     #
     # On Windows, C# assemblies are found thanks to the .exe.config files.
     #
-    if lang == "cs":
+    if lang == "csharp":
         if compact:
-            addPathToEnv("DEVPATH", os.path.join(getIceDir("cs", testdir), "Assemblies", "cf"), env)
+            addPathToEnv("DEVPATH", os.path.join(getIceDir("csharp", testdir), "Assemblies", "cf"), env)
         elif isWin32():
-            addPathToEnv("DEVPATH", os.path.join(getIceDir("cs", testdir), "Assemblies"), env)
+            addPathToEnv("DEVPATH", os.path.join(getIceDir("csharp", testdir), "Assemblies"), env)
         else:
-            addPathToEnv("MONO_PATH", os.path.join(getIceDir("cs", testdir), "Assemblies"), env)
+            addPathToEnv("MONO_PATH", os.path.join(getIceDir("csharp", testdir), "Assemblies"), env)
 
     #
     # On Windows x64, set PYTHONPATH to python/x64.
     #
-    if lang == "py":
-        pythonDir = os.path.join(getIceDir("py", testdir), "python")
+    if lang == "python":
+        pythonDir = os.path.join(getIceDir("python", testdir), "python")
         if isWin32() and x64:
             addPathToEnv("PYTHONPATH", os.path.join(pythonDir, "x64"), env)
         else:
@@ -1882,8 +1882,8 @@ def getTestEnv(lang, testdir):
     #
     # If testing with source dist we need to set RUBYLIB
     #
-    if lang == "rb" and not iceHome:
-        addPathToEnv("RUBYLIB", os.path.join(getIceDir("rb", testdir), "ruby"), env)
+    if lang == "ruby" and not iceHome:
+        addPathToEnv("RUBYLIB", os.path.join(getIceDir("ruby", testdir), "ruby"), env)
 
     if lang == "js":
         if os.environ.get("USE_BIN_DIST", "no") != "yes":
@@ -2014,8 +2014,8 @@ def processCmdLine():
         elif o == "--cross":
             global cross
             cross.append(a)
-            if not a in ["cpp", "cs", "java", "js", "py", "rb", "objc" ]:
-                print("cross must be one of cpp, cs, java, js, py, rb or objc")
+            if not a in ["cpp", "csharp", "java", "js", "python", "ruby", "objective-c" ]:
+                print("cross must be one of cpp, csharp, java, js, python, ruby or objective-c")
                 sys.exit(1)
             if getTestName() not in crossTests:
                 print("*** This test does not support cross language testing")
@@ -2073,7 +2073,7 @@ def processCmdLine():
             if a not in ( "ws", "wss", "ssl", "tcp"):
                 usage()
             # ssl protocol isn't directly supported with mono.
-            if mono and getDefaultMapping() == "cs" and (a == "ssl" or a == "wss"):
+            if mono and getDefaultMapping() == "csharp" and (a == "ssl" or a == "wss"):
                 print("SSL is not supported with mono")
                 sys.exit(1)
             global protocol
@@ -2240,7 +2240,7 @@ def runTests(start, expanded, num = 0, script = False):
 
             # If this is mono and we're running ssl protocol tests
             # then skip. This occurs when using --all.
-            if mono and ("nomono" in config or (i.find(os.path.join("cs","test")) != -1 and
+            if mono and ("nomono" in config or (i.find(os.path.join("csharp", "test")) != -1 and
                                                 (args.find("ssl") != -1 or args.find("wss") != -1))):
                 print("%s*** test not supported with mono%s" % (prefix, suffix))
                 continue
diff --git a/scripts/fixVersion.py b/scripts/fixVersion.py
index e71b4c4323a..0208c589a69 100755
--- a/scripts/fixVersion.py
+++ b/scripts/fixVersion.py
@@ -320,7 +320,7 @@ FixUtil.fileMatchAndReplace(os.path.join(icejs_home, "bower.json"),
 #
 # C# specific files
 #
-icecs_home = os.path.join(ice_dir, "cs")
+icecs_home = os.path.join(ice_dir, "csharp")
 
 FixUtil.fileMatchAndReplace(os.path.join(icecs_home, "src", "IceBox", "Makefile.mak"),
                       [("codeBase version=\"" + FixUtil.vpatMatch + "\.0\"", newVersion)])