C# mapping changes

- user exceptions are no longer checked on the server side (ICE-6980)
- support for ["marshaled-result"] metadata
- AMD operations now return a Task
- improved dispatch interceptors
- PropertiesAdminI::setProperties impl. now invokes callbacks synchronously

1 files changed, 7 insertions, 8 deletions

diff --git a/csharp/test/Ice/background/Server.cs b/csharp/test/Ice/background/Server.cs
index 0ced20a0176..2e1dcb3b7f7 100644
--- a/csharp/test/Ice/background/Server.cs
+++ b/csharp/test/Ice/background/Server.cs
@@ -10,6 +10,7 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Threading.Tasks;
 
 [assembly: CLSCompliant(true)]
 
@@ -21,21 +22,19 @@ public class Server
 {
     internal class LocatorI : Ice.LocatorDisp_
     {
-        public override void
-        findAdapterByIdAsync(string adapter, Action<Ice.ObjectPrx> response, Action<Exception> exception,
-                             Ice.Current current)
+        public override Task<Ice.ObjectPrx>
+        findAdapterByIdAsync(string adapter,  Ice.Current current)
         {
             _controller.checkCallPause(current);
             Ice.Communicator communicator = current.adapter.getCommunicator();
-            response(current.adapter.createDirectProxy(Ice.Util.stringToIdentity("dummy")));
+            return Task<Ice.ObjectPrx>.FromResult(current.adapter.createDirectProxy(Ice.Util.stringToIdentity("dummy")));
         }
 
-        public override void
-        findObjectByIdAsync(Ice.Identity id, Action<Ice.ObjectPrx> response, Action<Exception> exception,
-                            Ice.Current current)
+        public override Task<Ice.ObjectPrx>
+        findObjectByIdAsync(Ice.Identity id,  Ice.Current current)
         {
             _controller.checkCallPause(current);
-            response(current.adapter.createDirectProxy(id));
+            return Task<Ice.ObjectPrx>.FromResult(current.adapter.createDirectProxy(id));
         }
 
         public override Ice.LocatorRegistryPrx getRegistry(Ice.Current current)