summaryrefslogtreecommitdiff
path: root/csharp/test/Ice/inheritance/AllTests.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/inheritance/AllTests.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/inheritance/AllTests.cs')
-rw-r--r--csharp/test/Ice/inheritance/AllTests.cs26
1 files changed, 1 insertions, 25 deletions
diff --git a/csharp/test/Ice/inheritance/AllTests.cs b/csharp/test/Ice/inheritance/AllTests.cs
index 4c385f7d4b8..a3e48def188 100644
--- a/csharp/test/Ice/inheritance/AllTests.cs
+++ b/csharp/test/Ice/inheritance/AllTests.cs
@@ -7,30 +7,11 @@
//
// **********************************************************************
-using System;
using Test;
-#if SILVERLIGHT
-using System.Windows.Controls;
-#endif
-
public class AllTests : TestCommon.TestApp
-{
-#if SILVERLIGHT
- public override Ice.InitializationData initData()
- {
- Ice.InitializationData initData = new Ice.InitializationData();
- initData.properties = Ice.Util.createProperties();
- initData.properties.setProperty("Ice.FactoryAssemblies", "inheritance,version=1.0.0.0");
- return initData;
- }
-
- override
- public void run(Ice.Communicator communicator)
-#else
+{
public static InitialPrx allTests(Ice.Communicator communicator)
-#endif
-
{
Write("testing stringToProxy... ");
Flush();
@@ -238,11 +219,6 @@ public class AllTests : TestCommon.TestApp
ib2o = cd.cdop(cd);
test(ib2o.Equals(cd));
WriteLine("ok");
-
-#if SILVERLIGHT
- initial.shutdown();
-#else
return initial;
-#endif
}
}