CSharp mapping cleanup

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

1 files changed, 4 insertions, 15 deletions

diff --git a/csharp/src/Ice/ConnectionFactory.cs b/csharp/src/Ice/ConnectionFactory.cs
index 8c56a2fbab3..d68b7e808c1 100644
--- a/csharp/src/Ice/ConnectionFactory.cs
+++ b/csharp/src/Ice/ConnectionFactory.cs
@@ -11,13 +11,9 @@ namespace IceInternal
 {
 
     using System;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
-    using System.Net.Sockets;
-    using System.Threading;
     using System.Text;
-    using IceUtilInternal;
 
     public class MultiDictionary<K, V> : Dictionary<K, ICollection<V>>
     {
@@ -28,7 +24,7 @@ namespace IceInternal
             if(!this.TryGetValue(key, out list))
             {
                 list = new List<V>();
-                this.Add(key, list);
+                Add(key, list);
             }
             list.Add(value);
         }
@@ -40,7 +36,7 @@ namespace IceInternal
             list.Remove(value);
             if(list.Count == 0)
             {
-                this.Remove(key);
+                Remove(key);
             }
         }
     }
@@ -148,7 +144,6 @@ namespace IceInternal
             }
         }
 
-
         public void create(EndpointI[] endpts, bool hasMore, Ice.EndpointSelectionType selType,
                            CreateConnectionCallback callback)
         {
@@ -1303,9 +1298,7 @@ namespace IceInternal
                 }
                 finally
                 {
-#if !COMPACT && !SILVERLIGHT
                     System.Environment.FailFast(s);
-#endif
                 }
                 return false;
             }
@@ -1329,9 +1322,7 @@ namespace IceInternal
                     }
                     finally
                     {
-#if !COMPACT && !SILVERLIGHT
                         System.Environment.FailFast(s);
-#endif
                     }
                     return false;
                 }
@@ -1409,9 +1400,7 @@ namespace IceInternal
                             }
                             finally
                             {
-#if !COMPACT && !SILVERLIGHT
                                 System.Environment.FailFast(s);
-#endif
                             }
                         }
 
@@ -1725,13 +1714,13 @@ namespace IceInternal
                     _adapter.getThreadPool().unregister(this, SocketOperation.Read);
                 }
             }
-            catch(SystemException ex)
+            catch(SystemException)
             {
                 if(_acceptor != null)
                 {
                     _acceptor.close();
                 }
-                throw ex;
+                throw;
             }
         }