summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/exceptions/Collocated.cs
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-05-11 16:51:13 +0200
committerJose <jose@zeroc.com>2016-05-11 16:51:13 +0200
commit20ead35bcd15c258b00da6b1a16d26107f8dea8b (patch)
tree0aa99a82b9d56383c76c372fc1050dfd5493b4e9 /csharp/test/Ice/exceptions/Collocated.cs
parentFixed make install issue (diff)
downloadice-20ead35bcd15c258b00da6b1a16d26107f8dea8b.tar.bz2
ice-20ead35bcd15c258b00da6b1a16d26107f8dea8b.tar.xz
ice-20ead35bcd15c258b00da6b1a16d26107f8dea8b.zip
CSharp mapping cleanup
- Remove code support for old ussuported frameworks (SILVERLIGHT, COMPACT, MONO) - Remove code support for deprecated collection mappings clr:collection
Diffstat (limited to 'csharp/test/Ice/exceptions/Collocated.cs')
-rw-r--r--csharp/test/Ice/exceptions/Collocated.cs15
1 files changed, 3 insertions, 12 deletions
diff --git a/csharp/test/Ice/exceptions/Collocated.cs b/csharp/test/Ice/exceptions/Collocated.cs
index b04bc7fe605..9a391f35513 100644
--- a/csharp/test/Ice/exceptions/Collocated.cs
+++ b/csharp/test/Ice/exceptions/Collocated.cs
@@ -8,7 +8,6 @@
// **********************************************************************
using System;
-using System.Diagnostics;
using System.Reflection;
[assembly: CLSCompliant(true)]
@@ -38,22 +37,14 @@ public class Collocated
{
Ice.InitializationData initData = new Ice.InitializationData();
initData.properties = Ice.Util.createProperties();
-#if COMPACT
- //
- // When using Ice for .NET Compact Framework, we need to specify
- // the assembly so that Ice can locate classes and exceptions.
- //
- initData.properties.setProperty("Ice.FactoryAssemblies", "collocated");
-#endif
-
initData.properties.setProperty("Ice.Warn.Dispatch", "0");
initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
communicator = Ice.Util.initialize(ref args, initData);
status = run(args, communicator);
}
- catch(System.Exception ex)
+ catch(Exception ex)
{
- System.Console.WriteLine(ex);
+ Console.WriteLine(ex);
status = 1;
}
@@ -65,7 +56,7 @@ public class Collocated
}
catch(Ice.LocalException ex)
{
- System.Console.WriteLine(ex);
+ Console.WriteLine(ex);
status = 1;
}
}