CSharp mapping cleanup

 - Remove code support for old ussuported frameworks (SILVERLIGHT, COMPACT, MONO)
 - Remove code support for deprecated collection mappings clr:collection

6 files changed, 13 insertions, 34 deletions

diff --git a/csharp/test/Ice/proxy/AllTests.cs b/csharp/test/Ice/proxy/AllTests.cs
index 5179773cb04..0c4764650bd 100644
--- a/csharp/test/Ice/proxy/AllTests.cs
+++ b/csharp/test/Ice/proxy/AllTests.cs
@@ -9,20 +9,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-
-#if SILVERLIGHT
-using System.Windows.Controls;
-#endif
 
 public class AllTests : TestCommon.TestApp
 {
-#if SILVERLIGHT
-    override
-    public void run(Ice.Communicator communicator)
-#else
     public static Test.MyClassPrx allTests(Ice.Communicator communicator)
-#endif
     {
         Write("testing stringToProxy... ");
         Flush();
@@ -295,7 +285,7 @@ public class AllTests : TestCommon.TestApp
         }
         catch(Exception ex)
         {
-                System.Console.WriteLine(ex.ToString());
+                Console.WriteLine(ex.ToString());
         }
         property = propertyPrefix + ".LocatorCacheTimeout";
         test(b1.ice_getLocatorCacheTimeout() == -1);
@@ -481,7 +471,7 @@ public class AllTests : TestCommon.TestApp
             baseProxy.ice_timeout(0);
             test(false);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
         }
 
@@ -489,7 +479,7 @@ public class AllTests : TestCommon.TestApp
         {
             baseProxy.ice_timeout(-1);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
             test(false);
         }
@@ -499,7 +489,7 @@ public class AllTests : TestCommon.TestApp
             baseProxy.ice_timeout(-2);
             test(false);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
         }
 
@@ -508,7 +498,7 @@ public class AllTests : TestCommon.TestApp
             baseProxy.ice_invocationTimeout(0);
             test(false);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
         }
 
@@ -517,7 +507,7 @@ public class AllTests : TestCommon.TestApp
             baseProxy.ice_invocationTimeout(-1);
             baseProxy.ice_invocationTimeout(-2);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
             test(false);
         }
@@ -527,7 +517,7 @@ public class AllTests : TestCommon.TestApp
             baseProxy.ice_invocationTimeout(-3);
             test(false);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
         }
 
@@ -535,7 +525,7 @@ public class AllTests : TestCommon.TestApp
         {
             baseProxy.ice_locatorCacheTimeout(0);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
             test(false);
         }
@@ -544,7 +534,7 @@ public class AllTests : TestCommon.TestApp
         {
             baseProxy.ice_locatorCacheTimeout(-1);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
             test(false);
         }
@@ -554,7 +544,7 @@ public class AllTests : TestCommon.TestApp
             baseProxy.ice_locatorCacheTimeout(-2);
             test(false);
         }
-        catch(System.ArgumentException)
+        catch(ArgumentException)
         {
         }
 
@@ -931,10 +921,6 @@ public class AllTests : TestCommon.TestApp
         }
 
         WriteLine("ok");
-#if SILVERLIGHT
-        cl.shutdown();
-#else
         return cl;
-#endif
     }
 }
diff --git a/csharp/test/Ice/proxy/Client.cs b/csharp/test/Ice/proxy/Client.cs
index 185315c1b5a..187f95e9c4f 100644
--- a/csharp/test/Ice/proxy/Client.cs
+++ b/csharp/test/Ice/proxy/Client.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -22,9 +21,7 @@ public class Client
     private static int run(String[] args, Ice.Communicator communicator)
     {
         Test.MyClassPrx myClass = AllTests.allTests(communicator);
-
         myClass.shutdown();
-
         return 0;
     }
 
@@ -41,7 +38,7 @@ public class Client
             communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
-        catch(System.Exception ex)
+        catch(Exception ex)
         {
             Console.Error.WriteLine(ex);
             status = 1;
diff --git a/csharp/test/Ice/proxy/Collocated.cs b/csharp/test/Ice/proxy/Collocated.cs
index 4903db6532d..c161aa41a24 100644
--- a/csharp/test/Ice/proxy/Collocated.cs
+++ b/csharp/test/Ice/proxy/Collocated.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -47,7 +46,7 @@ public class Collocated
             communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
-        catch(System.Exception ex)
+        catch(Exception ex)
         {
             Console.Error.WriteLine(ex);
             status = 1;
diff --git a/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs b/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs
index c9c76203089..db1eece2fd0 100644
--- a/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs
+++ b/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs
@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-using System;
 using System.Collections.Generic;
 
 public sealed class MyDerivedClassI : Test.MyDerivedClass
diff --git a/csharp/test/Ice/proxy/MyDerivedClassI.cs b/csharp/test/Ice/proxy/MyDerivedClassI.cs
index 395c0065e98..7a5a3fc5c6f 100644
--- a/csharp/test/Ice/proxy/MyDerivedClassI.cs
+++ b/csharp/test/Ice/proxy/MyDerivedClassI.cs
@@ -7,7 +7,6 @@
 //
 // **********************************************************************
 
-using System;
 using System.Collections.Generic;
 
 public sealed class MyDerivedClassI : Test.MyDerivedClass
diff --git a/csharp/test/Ice/proxy/Server.cs b/csharp/test/Ice/proxy/Server.cs
index c67d61b117a..7015c9de392 100644
--- a/csharp/test/Ice/proxy/Server.cs
+++ b/csharp/test/Ice/proxy/Server.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -48,7 +47,7 @@ public class Server
             communicator = Ice.Util.initialize(ref args, initData);
             status = run(args, communicator);
         }
-        catch(System.Exception ex)
+        catch(Exception ex)
         {
             Console.Error.WriteLine(ex);
             status = 1;