diff options
| author | Jose <jose@zeroc.com> | 2016-07-22 17:57:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-22 17:57:42 +0200 |
| commit | b55c347b5178f62db2a175b55900217217a46dbc (patch) | |
| tree | 914e89427afe92828aac9d01c0a2d7b4046e751a /csharp/test | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-b55c347b5178f62db2a175b55900217217a46dbc.tar.bz2 ice-b55c347b5178f62db2a175b55900217217a46dbc.tar.xz ice-b55c347b5178f62db2a175b55900217217a46dbc.zip | |
CSharp AMD mapping update
Diffstat (limited to 'csharp/test')
139 files changed, 1900 insertions, 1778 deletions
diff --git a/csharp/test/Glacier2/router/msbuild/client/client.csproj b/csharp/test/Glacier2/router/msbuild/client/client.csproj index e3cda992a33..69c01cd713b 100644 --- a/csharp/test/Glacier2/router/msbuild/client/client.csproj +++ b/csharp/test/Glacier2/router/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Glacier2/router/msbuild/server/server.csproj b/csharp/test/Glacier2/router/msbuild/server/server.csproj index e47208c951b..d065e027140 100644 --- a/csharp/test/Glacier2/router/msbuild/server/server.csproj +++ b/csharp/test/Glacier2/router/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj index 4a93d540a88..2edf2cd71ec 100644 --- a/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj +++ b/csharp/test/Glacier2/sessionHelper/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj b/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj index ced3328bac5..588626c6ace 100644 --- a/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj +++ b/csharp/test/Glacier2/sessionHelper/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/acm/msbuild/client/client.csproj b/csharp/test/Ice/acm/msbuild/client/client.csproj index a82f347f2cd..bf6843e76f5 100644 --- a/csharp/test/Ice/acm/msbuild/client/client.csproj +++ b/csharp/test/Ice/acm/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/acm/msbuild/server/server.csproj b/csharp/test/Ice/acm/msbuild/server/server.csproj index abe289555f8..4a2336143e0 100644 --- a/csharp/test/Ice/acm/msbuild/server/server.csproj +++ b/csharp/test/Ice/acm/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj index 3b3d01a03c6..0ca6a669533 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj index d24ff06907f..248c11263d7 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/collocated/collocated.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj index a940ec4f4b7..5a022e829d5 100644 --- a/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj +++ b/csharp/test/Ice/adapterDeactivation/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/admin/msbuild/client/client.csproj b/csharp/test/Ice/admin/msbuild/client/client.csproj index a4e875ae931..1786a2890bf 100644 --- a/csharp/test/Ice/admin/msbuild/client/client.csproj +++ b/csharp/test/Ice/admin/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/admin/msbuild/server/server.csproj b/csharp/test/Ice/admin/msbuild/server/server.csproj index a6303006882..b64b058de85 100644 --- a/csharp/test/Ice/admin/msbuild/server/server.csproj +++ b/csharp/test/Ice/admin/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/ami/msbuild/client/client.csproj b/csharp/test/Ice/ami/msbuild/client/client.csproj index 3c9874a26e6..0fb3069d5ff 100644 --- a/csharp/test/Ice/ami/msbuild/client/client.csproj +++ b/csharp/test/Ice/ami/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj index 09505d63762..85b85ab3f0b 100644 --- a/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/ami/msbuild/collocated/collocated.csproj @@ -71,7 +71,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/ami/msbuild/server/server.csproj b/csharp/test/Ice/ami/msbuild/server/server.csproj index e7f5069dad9..a518ed4c7cc 100644 --- a/csharp/test/Ice/ami/msbuild/server/server.csproj +++ b/csharp/test/Ice/ami/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/application/msbuild/client/client.csproj b/csharp/test/Ice/application/msbuild/client/client.csproj index 5b45dd78ccf..3a62ab7a39e 100644 --- a/csharp/test/Ice/application/msbuild/client/client.csproj +++ b/csharp/test/Ice/application/msbuild/client/client.csproj @@ -49,7 +49,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/background/Server.cs b/csharp/test/Ice/background/Server.cs index 26cccb4eae9..fa302ba146d 100644 --- a/csharp/test/Ice/background/Server.cs +++ b/csharp/test/Ice/background/Server.cs @@ -21,19 +21,21 @@ public class Server { internal class LocatorI : Ice.LocatorDisp_ { - public override void findAdapterById_async(Ice.AMD_Locator_findAdapterById response, string adapter, - Ice.Current current) + public override void + findAdapterByIdAsync(string adapter, Action<Ice.ObjectPrx> response, Action<Exception> exception, + Ice.Current current) { _controller.checkCallPause(current); Ice.Communicator communicator = current.adapter.getCommunicator(); - response.ice_response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); + response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); } - public override void findObjectById_async(Ice.AMD_Locator_findObjectById response, Ice.Identity id, - Ice.Current current) + public override void + findObjectByIdAsync(Ice.Identity id, Action<Ice.ObjectPrx> response, Action<Exception> exception, + Ice.Current current) { _controller.checkCallPause(current); - response.ice_response(current.adapter.createDirectProxy(id)); + response(current.adapter.createDirectProxy(id)); } public override Ice.LocatorRegistryPrx getRegistry(Ice.Current current) diff --git a/csharp/test/Ice/background/msbuild/client/client.csproj b/csharp/test/Ice/background/msbuild/client/client.csproj index ac10443e120..38227a0ddf4 100644 --- a/csharp/test/Ice/background/msbuild/client/client.csproj +++ b/csharp/test/Ice/background/msbuild/client/client.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/background/msbuild/server/server.csproj b/csharp/test/Ice/background/msbuild/server/server.csproj index 76d67b8cf89..bd7ca3dd1d2 100644 --- a/csharp/test/Ice/background/msbuild/server/server.csproj +++ b/csharp/test/Ice/background/msbuild/server/server.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/binding/msbuild/client/client.csproj b/csharp/test/Ice/binding/msbuild/client/client.csproj index 32dcf227d2e..bf6513441a7 100644 --- a/csharp/test/Ice/binding/msbuild/client/client.csproj +++ b/csharp/test/Ice/binding/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/binding/msbuild/server/server.csproj b/csharp/test/Ice/binding/msbuild/server/server.csproj index 811418e3974..9889c86f7f1 100644 --- a/csharp/test/Ice/binding/msbuild/server/server.csproj +++ b/csharp/test/Ice/binding/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/checksum/msbuild/client/client.csproj b/csharp/test/Ice/checksum/msbuild/client/client.csproj index 9ccde62f5ad..5d3e455a52d 100644 --- a/csharp/test/Ice/checksum/msbuild/client/client.csproj +++ b/csharp/test/Ice/checksum/msbuild/client/client.csproj @@ -58,7 +58,6 @@ <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> <IceBuilderChecksum>yes</IceBuilderChecksum> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/checksum/server/msbuild/server/server.csproj b/csharp/test/Ice/checksum/server/msbuild/server/server.csproj index 28a629ffaf1..3ec3edd2bd5 100644 --- a/csharp/test/Ice/checksum/server/msbuild/server/server.csproj +++ b/csharp/test/Ice/checksum/server/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> <IceBuilderChecksum>yes</IceBuilderChecksum> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj index 8a3da513411..da117a80a4c 100644 --- a/csharp/test/Ice/defaultServant/msbuild/client/client.csproj +++ b/csharp/test/Ice/defaultServant/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj index 220ed8a06d4..c800ed6189a 100644 --- a/csharp/test/Ice/defaultValue/msbuild/client/client.csproj +++ b/csharp/test/Ice/defaultValue/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dictMapping/MyClassAMDI.cs b/csharp/test/Ice/dictMapping/MyClassAMDI.cs index af7b5bde825..0ee371feb26 100644 --- a/csharp/test/Ice/dictMapping/MyClassAMDI.cs +++ b/csharp/test/Ice/dictMapping/MyClassAMDI.cs @@ -7,57 +7,71 @@ // // ********************************************************************** -using System; using System.Collections.Generic; +using System; using Test; public sealed class MyClassI : MyClass { - public override void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void opNV_async(AMD_MyClass_opNV cb, Dictionary<int, int> i, Ice.Current current) + public override void + opNVAsync(Dictionary<int, int> i, Action<MyClass_OpNVResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNVResult(i, i)); } - public override void opNR_async(AMD_MyClass_opNR cb, Dictionary<string, string> i, Ice.Current current) + public override void + opNRAsync(Dictionary<string, string> i, Action<MyClass_OpNRResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNRResult(i, i)); } - public override void opNDV_async(AMD_MyClass_opNDV cb, Dictionary<string, Dictionary<int, int>> i, - Ice.Current current) + public override void + opNDVAsync(Dictionary<string, Dictionary<int, int>> i, Action<MyClass_OpNDVResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNDVResult(i, i)); } - public override void opNDR_async(AMD_MyClass_opNDR cb, Dictionary<string, Dictionary<string, string>> i, - Ice.Current current) + public override void + opNDRAsync(Dictionary<string, Dictionary<string, string>> i, Action<MyClass_OpNDRResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNDRResult(i, i)); } - public override void opNDAIS_async(AMD_MyClass_opNDAIS cb, Dictionary<string, int[]> i, Ice.Current current) + public override void + opNDAISAsync(Dictionary<string, int[]> i, Action<MyClass_OpNDAISResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNDAISResult(i, i)); } - public override void opNDGIS_async(AMD_MyClass_opNDGIS cb, Dictionary<string, List<int>> i, Ice.Current current) + public override void + opNDGISAsync(Dictionary<string, List<int>> i, Action<MyClass_OpNDGISResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNDGISResult(i, i)); } - public override void opNDASS_async(AMD_MyClass_opNDASS cb, Dictionary<string, string[]> i, Ice.Current current) + public override void + opNDASSAsync(Dictionary<string, string[]> i, Action<MyClass_OpNDASSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNDASSResult(i, i)); } - public override void opNDGSS_async(AMD_MyClass_opNDGSS cb, Dictionary<string, List<string>> i, Ice.Current current) + public override void + opNDGSSAsync(Dictionary<string, List<string>> i, Action<MyClass_OpNDGSSResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpNDGSSResult(i, i)); } } diff --git a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj index 8afacc49e5b..2503ae6ebb4 100644 --- a/csharp/test/Ice/dictMapping/msbuild/client/client.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj index d40f314aac0..40812f9d007 100644 --- a/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/collocated/collocated.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj index 68ba9a0ad4c..ddf0f8f642c 100644 --- a/csharp/test/Ice/dictMapping/msbuild/server/server.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj index e16c850b15c..19d92c028dc 100644 --- a/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/dictMapping/msbuild/serveramd/serveramd.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dispatcher/msbuild/client/client.csproj b/csharp/test/Ice/dispatcher/msbuild/client/client.csproj index 67883d9cd51..e6a7815a72d 100644 --- a/csharp/test/Ice/dispatcher/msbuild/client/client.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj b/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj index 0ed737c0a82..ef9561ef741 100644 --- a/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/collocated/collocated.csproj @@ -74,7 +74,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/dispatcher/msbuild/server/server.csproj b/csharp/test/Ice/dispatcher/msbuild/server/server.csproj index ac07c8a6772..c24ee3bcf28 100644 --- a/csharp/test/Ice/dispatcher/msbuild/server/server.csproj +++ b/csharp/test/Ice/dispatcher/msbuild/server/server.csproj @@ -16,7 +16,7 @@ <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{3C53C28F-DC44-46B0-8B85-0C96B85B2042};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputPath>..\..\</OutputPath> - </PropertyGroup> + </PropertyGroup> <ItemGroup> <Reference Include="Ice, Version=3.7.53.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/echo/BlobjectI.cs b/csharp/test/Ice/echo/BlobjectI.cs index 003107de3b9..997ab60b900 100644 --- a/csharp/test/Ice/echo/BlobjectI.cs +++ b/csharp/test/Ice/echo/BlobjectI.cs @@ -8,40 +8,10 @@ // ********************************************************************** using System.Diagnostics; +using System.Threading.Tasks; public class BlobjectI : Ice.BlobjectAsync { - - private class Callback - { - public Callback(Ice.AMD_Object_ice_invoke cb, bool twoway) - { - _cb = cb; - _twoway = twoway; - } - - public void response(bool ok, byte[] encaps) - { - _cb.ice_response(ok, encaps); - } - - public void exception(Ice.Exception ex) - { - _cb.ice_exception(ex); - } - - public void sent(bool sync) - { - if(!_twoway) - { - _cb.ice_response(true, new byte[0]); - } - } - - private Ice.AMD_Object_ice_invoke _cb; - private bool _twoway; - } - public void startBatch() { Debug.Assert(_batchProxy != null); @@ -55,8 +25,8 @@ public class BlobjectI : Ice.BlobjectAsync _batchProxy = null; } - public override void - ice_invoke_async(Ice.AMD_Object_ice_invoke amdCb, byte[] inEncaps, Ice.Current current) + public override Task<Ice.Object_Ice_invokeResult> + ice_invokeAsync(byte[] inEncaps, Ice.Current current) { bool twoway = current.requestId > 0; Ice.ObjectPrx obj = current.con.createProxy(current.id); @@ -81,16 +51,14 @@ public class BlobjectI : Ice.BlobjectAsync { byte[] outEncaps; obj.ice_invoke(current.operation, current.mode, inEncaps, out outEncaps, current.ctx); - amdCb.ice_response(true, new byte[0]); + return Task.FromResult(new Ice.Object_Ice_invokeResult(true, new byte[0])); } else { - Callback cb = new Callback(amdCb, false); - obj.ice_oneway().begin_ice_invoke(current.operation, - current.mode, - inEncaps, - current.ctx).whenCompleted(cb.response, cb.exception) - .whenSent(cb.sent); + return obj.ice_oneway().ice_invokeAsync(current.operation, + current.mode, + inEncaps, + current.ctx); } } else @@ -99,11 +67,10 @@ public class BlobjectI : Ice.BlobjectAsync { obj = obj.ice_facet(current.facet); } - Callback cb = new Callback(amdCb, true); - obj.begin_ice_invoke(current.operation, - current.mode, - inEncaps, - current.ctx).whenCompleted(cb.response, cb.exception).whenSent(cb.sent); + return obj.ice_invokeAsync(current.operation, + current.mode, + inEncaps, + current.ctx); } } diff --git a/csharp/test/Ice/echo/msbuild/server/server.csproj b/csharp/test/Ice/echo/msbuild/server/server.csproj index 07dbacd9d5b..97a9a3ff21b 100644 --- a/csharp/test/Ice/echo/msbuild/server/server.csproj +++ b/csharp/test/Ice/echo/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/enums/msbuild/client/client.csproj b/csharp/test/Ice/enums/msbuild/client/client.csproj index 0a72f78c527..e95521aa592 100644 --- a/csharp/test/Ice/enums/msbuild/client/client.csproj +++ b/csharp/test/Ice/enums/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/enums/msbuild/server/server.csproj b/csharp/test/Ice/enums/msbuild/server/server.csproj index 7ab4990b489..5842d83dccf 100644 --- a/csharp/test/Ice/enums/msbuild/server/server.csproj +++ b/csharp/test/Ice/enums/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/exceptions/AllTests.cs b/csharp/test/Ice/exceptions/AllTests.cs index 1f87fbdf86d..b1a1a14a922 100644 --- a/csharp/test/Ice/exceptions/AllTests.cs +++ b/csharp/test/Ice/exceptions/AllTests.cs @@ -221,7 +221,7 @@ public class AllTests : TestCommon.TestApp try { - thrower.throwAorDasAorD(- 1); + thrower.throwAorDasAorD(-1); test(false); } catch(D ex) @@ -1092,7 +1092,6 @@ public class AllTests : TestCommon.TestApp WriteLine("ok"); - // ---------------------------------------- if(thrower.supportsUndeclaredExceptions()) { Write("catching unknown user exception with new AMI mapping... "); diff --git a/csharp/test/Ice/exceptions/ThrowerAMDI.cs b/csharp/test/Ice/exceptions/ThrowerAMDI.cs index e8fda6b79ad..90249133945 100644 --- a/csharp/test/Ice/exceptions/ThrowerAMDI.cs +++ b/csharp/test/Ice/exceptions/ThrowerAMDI.cs @@ -17,152 +17,131 @@ public class ThrowerI : ThrowerDisp_ { } - public override void shutdown_async(AMD_Thrower_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void supportsUndeclaredExceptions_async(AMD_Thrower_supportsUndeclaredExceptions cb, Ice.Current current) + public override void + supportsUndeclaredExceptionsAsync(Action<bool> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(true); + response(true); } - public override void supportsAssertException_async(AMD_Thrower_supportsAssertException cb, Ice.Current current) + public override void + supportsAssertExceptionAsync(Action<bool> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(false); + response(false); } - public override void throwAasA_async(AMD_Thrower_throwAasA cb, int a, Ice.Current current) + public override void throwAasAAsync(int a, Action response, Action<Exception> exception, Ice.Current current) { - A ex = new A(); - ex.aMem = a; - cb.ice_exception(ex); + exception(new A(a)); } - public override void throwAorDasAorD_async(AMD_Thrower_throwAorDasAorD cb, int a, Ice.Current current) + public override void throwAorDasAorDAsync(int a, Action response, Action<Exception> exception, Ice.Current current) { if(a > 0) { - A ex = new A(); - ex.aMem = a; - cb.ice_exception(ex); + exception(new A(a)); } else { - D ex = new D(); - ex.dMem = a; - cb.ice_exception(ex); + exception(new D(a)); } } - public override void throwBasA_async(AMD_Thrower_throwBasA cb, int a, int b, Ice.Current current) + public override void + throwBasAAsync(int a, int b, Action response, Action<Exception> exception, Ice.Current current) { - B ex = new B(); - ex.aMem = a; - ex.bMem = b; - throw ex; - //cb.ice_exception(ex); + exception(new B(a, b)); } - public override void throwBasB_async(AMD_Thrower_throwBasB cb, int a, int b, Ice.Current current) + public override void + throwBasBAsync(int a, int b, Action response, Action<Exception> exception, Ice.Current current) { - B ex = new B(); - ex.aMem = a; - ex.bMem = b; - throw ex; - //cb.ice_exception(ex); + exception(new B(a, b)); } - public override void throwCasA_async(AMD_Thrower_throwCasA cb, int a, int b, int c, Ice.Current current) + public override void + throwCasAAsync(int a, int b, int c, Action response, Action<Exception> exception, Ice.Current current) { - C ex = new C(); - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb.ice_exception(ex); + exception(new C(a, b, c)); } - public override void throwCasB_async(AMD_Thrower_throwCasB cb, int a, int b, int c, Ice.Current current) + public override void + throwCasBAsync(int a, int b, int c, Action response, Action<Exception> exception, Ice.Current current) { - C ex = new C(); - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb.ice_exception(ex); + exception(new C(a, b, c)); } - public override void throwCasC_async(AMD_Thrower_throwCasC cb, int a, int b, int c, Ice.Current current) + public override void + throwCasCAsync(int a, int b, int c, Action response, Action<Exception> exception, Ice.Current current) { - C ex = new C(); - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb.ice_exception(ex); + exception(new C(a, b, c)); } - public override void throwUndeclaredA_async(AMD_Thrower_throwUndeclaredA cb, int a, Ice.Current current) + public override void + throwUndeclaredAAsync(int a, Action response, Action<Exception> exception, Ice.Current current) { - A ex = new A(); - ex.aMem = a; - cb.ice_exception(ex); + exception(new A(a)); } - public override void throwUndeclaredB_async(AMD_Thrower_throwUndeclaredB cb, int a, int b, Ice.Current current) + public override void + throwUndeclaredBAsync(int a, int b, Action response, Action<Exception> exception, Ice.Current current) { - B ex = new B(); - ex.aMem = a; - ex.bMem = b; - cb.ice_exception(ex); + exception(new B(a, b)); } - public override void throwUndeclaredC_async(AMD_Thrower_throwUndeclaredC cb, int a, int b, int c, Ice.Current current) + public override void + throwUndeclaredCAsync(int a, int b, int c, Action response, Action<Exception> exception, Ice.Current current) { - C ex = new C(); - ex.aMem = a; - ex.bMem = b; - ex.cMem = c; - cb.ice_exception(ex); + exception(new C(a, b, c)); } - public override void throwLocalException_async(AMD_Thrower_throwLocalException cb, Ice.Current current) + public override void + throwLocalExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Ice.TimeoutException()); + exception(new Ice.TimeoutException()); } - public override void throwNonIceException_async(AMD_Thrower_throwNonIceException cb, Ice.Current current) + public override void + throwNonIceExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { throw new Exception(); } - public override void throwAssertException_async(AMD_Thrower_throwAssertException cb, Ice.Current current) + public override void + throwAssertExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { Debug.Assert(false); } - public override void throwMemoryLimitException_async(AMD_Thrower_throwMemoryLimitException cb, byte[] seq, - Ice.Current current) + public override void + throwMemoryLimitExceptionAsync(byte[] seq, Action<byte[]> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(new byte[1024 * 20]); // 20KB is over the configured 10KB message size max. + response(new byte[1024 * 20]); // 20KB is over the configured 10KB message size max. } - public override void throwLocalExceptionIdempotent_async(AMD_Thrower_throwLocalExceptionIdempotent e, - Ice.Current current) + public override void + throwLocalExceptionIdempotentAsync(Action response, Action<Exception> exception, Ice.Current current) { throw new Ice.TimeoutException(); } - public override void throwAfterResponse_async(AMD_Thrower_throwAfterResponse cb, Ice.Current current) + public override void + throwAfterResponseAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); - + response(); throw new Exception(); } - public override void throwAfterException_async(AMD_Thrower_throwAfterException cb, Ice.Current current) + public override void + throwAfterExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new A()); - + exception(new A()); throw new Exception(); } } diff --git a/csharp/test/Ice/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/exceptions/msbuild/client/client.csproj index a40134508d7..a389fee85df 100644 --- a/csharp/test/Ice/exceptions/msbuild/client/client.csproj +++ b/csharp/test/Ice/exceptions/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj index 9677ce1385b..d71119ca6e9 100644 --- a/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/exceptions/msbuild/collocated/collocated.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/exceptions/msbuild/server/server.csproj index 198329c8b66..05014b33a75 100644 --- a/csharp/test/Ice/exceptions/msbuild/server/server.csproj +++ b/csharp/test/Ice/exceptions/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj index 9c6645874a8..24efe946f8f 100644 --- a/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/exceptions/msbuild/serveramd/serveramd.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/facets/msbuild/client/client.csproj b/csharp/test/Ice/facets/msbuild/client/client.csproj index 17e0eb72fd0..a5ede0258a9 100644 --- a/csharp/test/Ice/facets/msbuild/client/client.csproj +++ b/csharp/test/Ice/facets/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj b/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj index 5f2410bfce3..af59e2b91f1 100644 --- a/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/facets/msbuild/collocated/collocated.csproj @@ -95,7 +95,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/facets/msbuild/server/server.csproj b/csharp/test/Ice/facets/msbuild/server/server.csproj index 5c2315208bf..c453093a6ba 100644 --- a/csharp/test/Ice/facets/msbuild/server/server.csproj +++ b/csharp/test/Ice/facets/msbuild/server/server.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj b/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj index 66f09b5e2a7..7a6e1bed32a 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj b/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj index cd6709794bc..3a0b7ad3c24 100644 --- a/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj +++ b/csharp/test/Ice/faultTolerance/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/hash/msbuild/client/client.csproj b/csharp/test/Ice/hash/msbuild/client/client.csproj index 5a6190e9999..e4a56daaab1 100644 --- a/csharp/test/Ice/hash/msbuild/client/client.csproj +++ b/csharp/test/Ice/hash/msbuild/client/client.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/hold/msbuild/client/client.csproj b/csharp/test/Ice/hold/msbuild/client/client.csproj index 44ab16940ef..d1dabcf7cf1 100644 --- a/csharp/test/Ice/hold/msbuild/client/client.csproj +++ b/csharp/test/Ice/hold/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/hold/msbuild/server/server.csproj b/csharp/test/Ice/hold/msbuild/server/server.csproj index c892fdacac6..778c406b50c 100644 --- a/csharp/test/Ice/hold/msbuild/server/server.csproj +++ b/csharp/test/Ice/hold/msbuild/server/server.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/info/msbuild/client/client.csproj b/csharp/test/Ice/info/msbuild/client/client.csproj index a19e399b88d..98ab95451b1 100644 --- a/csharp/test/Ice/info/msbuild/client/client.csproj +++ b/csharp/test/Ice/info/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/info/msbuild/server/server.csproj b/csharp/test/Ice/info/msbuild/server/server.csproj index 71e25d4cc4f..6e6e915f2ae 100644 --- a/csharp/test/Ice/info/msbuild/server/server.csproj +++ b/csharp/test/Ice/info/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/inheritance/msbuild/client/client.csproj b/csharp/test/Ice/inheritance/msbuild/client/client.csproj index eeb58fe3387..4b7a023b97b 100644 --- a/csharp/test/Ice/inheritance/msbuild/client/client.csproj +++ b/csharp/test/Ice/inheritance/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj index 971a65f81a4..59ff920002d 100644 --- a/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/inheritance/msbuild/collocated/collocated.csproj @@ -95,7 +95,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/inheritance/msbuild/server/server.csproj b/csharp/test/Ice/inheritance/msbuild/server/server.csproj index e25156470a8..bdcf658d811 100644 --- a/csharp/test/Ice/inheritance/msbuild/server/server.csproj +++ b/csharp/test/Ice/inheritance/msbuild/server/server.csproj @@ -108,7 +108,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/interceptor/MyObjectI.cs b/csharp/test/Ice/interceptor/MyObjectI.cs index fa40bb98307..c07a7a214c9 100644 --- a/csharp/test/Ice/interceptor/MyObjectI.cs +++ b/csharp/test/Ice/interceptor/MyObjectI.cs @@ -8,7 +8,7 @@ // ********************************************************************** using System; -using System.Threading; +using System.Threading.Tasks; class MySystemException : Ice.SystemException { @@ -76,73 +76,45 @@ class MyObjectI : Test.MyObjectDisp_ // // AMD // - public override void - amdAdd_async(Test.AMD_MyObject_amdAdd cb, int x, int y, Ice.Current current) + public override async void + amdAddAsync(int x, int y, Action<int> response, Action<Exception> exception, Ice.Current current) { - Thread thread = new Thread(delegate() - { - Thread.Sleep(10); - cb.ice_response(x + y); - }); - thread.IsBackground = true; - thread.Start(); + await Task.Delay(10); + response(x + y); } - public override void - amdAddWithRetry_async(Test.AMD_MyObject_amdAddWithRetry cb, int x, int y, Ice.Current current) + public override async void + amdAddWithRetryAsync(int x, int y, Action<int> response, Action<Exception> exception, Ice.Current current) { - Thread thread = new Thread(delegate() - { - Thread.Sleep(10); - cb.ice_response(x + y); - }); - thread.IsBackground = true; - thread.Start(); - + await Task.Delay(10); if(current.ctx.ContainsKey("retry") && current.ctx["retry"].Equals("no")) { - return; + response(x + y); } else { - throw new Test.RetryException(); + exception(new Test.RetryException()); } } - public override void - amdBadAdd_async(Test.AMD_MyObject_amdBadAdd cb, int x, int y, Ice.Current current) + public override async void + amdBadAddAsync(int x, int y, Action<int> response, Action<Exception> exception, Ice.Current current) { - Thread thread = new Thread(delegate() - { - Thread.Sleep(10); - cb.ice_exception(new Test.InvalidInputException()); - }); - thread.IsBackground = true; - thread.Start(); + await Task.Delay(10); + exception(new Test.InvalidInputException()); } - public override void - amdNotExistAdd_async(Test.AMD_MyObject_amdNotExistAdd cb, int x, int y, Ice.Current current) + public override async void + amdNotExistAddAsync(int x, int y, Action<int> response, Action<Exception> exception, Ice.Current current) { - Thread thread = new Thread(delegate() - { - Thread.Sleep(10); - cb.ice_exception(new Ice.ObjectNotExistException()); - }); - thread.IsBackground = true; - thread.Start(); + await Task.Delay(10); + exception(new Ice.ObjectNotExistException()); } - public override void - amdBadSystemAdd_async(Test.AMD_MyObject_amdBadSystemAdd cb, int x, int y, Ice.Current current) + public override async void + amdBadSystemAddAsync(int x, int y, Action<int> response, Action<Exception> exception, Ice.Current current) { - Thread thread = new Thread(delegate() - { - Thread.Sleep(10); - cb.ice_exception(new MySystemException()); - }); - - thread.IsBackground = true; - thread.Start(); + await Task.Delay(10); + exception(new MySystemException()); } } diff --git a/csharp/test/Ice/interceptor/msbuild/client/client.csproj b/csharp/test/Ice/interceptor/msbuild/client/client.csproj index 8a8ff81f0ff..1a6454add9a 100644 --- a/csharp/test/Ice/interceptor/msbuild/client/client.csproj +++ b/csharp/test/Ice/interceptor/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/invoke/BlobjectI.cs b/csharp/test/Ice/invoke/BlobjectI.cs index ea8d8c8216c..3e3f1e9064f 100644 --- a/csharp/test/Ice/invoke/BlobjectI.cs +++ b/csharp/test/Ice/invoke/BlobjectI.cs @@ -7,6 +7,8 @@ // // ********************************************************************** +using System.Threading.Tasks; + public class BlobjectI : Ice.Blobject { public override bool @@ -73,8 +75,8 @@ public class BlobjectI : Ice.Blobject public class BlobjectAsyncI : Ice.BlobjectAsync { - public override void - ice_invoke_async(Ice.AMD_Object_ice_invoke cb, byte[] inParams, Ice.Current current) + public override Task<Ice.Object_Ice_invokeResult> + ice_invokeAsync(byte[] inParams, Ice.Current current) { Ice.Communicator communicator = current.adapter.getCommunicator(); Ice.InputStream inS = new Ice.InputStream(communicator, inParams); @@ -83,7 +85,7 @@ public class BlobjectAsyncI : Ice.BlobjectAsync outS.startEncapsulation(); if(current.operation.Equals("opOneway")) { - cb.ice_response(true, new byte[0]); + return Task.FromResult(new Ice.Object_Ice_invokeResult(true, new byte[0])); } else if(current.operation.Equals("opString")) { @@ -91,19 +93,19 @@ public class BlobjectAsyncI : Ice.BlobjectAsync outS.writeString(s); outS.writeString(s); outS.endEncapsulation(); - cb.ice_response(true, outS.finished()); + return Task.FromResult(new Ice.Object_Ice_invokeResult(true, outS.finished())); } else if(current.operation.Equals("opException")) { Test.MyException ex = new Test.MyException(); outS.writeException(ex); outS.endEncapsulation(); - cb.ice_response(false, outS.finished()); + return Task.FromResult(new Ice.Object_Ice_invokeResult(false, outS.finished())); } else if(current.operation.Equals("shutdown")) { communicator.shutdown(); - cb.ice_response(true, null); + return Task.FromResult(new Ice.Object_Ice_invokeResult(true, null)); } else if(current.operation.Equals("ice_isA")) { @@ -117,7 +119,7 @@ public class BlobjectAsyncI : Ice.BlobjectAsync outS.writeBool(false); } outS.endEncapsulation(); - cb.ice_response(true, outS.finished()); + return Task.FromResult(new Ice.Object_Ice_invokeResult(true, outS.finished())); } else { diff --git a/csharp/test/Ice/invoke/msbuild/client/client.csproj b/csharp/test/Ice/invoke/msbuild/client/client.csproj index a209ebfe5ce..d4c665f357b 100644 --- a/csharp/test/Ice/invoke/msbuild/client/client.csproj +++ b/csharp/test/Ice/invoke/msbuild/client/client.csproj @@ -61,7 +61,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/invoke/msbuild/server/server.csproj b/csharp/test/Ice/invoke/msbuild/server/server.csproj index fae7858ec0e..6d606cb972d 100644 --- a/csharp/test/Ice/invoke/msbuild/server/server.csproj +++ b/csharp/test/Ice/invoke/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/location/ServerLocator.cs b/csharp/test/Ice/location/ServerLocator.cs index 905955a0604..94467794ca7 100644 --- a/csharp/test/Ice/location/ServerLocator.cs +++ b/csharp/test/Ice/location/ServerLocator.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using System; using System.Diagnostics; public class ServerLocator : Test.TestLocatorDisp_ @@ -18,31 +19,34 @@ public class ServerLocator : Test.TestLocatorDisp_ _requestCount = 0; } - public override void findAdapterById_async(Ice.AMD_Locator_findAdapterById response, string adapter, - Ice.Current current) + public override void + findAdapterByIdAsync(string adapter, Action<Ice.ObjectPrx> response, Action<Exception> exception, + Ice.Current current) { ++_requestCount; if(adapter.Equals("TestAdapter10") || adapter.Equals("TestAdapter10-2")) { Debug.Assert(current.encoding.Equals(Ice.Util.Encoding_1_0)); - response.ice_response(_registry.getAdapter("TestAdapter")); - return; + response(_registry.getAdapter("TestAdapter")); + } + else + { + // We add a small delay to make sure locator request queuing gets tested when + // running the test on a fast machine + System.Threading.Thread.Sleep(1); + response(_registry.getAdapter(adapter)); } - - // We add a small delay to make sure locator request queuing gets tested when - // running the test on a fast machine - System.Threading.Thread.Sleep(1); - response.ice_response(_registry.getAdapter(adapter)); } - public override void findObjectById_async(Ice.AMD_Locator_findObjectById response, Ice.Identity id, - Ice.Current current) + public override void + findObjectByIdAsync(Ice.Identity id, Action<Ice.ObjectPrx> response, Action<Exception> exception, + Ice.Current current) { ++_requestCount; // We add a small delay to make sure locator request queuing gets tested when // running the test on a fast machine System.Threading.Thread.Sleep(1); - response.ice_response(_registry.getObject(id)); + response(_registry.getObject(id)); } public override Ice.LocatorRegistryPrx getRegistry(Ice.Current current) diff --git a/csharp/test/Ice/location/ServerLocatorRegistry.cs b/csharp/test/Ice/location/ServerLocatorRegistry.cs index 8291c98c27f..f7f8b44899e 100644 --- a/csharp/test/Ice/location/ServerLocatorRegistry.cs +++ b/csharp/test/Ice/location/ServerLocatorRegistry.cs @@ -7,6 +7,7 @@ // // ********************************************************************** +using System; using System.Collections; public class ServerLocatorRegistry : Test.TestLocatorRegistryDisp_ @@ -17,8 +18,9 @@ public class ServerLocatorRegistry : Test.TestLocatorRegistryDisp_ _objects = new Hashtable(); } - public override void setAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setAdapterDirectProxy cb, string adapter, - Ice.ObjectPrx obj, Ice.Current current) + public override void + setAdapterDirectProxyAsync(string adapter, Ice.ObjectPrx obj, Action response, Action<Exception> exception, + Ice.Current current) { if(obj != null) { @@ -28,12 +30,12 @@ public class ServerLocatorRegistry : Test.TestLocatorRegistryDisp_ { _adapters.Remove(adapter); } - cb.ice_response(); + response(); } - public override void setReplicatedAdapterDirectProxy_async( - Ice.AMD_LocatorRegistry_setReplicatedAdapterDirectProxy cb, - string adapter, string replica, Ice.ObjectPrx obj, Ice.Current current) + public override void + setReplicatedAdapterDirectProxyAsync(string adapter, string replica, Ice.ObjectPrx obj, Action response, + Action<Exception> exception, Ice.Current current) { if(obj != null) { @@ -45,16 +47,17 @@ public class ServerLocatorRegistry : Test.TestLocatorRegistryDisp_ _adapters.Remove(adapter); _adapters.Remove(replica); } - cb.ice_response(); + response(); } - public override void setServerProcessProxy_async(Ice.AMD_LocatorRegistry_setServerProcessProxy cb, - string id, Ice.ProcessPrx proxy, Ice.Current current) + public override void + setServerProcessProxyAsync(string id, Ice.ProcessPrx proxy, Action response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(); + response(); } - public override void addObject(Ice.ObjectPrx obj, Ice.Current current) + public override void addObject(Ice.ObjectPrx obj, Ice.Current current = null) { _objects[obj.ice_getIdentity()] = obj; } diff --git a/csharp/test/Ice/location/msbuild/client/client.csproj b/csharp/test/Ice/location/msbuild/client/client.csproj index 0fd03b85708..742dab837e8 100644 --- a/csharp/test/Ice/location/msbuild/client/client.csproj +++ b/csharp/test/Ice/location/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/location/msbuild/server/server.csproj b/csharp/test/Ice/location/msbuild/server/server.csproj index c55f5770488..b4fd66b02ab 100644 --- a/csharp/test/Ice/location/msbuild/server/server.csproj +++ b/csharp/test/Ice/location/msbuild/server/server.csproj @@ -70,7 +70,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/metrics/MetricsAMDI.cs b/csharp/test/Ice/metrics/MetricsAMDI.cs index 368e3fc7b4b..0c2a83a67fd 100644 --- a/csharp/test/Ice/metrics/MetricsAMDI.cs +++ b/csharp/test/Ice/metrics/MetricsAMDI.cs @@ -33,41 +33,41 @@ public sealed class ControllerI : ControllerDisp_ public sealed class MetricsI : MetricsDisp_ { - override public void op_async(Test.AMD_Metrics_op cb, Ice.Current current) + override public void opAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - override public void fail_async(Test.AMD_Metrics_fail cb, Ice.Current current) + override public void failAsync(Action response, Action<Exception> exception, Ice.Current current) { current.con.close(true); - cb.ice_response(); + response(); } - override public void opWithUserException_async(Test.AMD_Metrics_opWithUserException cb, Ice.Current current) + override public void opWithUserExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new UserEx()); + exception(new UserEx()); } - override public void opWithRequestFailedException_async(Test.AMD_Metrics_opWithRequestFailedException cb, - Ice.Current current) + override public void + opWithRequestFailedExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Ice.ObjectNotExistException()); + exception(new Ice.ObjectNotExistException()); } - override public void opWithLocalException_async(Test.AMD_Metrics_opWithLocalException cb, Ice.Current current) + override public void opWithLocalExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Ice.SyscallException()); + exception(new Ice.SyscallException()); } - override public void opWithUnknownException_async(Test.AMD_Metrics_opWithUnknownException cb, Ice.Current current) + override public void opWithUnknownExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new ArgumentOutOfRangeException()); + exception(new ArgumentOutOfRangeException()); } - override public void opByteS_async(Test.AMD_Metrics_opByteS cb, byte[] bs, Ice.Current current) + override public void opByteSAsync(byte[] bs, Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } override public Ice.ObjectPrx getAdmin(Ice.Current current) diff --git a/csharp/test/Ice/metrics/msbuild/client/client.csproj b/csharp/test/Ice/metrics/msbuild/client/client.csproj index d90423d0f85..b1fa8332b66 100644 --- a/csharp/test/Ice/metrics/msbuild/client/client.csproj +++ b/csharp/test/Ice/metrics/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj b/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj index 63b54dbd1c0..81ce1876514 100644 --- a/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/metrics/msbuild/collocated/collocated.csproj @@ -67,7 +67,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/metrics/msbuild/server/server.csproj b/csharp/test/Ice/metrics/msbuild/server/server.csproj index 63c1d68045d..7931c92c412 100644 --- a/csharp/test/Ice/metrics/msbuild/server/server.csproj +++ b/csharp/test/Ice/metrics/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj index 53b0bc133b6..565fa845d8c 100644 --- a/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/metrics/msbuild/serveramd/serveramd.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/networkProxy/msbuild/client/client.csproj b/csharp/test/Ice/networkProxy/msbuild/client/client.csproj index 1433f94aa79..745fe338ad5 100644 --- a/csharp/test/Ice/networkProxy/msbuild/client/client.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/networkProxy/msbuild/server/server.csproj b/csharp/test/Ice/networkProxy/msbuild/server/server.csproj index 45b1c257b98..cbeae4f9be3 100644 --- a/csharp/test/Ice/networkProxy/msbuild/server/server.csproj +++ b/csharp/test/Ice/networkProxy/msbuild/server/server.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/objects/msbuild/client/client.csproj b/csharp/test/Ice/objects/msbuild/client/client.csproj index d63380e8680..98e5eaf4544 100644 --- a/csharp/test/Ice/objects/msbuild/client/client.csproj +++ b/csharp/test/Ice/objects/msbuild/client/client.csproj @@ -80,7 +80,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj b/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj index a950eef2cc0..788a33b3775 100644 --- a/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/objects/msbuild/collocated/collocated.csproj @@ -98,7 +98,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/objects/msbuild/server/server.csproj b/csharp/test/Ice/objects/msbuild/server/server.csproj index 45b2df8e98d..2650975efa2 100644 --- a/csharp/test/Ice/objects/msbuild/server/server.csproj +++ b/csharp/test/Ice/objects/msbuild/server/server.csproj @@ -80,7 +80,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs index 299385cadaf..2b3ff2af6b8 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDI.cs @@ -10,6 +10,9 @@ using System; using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; + +using Test; public sealed class MyDerivedClassI : Test.MyDerivedClass { @@ -23,9 +26,9 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass internal class Thread_opVoid { - public Thread_opVoid(Test.AMD_MyClass_opVoid cb) + public Thread_opVoid(Action response) { - _cb = cb; + _response = response; } public void Start() @@ -39,7 +42,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass public void Run() { - _cb.ice_response(); + _response(); } public void Join() @@ -50,7 +53,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass } } - private Test.AMD_MyClass_opVoid _cb; + private Action _response; private Thread _thread; } @@ -81,7 +84,7 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass return base.ice_id(current); } - public override void shutdown_async(Test.AMD_MyClass_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { while(_opVoidThread != null) { @@ -90,16 +93,16 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass } current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void delay_async(Test.AMD_MyClass_delay cb, int ms, Ice.Current current) + public override async void delayAsync(int ms, Action response, Action<Exception> exception, Ice.Current current) { - Thread.Sleep(ms); - cb.ice_response(); + await Task.Delay(ms); + response(); } - public override void opVoid_async(Test.AMD_MyClass_opVoid cb, Ice.Current current) + public override void opVoidAsync(Action response, Action<Exception> exception, Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); @@ -109,16 +112,22 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass _opVoidThread = null; } - _opVoidThread = new Thread_opVoid(cb); + _opVoidThread = new Thread_opVoid(response); _opVoidThread.Start(); } - public override void opBool_async(Test.AMD_MyClass_opBool cb, bool p1, bool p2, Ice.Current current) + public override void opBoolAsync(bool p1, bool p2, + Action<MyClass_OpBoolResult> response, + Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p2, p1); + response(new MyClass_OpBoolResult(p2, p1)); } - public override void opBoolS_async(Test.AMD_MyClass_opBoolS cb, bool[] p1, bool[] p2, Ice.Current current) + public override void opBoolSAsync(bool[] p1, bool[] p2, + Action<MyClass_OpBoolSResult> response, + Action<Exception> exception, + Ice.Current current) { bool[] p3 = new bool[p1.Length + p2.Length]; Array.Copy(p1, p3, p1.Length); @@ -129,11 +138,15 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r, p3); + + response(new MyClass_OpBoolSResult(r, p3)); } - public override void opBoolSS_async(Test.AMD_MyClass_opBoolSS cb, bool[][] p1, bool[][] p2, - Ice.Current current) + public override void + opBoolSSAsync(bool[][] p1, bool[][] p2, + Action<MyClass_OpBoolSSResult> response, + Action<Exception> exception, + Ice.Current current) { bool[][] p3 = new bool[p1.Length + p2.Length][]; Array.Copy(p1, p3, p1.Length); @@ -144,16 +157,24 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r, p3); + + response(new MyClass_OpBoolSSResult(r, p3)); } - public override void opByte_async(Test.AMD_MyClass_opByte cb, byte p1, byte p2, Ice.Current current) + public override void opByteAsync(byte p1, byte p2, + Action<MyClass_OpByteResult> response, + Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, (byte)(p1 ^ p2)); + response(new MyClass_OpByteResult(p1, (byte)(p1 ^ p2))); } - public override void opByteBoolD_async(Test.AMD_MyClass_opByteBoolD cb, Dictionary<byte, bool> p1, - Dictionary<byte, bool> p2, Ice.Current current) + public override void + opByteBoolDAsync(Dictionary<byte, bool> p1, + Dictionary<byte, bool> p2, + Action<MyClass_OpByteBoolDResult> response, + Action<Exception> exception, + Ice.Current current) { Dictionary<byte, bool> p3 = p1; Dictionary<byte, bool> r = new Dictionary<byte, bool>(); @@ -165,10 +186,15 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + + response(new MyClass_OpByteBoolDResult(r, p3)); } - public override void opByteS_async(Test.AMD_MyClass_opByteS cb, byte[] p1, byte[] p2, Ice.Current current) + public override void + opByteSAsync(byte[] p1, byte[] p2, + Action<MyClass_OpByteSResult> response, + Action<Exception> exception, + Ice.Current current) { byte[] p3 = new byte[p1.Length]; for(int i = 0; i < p1.Length; i++) @@ -179,11 +205,15 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass byte[] r = new byte[p1.Length + p2.Length]; Array.Copy(p1, r, p1.Length); Array.Copy(p2, 0, r, p1.Length, p2.Length); - cb.ice_response(r, p3); + + response(new MyClass_OpByteSResult(r, p3)); } - public override void opByteSS_async(Test.AMD_MyClass_opByteSS cb, byte[][] p1, byte[][] p2, - Ice.Current current) + public override void + opByteSSAsync(byte[][] p1, byte[][] p2, + Action<MyClass_OpByteSSResult> response, + Action<Exception> exception, + Ice.Current current) { byte[][] p3 = new byte[p1.Length][]; for(int i = 0; i < p1.Length; i++) @@ -194,17 +224,23 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass byte[][] r = new byte[p1.Length + p2.Length][]; Array.Copy(p1, r, p1.Length); Array.Copy(p2, 0, r, p1.Length, p2.Length); - cb.ice_response(r, p3); + + response(new MyClass_OpByteSSResult(r, p3)); } - public override void opFloatDouble_async(Test.AMD_MyClass_opFloatDouble cb, float p1, double p2, - Ice.Current current) + public override void opFloatDoubleAsync(float p1, double p2, + Action<MyClass_OpFloatDoubleResult> response, + Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p2, p1, p2); + response(new MyClass_OpFloatDoubleResult(p2, p1, p2)); } - public override void opFloatDoubleS_async(Test.AMD_MyClass_opFloatDoubleS cb, float[] p1, double[] p2, - Ice.Current current) + public override void + opFloatDoubleSAsync(float[] p1, double[] p2, + Action<MyClass_OpFloatDoubleSResult> response, + Action<Exception> exception, + Ice.Current current) { float[] p3 = p1; @@ -218,40 +254,48 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass Array.Copy(p2, r, p2.Length); for(int i = 0; i < p1.Length; i++) { - r[p2.Length + i] = (double)p1[i]; + r[p2.Length + i] = p1[i]; } - cb.ice_response(r, p3, p4); + + response(new MyClass_OpFloatDoubleSResult(r, p3, p4)); } - public override void opFloatDoubleSS_async(Test.AMD_MyClass_opFloatDoubleSS cb, float[][] p1, double[][] p2, - Ice.Current current) + public override void + opFloatDoubleSSAsync(float[][] p1, double[][] p2, + Action<MyClass_OpFloatDoubleSSResult> response, + Action<Exception> exception, + Ice.Current current) { - float[][] p3 = p1; + var p3 = p1; - double[][] p4 = new double[p2.Length][]; + var p4 = new double[p2.Length][]; for(int i = 0; i < p2.Length; i++) { p4[i] = p2[p2.Length - (i + 1)]; } - double[][] r = new double[p2.Length + p2.Length][]; + var r = new double[p2.Length + p2.Length][]; Array.Copy(p2, r, p2.Length); for(int i = 0; i < p2.Length; i++) { r[p2.Length + i] = new double[p2[i].Length]; for(int j = 0; j < p2[i].Length; j++) { - r[p2.Length + i][j] = (double)p2[i][j]; + r[p2.Length + i][j] = p2[i][j]; } } - cb.ice_response(r, p3, p4); + + response(new MyClass_OpFloatDoubleSSResult(r, p3, p4)); } - public override void opLongFloatD_async(Test.AMD_MyClass_opLongFloatD cb, Dictionary<long, float> p1, - Dictionary<long, float> p2, Ice.Current current) + public override void + opLongFloatDAsync(Dictionary<long, float> p1, Dictionary<long, float> p2, + Action<MyClass_OpLongFloatDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<long, float> p3 = p1; - Dictionary<long, float> r = new Dictionary<long, float>(); + var p3 = p1; + var r = new Dictionary<long, float>(); foreach(KeyValuePair<long, float> e in p1) { r[e.Key] = e.Value; @@ -260,27 +304,35 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + + response(new MyClass_OpLongFloatDResult(r, p3)); } - public override void opMyClass_async(Test.AMD_MyClass_opMyClass cb, Test.MyClassPrx p1, Ice.Current current) + public override void + opMyClassAsync(MyClassPrx p1, Action<MyClass_OpMyClassResult> response, + Action<Exception> exception, Ice.Current current) { - Test.MyClassPrx p2 = p1; - Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( + var p2 = p1; + var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); - cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); + response(new MyClass_OpMyClassResult( + MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)); } - public override void opMyEnum_async(Test.AMD_MyClass_opMyEnum cb, Test.MyEnum p1, Ice.Current current) + public override void + opMyEnumAsync(MyEnum p1, Action<MyClass_OpMyEnumResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(Test.MyEnum.enum3, p1); + response(new MyClass_OpMyEnumResult(MyEnum.enum3, p1)); } - public override void opShortIntD_async(Test.AMD_MyClass_opShortIntD cb, Dictionary<short, int> p1, - Dictionary<short, int> p2, Ice.Current current) + public override void + opShortIntDAsync(Dictionary<short, int> p1, Dictionary<short, int> p2, + Action<MyClass_OpShortIntDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<short, int> p3 = p1; - Dictionary<short, int> r = new Dictionary<short, int>(); + var p3 = p1; + var r = new Dictionary<short, int>(); foreach(KeyValuePair<short, int> e in p1) { r[e.Key] = e.Value; @@ -289,59 +341,73 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpShortIntDResult(r, p3)); } - public override void opShortIntLong_async(Test.AMD_MyClass_opShortIntLong cb, short p1, int p2, long p3, - Ice.Current current) + public override void + opShortIntLongAsync(short p1, int p2, long p3, + Action<MyClass_OpShortIntLongResult> response, + Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p3, p1, p2, p3); + response(new MyClass_OpShortIntLongResult(p3, p1, p2, p3)); } - public override void opShortIntLongS_async(Test.AMD_MyClass_opShortIntLongS cb, short[] p1, int[] p2, - long[] p3, Ice.Current current) + public override void + opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, + Action<MyClass_OpShortIntLongSResult> response, + Action<Exception> exception, + Ice.Current current) { - short[] p4 = p1; - - int[] p5 = new int[p2.Length]; + var p4 = p1; + var p5 = new int[p2.Length]; for(int i = 0; i < p2.Length; i++) { p5[i] = p2[p2.Length - (i + 1)]; } - - long[] p6 = new long[p3.Length + p3.Length]; + var p6 = new long[p3.Length + p3.Length]; Array.Copy(p3, p6, p3.Length); Array.Copy(p3, 0, p6, p3.Length, p3.Length); - cb.ice_response(p3, p4, p5, p6); + response(new MyClass_OpShortIntLongSResult(p3, p4, p5, p6)); } - public override void opShortIntLongSS_async(Test.AMD_MyClass_opShortIntLongSS cb, short[][] p1, - int[][] p2, long[][] p3, Ice.Current current) + public override void + opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, + Action<MyClass_OpShortIntLongSSResult> response, + Action<Exception> exception, + Ice.Current current) { - short[][] p4 = p1; + var p4 = p1; - int[][] p5 = new int[p2.Length][]; + var p5 = new int[p2.Length][]; for(int i = 0; i < p2.Length; i++) { p5[i] = p2[p2.Length - (i + 1)]; } - long[][] p6 = new long[p3.Length + p3.Length][]; + var p6 = new long[p3.Length + p3.Length][]; Array.Copy(p3, p6, p3.Length); Array.Copy(p3, 0, p6, p3.Length, p3.Length); - cb.ice_response(p3, p4, p5, p6); + response(new MyClass_OpShortIntLongSSResult(p3, p4, p5, p6)); } - public override void opString_async(Test.AMD_MyClass_opString cb, string p1, string p2, Ice.Current current) + public override void + opStringAsync(string p1, string p2, + Action<MyClass_OpStringResult> response, + Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1 + " " + p2, p2 + " " + p1); + response(new MyClass_OpStringResult(p1 + " " + p2, p2 + " " + p1)); } - public override void opStringMyEnumD_async(Test.AMD_MyClass_opStringMyEnumD cb, Dictionary<string, Test.MyEnum> p1, - Dictionary<string, Test.MyEnum> p2, Ice.Current current) + public override void + opStringMyEnumDAsync(Dictionary<string, MyEnum> p1, Dictionary<string, MyEnum> p2, + Action<MyClass_OpStringMyEnumDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<string, Test.MyEnum> p3 = p1; - Dictionary<string, Test.MyEnum> r = new Dictionary<string, Test.MyEnum>(); + var p3 = p1; + var r = new Dictionary<string, Test.MyEnum>(); foreach(KeyValuePair<string, Test.MyEnum> e in p1) { r[e.Key] = e.Value; @@ -350,186 +416,209 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpStringMyEnumDResult(r, p3)); } - public override void opMyEnumStringD_async(Test.AMD_MyClass_opMyEnumStringD cb, Dictionary<Test.MyEnum, string> p1, - Dictionary<Test.MyEnum, string> p2, Ice.Current current) + public override void + opMyEnumStringDAsync(Dictionary<MyEnum, string> p1, Dictionary<MyEnum, string> p2, + Action<MyClass_OpMyEnumStringDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyEnum, string> p3 = p1; - Dictionary<Test.MyEnum, string> r = new Dictionary<Test.MyEnum, string>(); - foreach(KeyValuePair<Test.MyEnum, string> e in p1) + var p3 = p1; + var r = new Dictionary<MyEnum, string>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<Test.MyEnum, string> e in p2) + foreach(KeyValuePair<MyEnum, string> e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpMyEnumStringDResult(r, p3)); } - public override void opMyStructMyEnumD_async(Test.AMD_MyClass_opMyStructMyEnumD cb, - Dictionary<Test.MyStruct, Test.MyEnum> p1, - Dictionary<Test.MyStruct, Test.MyEnum> p2, Ice.Current current) + public override void + opMyStructMyEnumDAsync(Dictionary<MyStruct, MyEnum> p1, + Dictionary<MyStruct, MyEnum> p2, + Action<MyClass_OpMyStructMyEnumDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyStruct, Test.MyEnum> p3 = p1; - Dictionary<Test.MyStruct, Test.MyEnum> r = new Dictionary<Test.MyStruct, Test.MyEnum>(); - foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p1) + var p3 = p1; + var r = new Dictionary<MyStruct, MyEnum>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpMyStructMyEnumDResult(r, p3)); } - public override void opByteBoolDS_async(Test.AMD_MyClass_opByteBoolDS cb, - Dictionary<byte, bool>[] p1, - Dictionary<byte, bool>[] p2, - Ice.Current current) + public override void + opByteBoolDSAsync(Dictionary<byte, bool>[] p1, + Dictionary<byte, bool>[] p2, + Action<MyClass_OpByteBoolDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<byte, bool>[] p3 = new Dictionary<byte, bool>[p1.Length + p2.Length]; + var p3 = new Dictionary<byte, bool>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<byte, bool>[] r = new Dictionary<byte, bool>[p1.Length]; + var r = new Dictionary<byte, bool>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpByteBoolDSResult(r, p3)); } - public override void opShortIntDS_async(Test.AMD_MyClass_opShortIntDS cb, - Dictionary<short, int>[] p1, - Dictionary<short, int>[] p2, - Ice.Current current) + public override void + opShortIntDSAsync(Dictionary<short, int>[] p1, Dictionary<short, int>[] p2, + Action<MyClass_OpShortIntDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<short, int>[] p3 = new Dictionary<short, int>[p1.Length + p2.Length]; + var p3 = new Dictionary<short, int>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<short, int>[] r = new Dictionary<short, int>[p1.Length]; + var r = new Dictionary<short, int>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpShortIntDSResult(r, p3)); } - public override void opLongFloatDS_async(Test.AMD_MyClass_opLongFloatDS cb, - Dictionary<long, float>[] p1, - Dictionary<long, float>[] p2, - Ice.Current current) + public override void + opLongFloatDSAsync(Dictionary<long, float>[] p1, + Dictionary<long, float>[] p2, + Action<MyClass_OpLongFloatDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<long, float>[] p3 = new Dictionary<long, float>[p1.Length + p2.Length]; + var p3 = new Dictionary<long, float>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<long, float>[] r = new Dictionary<long, float>[p1.Length]; + var r = new Dictionary<long, float>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpLongFloatDSResult(r, p3)); } - public override void opStringStringDS_async(Test.AMD_MyClass_opStringStringDS cb, - Dictionary<string, string>[] p1, - Dictionary<string, string>[] p2, - Ice.Current current) + public override void + opStringStringDSAsync(Dictionary<string, string>[] p1, + Dictionary<string, string>[] p2, + Action<MyClass_OpStringStringDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<string, string>[] p3 = new Dictionary<string, string>[p1.Length + p2.Length]; + var p3 = new Dictionary<string, string>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<string, string>[] r = new Dictionary<string, string>[p1.Length]; + var r = new Dictionary<string, string>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpStringStringDSResult(r, p3)); } - public override void opStringMyEnumDS_async(Test.AMD_MyClass_opStringMyEnumDS cb, - Dictionary<string, Test.MyEnum>[] p1, - Dictionary<string, Test.MyEnum>[] p2, - Ice.Current current) + public override void + opStringMyEnumDSAsync(Dictionary<string, MyEnum>[] p1, + Dictionary<string, MyEnum>[] p2, + Action<MyClass_OpStringMyEnumDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<string, Test.MyEnum>[] p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length]; + var p3 = new Dictionary<string, MyEnum>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<string, Test.MyEnum>[] r = new Dictionary<string, Test.MyEnum>[p1.Length]; + var r = new Dictionary<string, MyEnum>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpStringMyEnumDSResult(r, p3)); } - public override void opMyEnumStringDS_async(Test.AMD_MyClass_opMyEnumStringDS cb, - Dictionary<Test.MyEnum, string>[] p1, - Dictionary<Test.MyEnum, string>[] p2, - Ice.Current current) + public override void + opMyEnumStringDSAsync(Dictionary<MyEnum, string>[] p1, + Dictionary<MyEnum, string>[] p2, + Action<MyClass_OpMyEnumStringDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyEnum, string>[] p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length]; + var p3 = new Dictionary<MyEnum, string>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<Test.MyEnum, string>[] r = new Dictionary<Test.MyEnum, string>[p1.Length]; + var r = new Dictionary<MyEnum, string>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpMyEnumStringDSResult(r, p3)); } - public override void opMyStructMyEnumDS_async(Test.AMD_MyClass_opMyStructMyEnumDS cb, - Dictionary<Test.MyStruct, Test.MyEnum>[] p1, - Dictionary<Test.MyStruct, Test.MyEnum>[] p2, - Ice.Current current) + public override void + opMyStructMyEnumDSAsync(Dictionary<MyStruct, MyEnum>[] p1, + Dictionary<MyStruct, MyEnum>[] p2, + Action<MyClass_OpMyStructMyEnumDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyStruct, Test.MyEnum>[] p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length]; + var p3 = new Dictionary<MyStruct, MyEnum>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - Dictionary<Test.MyStruct, Test.MyEnum>[] r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length]; + var r = new Dictionary<MyStruct, MyEnum>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpMyStructMyEnumDSResult(r, p3)); } - public override void opByteByteSD_async(Test.AMD_MyClass_opByteByteSD cb, - Dictionary<byte, byte[]> p1, - Dictionary<byte, byte[]> p2, - Ice.Current current) + public override void + opByteByteSDAsync(Dictionary<byte, byte[]> p1, + Dictionary<byte, byte[]> p2, + Action<MyClass_OpByteByteSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<byte, byte[]> p3 = p2; - Dictionary<byte, byte[]> r = new Dictionary<byte, byte[]>(); - foreach(KeyValuePair<byte, byte[]> e in p1) + var p3 = p2; + var r = new Dictionary<byte, byte[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<byte, byte[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpByteByteSDResult(r, p3)); } - public override void opBoolBoolSD_async(Test.AMD_MyClass_opBoolBoolSD cb, - Dictionary<bool, bool[]> p1, - Dictionary<bool, bool[]> p2, - Ice.Current current) + public override void + opBoolBoolSDAsync(Dictionary<bool, bool[]> p1, + Dictionary<bool, bool[]> p2, + Action<MyClass_OpBoolBoolSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<bool, bool[]> p3 = p2; - Dictionary<bool, bool[]> r = new Dictionary<bool, bool[]>(); + var p3 = p2; + var r = new Dictionary<bool, bool[]>(); foreach(KeyValuePair<bool, bool[]> e in p1) { r[e.Key] = e.Value; @@ -538,416 +627,459 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpBoolBoolSDResult(r, p3)); } - public override void opShortShortSD_async(Test.AMD_MyClass_opShortShortSD cb, - Dictionary<short, short[]> p1, - Dictionary<short, short[]> p2, - Ice.Current current) + public override void + opShortShortSDAsync(Dictionary<short, short[]> p1, + Dictionary<short, short[]> p2, + Action<MyClass_OpShortShortSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<short, short[]> p3 = p2; - Dictionary<short, short[]> r = new Dictionary<short, short[]>(); - foreach(KeyValuePair<short, short[]> e in p1) + var p3 = p2; + var r = new Dictionary<short, short[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<short, short[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpShortShortSDResult(r, p3)); } - public override void opIntIntSD_async(Test.AMD_MyClass_opIntIntSD cb, - Dictionary<int, int[]> p1, - Dictionary<int, int[]> p2, - Ice.Current current) + public override void + opIntIntSDAsync(Dictionary<int, int[]> p1, + Dictionary<int, int[]> p2, + Action<MyClass_OpIntIntSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<int, int[]> p3 = p2; - Dictionary<int, int[]> r = new Dictionary<int, int[]>(); - foreach(KeyValuePair<int, int[]> e in p1) + var p3 = p2; + var r = new Dictionary<int, int[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<int, int[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpIntIntSDResult(r, p3)); } - public override void opLongLongSD_async(Test.AMD_MyClass_opLongLongSD cb, - Dictionary<long, long[]> p1, - Dictionary<long, long[]> p2, - Ice.Current current) + public override void + opLongLongSDAsync(Dictionary<long, long[]> p1, + Dictionary<long, long[]> p2, + Action<MyClass_OpLongLongSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<long, long[]> p3 = p2; - Dictionary<long, long[]> r = new Dictionary<long, long[]>(); - foreach(KeyValuePair<long, long[]> e in p1) + var p3 = p2; + var r = new Dictionary<long, long[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<long, long[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpLongLongSDResult(r, p3)); } - public override void opStringFloatSD_async(Test.AMD_MyClass_opStringFloatSD cb, - Dictionary<string, float[]> p1, - Dictionary<string, float[]> p2, - Ice.Current current) + public override void + opStringFloatSDAsync(Dictionary<string, float[]> p1, + Dictionary<string, float[]> p2, + Action<MyClass_OpStringFloatSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<string, float[]> p3 = p2; - Dictionary<string, float[]> r = new Dictionary<string, float[]>(); - foreach(KeyValuePair<string, float[]> e in p1) + var p3 = p2; + var r = new Dictionary<string, float[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, float[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpStringFloatSDResult(r, p3)); } - public override void opStringDoubleSD_async(Test.AMD_MyClass_opStringDoubleSD cb, - Dictionary<string, double[]> p1, - Dictionary<string, double[]> p2, - Ice.Current current) + public override void + opStringDoubleSDAsync(Dictionary<string, double[]> p1, + Dictionary<string, double[]> p2, + Action<MyClass_OpStringDoubleSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<string, double[]> p3 = p2; - Dictionary<string, double[]> r = new Dictionary<string, double[]>(); - foreach(KeyValuePair<string, double[]> e in p1) + var p3 = p2; + var r = new Dictionary<string, double[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, double[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpStringDoubleSDResult(r, p3)); } - public override void opStringStringSD_async(Test.AMD_MyClass_opStringStringSD cb, - Dictionary<string, string[]> p1, - Dictionary<string, string[]> p2, - Ice.Current current) + public override void + opStringStringSDAsync(Dictionary<string, string[]> p1, + Dictionary<string, string[]> p2, + Action<MyClass_OpStringStringSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<string, string[]> p3 = p2; - Dictionary<string, string[]> r = new Dictionary<string, string[]>(); - foreach(KeyValuePair<string, string[]> e in p1) + var p3 = p2; + var r = new Dictionary<string, string[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, string[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpStringStringSDResult(r, p3)); } - public override void opMyEnumMyEnumSD_async(Test.AMD_MyClass_opMyEnumMyEnumSD cb, - Dictionary<Test.MyEnum, Test.MyEnum[]> p1, - Dictionary<Test.MyEnum, Test.MyEnum[]> p2, - Ice.Current ice) + public override void + opMyEnumMyEnumSDAsync(Dictionary<MyEnum, MyEnum[]> p1, + Dictionary<MyEnum, MyEnum[]> p2, + Action<MyClass_OpMyEnumMyEnumSDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyEnum, Test.MyEnum[]> p3 = p2; - Dictionary<Test.MyEnum, Test.MyEnum[]> r = new Dictionary<Test.MyEnum, Test.MyEnum[]>(); - foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p1) + var p3 = p2; + var r = new Dictionary<Test.MyEnum, Test.MyEnum[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpMyEnumMyEnumSDResult(r, p3)); } - public override void opIntS_async(Test.AMD_MyClass_opIntS cb, int[] s, Ice.Current current) + public override void opIntSAsync(int[] s, + Action<int[]> response, + Action<Exception> exception, + Ice.Current current) { - int[] r = new int[s.Length]; + var r = new int[s.Length]; for(int i = 0; i < s.Length; ++i) { r[i] = -s[i]; } - cb.ice_response(r); + response(r); } - public override void opContext_async(Test.AMD_MyClass_opContext cb, Ice.Current current) + public override void opContextAsync(Action<Dictionary<string, string>> response, + Action<Exception> exception, + Ice.Current current) { - cb.ice_response(current.ctx); + response(current.ctx); } - public override void opByteSOneway_async(Test.AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current) + public override void opByteSOnewayAsync(byte[] s, Action response, + Action<Exception> exception, + Ice.Current current) { lock(this) { ++_opByteSOnewayCallCount; } - cb.ice_response(); + response(); } - public override void opByteSOnewayCallCount_async(Test.AMD_MyClass_opByteSOnewayCallCount cb, Ice.Current current) + public override void opByteSOnewayCallCountAsync(Action<int> response, + Action<Exception> exeption, + Ice.Current current) { lock(this) { - int count = _opByteSOnewayCallCount; + var count = _opByteSOnewayCallCount; _opByteSOnewayCallCount = 0; - cb.ice_response(count); + response(count); } } - public override void opDoubleMarshaling_async(Test.AMD_MyClass_opDoubleMarshaling cb, double p1, double[] p2, - Ice.Current current) + public override void opDoubleMarshalingAsync(double p1, double[] p2, Action response, + Action<Exception> exception, Ice.Current current) { - double d = 1278312346.0 / 13.0; + var d = 1278312346.0 / 13.0; test(p1 == d); for(int i = 0; i < p2.Length; ++i) { test(p2[i] == d); } - cb.ice_response(); + response(); } - public override void opStringS_async(Test.AMD_MyClass_opStringS cb, string[] p1, string[] p2, - Ice.Current current) + public override void + opStringSAsync(string[] p1, string[] p2, + Action<MyClass_OpStringSResult> response, + Action<Exception> exception, + Ice.Current current) { - string[] p3 = new string[p1.Length + p2.Length]; + var p3 = new string[p1.Length + p2.Length]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - string[] r = new string[p1.Length]; + var r = new string[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r, p3); + response(new MyClass_OpStringSResult(r, p3)); } - public override void opStringSS_async(Test.AMD_MyClass_opStringSS cb, string[][] p1, string[][] p2, - Ice.Current current) + public override void + opStringSSAsync(string[][] p1, string[][] p2, Action<MyClass_OpStringSSResult> response, + Action<Exception> exception, Ice.Current current) { - string[][] p3 = new string[p1.Length + p2.Length][]; + var p3 = new string[p1.Length + p2.Length][]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - - string[][] r = new string[p2.Length][]; + var r = new string[p2.Length][]; for(int i = 0; i < p2.Length; i++) { r[i] = p2[p2.Length - (i + 1)]; } - cb.ice_response(r, p3); + response(new MyClass_OpStringSSResult(r, p3)); } - public override void opStringSSS_async(Test.AMD_MyClass_opStringSSS cb, string[][][] p1, string[][][] p2, - Ice.Current current) + public override void + opStringSSSAsync(string[][][] p1, string[][][] p2, Action<MyClass_OpStringSSSResult> response, + Action<Exception> exception, Ice.Current current) { - string[][][] p3 = new string[p1.Length + p2.Length][][]; + var p3 = new string[p1.Length + p2.Length][][]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - string[][][] r = new string[p2.Length][][]; + var r = new string[p2.Length][][]; for(int i = 0; i < p2.Length; i++) { r[i] = p2[p2.Length - (i + 1)]; } - cb.ice_response(r, p3); + response(new MyClass_OpStringSSSResult(r, p3)); } - public override void opStringStringD_async(Test.AMD_MyClass_opStringStringD cb, Dictionary<string, string> p1, - Dictionary<string, string> p2, Ice.Current current) + public override void + opStringStringDAsync(Dictionary<string, string> p1, Dictionary<string, string> p2, + Action<MyClass_OpStringStringDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, string> p3 = p1; - Dictionary<string, string> r = new Dictionary<string, string>(); - foreach(KeyValuePair<string, string> e in p1) + var p3 = p1; + var r = new Dictionary<string, string>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, string> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpStringStringDResult(r, p3)); } - public override void opStruct_async(Test.AMD_MyClass_opStruct cb, Test.Structure p1, Test.Structure p2, - Ice.Current current) + public override void + opStructAsync(Structure p1, Structure p2, Action<MyClass_OpStructResult> response, + Action<Exception> exception, Ice.Current current) { - Test.Structure p3 = p1; + var p3 = p1; p3.s.s = "a new string"; - cb.ice_response(p2, p3); + response(new MyClass_OpStructResult(p2, p3)); } - public override void opIdempotent_async(Test.AMD_MyClass_opIdempotent cb, Ice.Current current) + public override void opIdempotentAsync(Action response, Action<Exception> exception, Ice.Current current) { test(current.mode == Ice.OperationMode.Idempotent); - cb.ice_response(); + response(); } - public override void opNonmutating_async(Test.AMD_MyClass_opNonmutating cb, Ice.Current current) + public override void opNonmutatingAsync(Action response, Action<Exception> exception, Ice.Current current) { test(current.mode == Ice.OperationMode.Nonmutating); - cb.ice_response(); + response(); } - public override void opDerived_async(Test.AMD_MyDerivedClass_opDerived cb, Ice.Current current) + public override void opDerivedAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void opByte1_async(Test.AMD_MyClass_opByte1 cb, byte value, Ice.Current current) + public override void opByte1Async(byte value, Action<byte> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opShort1_async(Test.AMD_MyClass_opShort1 cb, short value, Ice.Current current) + public override void opShort1Async(short value, Action<short> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opInt1_async(Test.AMD_MyClass_opInt1 cb, int value, Ice.Current current) + public override void opInt1Async(int value, Action<int> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opLong1_async(Test.AMD_MyClass_opLong1 cb, long value, Ice.Current current) + public override void opLong1Async(long value, Action<long> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opFloat1_async(Test.AMD_MyClass_opFloat1 cb, float value, Ice.Current current) + public override void opFloat1Async(float value, Action<float> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opDouble1_async(Test.AMD_MyClass_opDouble1 cb, double value, Ice.Current current) + public override void opDouble1Async(double value, Action<double> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opString1_async(Test.AMD_MyClass_opString1 cb, string value, Ice.Current current) + public override void opString1Async(string value, Action<string> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opStringS1_async(Test.AMD_MyClass_opStringS1 cb, string[] value, Ice.Current current) + public override void opStringS1Async(string[] value, Action<string[]> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opByteBoolD1_async(Test.AMD_MyClass_opByteBoolD1 cb, Dictionary<byte, bool> value, - Ice.Current current) + public override void + opByteBoolD1Async(Dictionary<byte, bool> value, Action<Dictionary<byte, bool>> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opStringS2_async(Test.AMD_MyClass_opStringS2 cb, string[] value, Ice.Current current) + public override void + opStringS2Async(string[] value, Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opByteBoolD2_async(Test.AMD_MyClass_opByteBoolD2 cb, Dictionary<byte, bool> value, - Ice.Current current) + public override void + opByteBoolD2Async(Dictionary<byte, bool> value, Action<Dictionary<byte, bool>> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opMyClass1_async(Test.AMD_MyDerivedClass_opMyClass1 cb, Test.MyClass1 value, - Ice.Current current) + public override void + opMyClass1Async(MyClass1 value, Action<MyClass1> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opMyStruct1_async(Test.AMD_MyDerivedClass_opMyStruct1 cb, Test.MyStruct1 value, - Ice.Current current) + public override void + opMyStruct1Async(MyStruct1 value, Action<MyStruct1> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - public override void opStringLiterals_async(Test.AMD_MyClass_opStringLiterals cb, Ice.Current current) + public override void + opStringLiteralsAsync(Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(new string[] + response(new string[] { - Test.s0.value, - Test.s1.value, - Test.s2.value, - Test.s3.value, - Test.s4.value, - Test.s5.value, - Test.s6.value, - Test.s7.value, - Test.s8.value, - Test.s9.value, - Test.s10.value, + s0.value, + s1.value, + s2.value, + s3.value, + s4.value, + s5.value, + s6.value, + s7.value, + s8.value, + s9.value, + s10.value, - Test.sw0.value, - Test.sw1.value, - Test.sw2.value, - Test.sw3.value, - Test.sw4.value, - Test.sw5.value, - Test.sw6.value, - Test.sw7.value, - Test.sw8.value, - Test.sw9.value, - Test.sw10.value, + sw0.value, + sw1.value, + sw2.value, + sw3.value, + sw4.value, + sw5.value, + sw6.value, + sw7.value, + sw8.value, + sw9.value, + sw10.value, - Test.ss0.value, - Test.ss1.value, - Test.ss2.value, - Test.ss3.value, - Test.ss4.value, - Test.ss5.value, + ss0.value, + ss1.value, + ss2.value, + ss3.value, + ss4.value, + ss5.value, - Test.su0.value, - Test.su1.value, - Test.su2.value + su0.value, + su1.value, + su2.value }); } - public override void opWStringLiterals_async(Test.AMD_MyClass_opWStringLiterals cb, Ice.Current current) + public override void + opWStringLiteralsAsync(Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(new string[] + response(new string[] { - Test.s0.value, - Test.s1.value, - Test.s2.value, - Test.s3.value, - Test.s4.value, - Test.s5.value, - Test.s6.value, - Test.s7.value, - Test.s8.value, - Test.s9.value, - Test.s10.value, + s0.value, + s1.value, + s2.value, + s3.value, + s4.value, + s5.value, + s6.value, + s7.value, + s8.value, + s9.value, + s10.value, - Test.sw0.value, - Test.sw1.value, - Test.sw2.value, - Test.sw3.value, - Test.sw4.value, - Test.sw5.value, - Test.sw6.value, - Test.sw7.value, - Test.sw8.value, - Test.sw9.value, - Test.sw10.value, + sw0.value, + sw1.value, + sw2.value, + sw3.value, + sw4.value, + sw5.value, + sw6.value, + sw7.value, + sw8.value, + sw9.value, + sw10.value, - Test.ss0.value, - Test.ss1.value, - Test.ss2.value, - Test.ss3.value, - Test.ss4.value, - Test.ss5.value, + ss0.value, + ss1.value, + ss2.value, + ss3.value, + ss4.value, + ss5.value, - Test.su0.value, - Test.su1.value, - Test.su2.value + su0.value, + su1.value, + su2.value }); } diff --git a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs index 28fde5adf6e..3a7655e5878 100644 --- a/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs +++ b/csharp/test/Ice/operations/MyDerivedClassAMDTieI.cs @@ -10,19 +10,21 @@ using System; using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; +using Test; -public sealed class MyDerivedClassI : Test.MyDerivedClassTie_ +public sealed class MyDerivedClassI : MyDerivedClassTie_ { public MyDerivedClassI() : base(new MyDerivedClassTieI()) { } } -public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ +public sealed class MyDerivedClassTieI : MyDerivedClassOperations_ { private static void test(bool b) { - if (!b) + if(!b) { throw new Exception(); } @@ -30,9 +32,9 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ internal class Thread_opVoid { - public Thread_opVoid(Test.AMD_MyClass_opVoid cb) + public Thread_opVoid(Action response) { - _cb = cb; + _response = response; } public void Start() @@ -46,7 +48,7 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ public void Run() { - _cb.ice_response(); + _response(); } public void Join() @@ -57,11 +59,11 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ } } - private Test.AMD_MyClass_opVoid _cb; + private Action _response; private Thread _thread; } - public void shutdown_async(Test.AMD_MyClass_shutdown cb, Ice.Current current) + public void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { while(_opVoidThread != null) { @@ -70,16 +72,16 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ } current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public void delay_async(Test.AMD_MyClass_delay cb, int ms, Ice.Current current) + public async void delayAsync(int ms, Action response, Action<Exception> exception, Ice.Current current) { - Thread.Sleep(ms); - cb.ice_response(); + await Task.Delay(ms); + response(); } - public void opVoid_async(Test.AMD_MyClass_opVoid cb, Ice.Current current) + public void opVoidAsync(Action response, Action<Exception> exception, Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); @@ -88,845 +90,886 @@ public sealed class MyDerivedClassTieI : Test.MyDerivedClassOperations_ _opVoidThread.Join(); _opVoidThread = null; } - - _opVoidThread = new Thread_opVoid(cb); + _opVoidThread = new Thread_opVoid(response); _opVoidThread.Start(); } - public void opBool_async(Test.AMD_MyClass_opBool cb, bool p1, bool p2, Ice.Current current) + public void + opBoolAsync(bool p1, bool p2, Action<MyClass_OpBoolResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p2, p1); + response(new MyClass_OpBoolResult(p2, p1)); } - public void opBoolS_async(Test.AMD_MyClass_opBoolS cb, bool[] p1, bool[] p2, Ice.Current current) + public void + opBoolSAsync(bool[] p1, bool[] p2, Action<MyClass_OpBoolSResult> response, Action<Exception> exception, + Ice.Current current) { - bool[] p3 = new bool[p1.Length + p2.Length]; + var p3 = new bool[p1.Length + p2.Length]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - bool[] r = new bool[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var r = new bool[p1.Length]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r, p3); + + response(new MyClass_OpBoolSResult(r, p3)); } - public void opBoolSS_async(Test.AMD_MyClass_opBoolSS cb, bool[][] p1, bool[][] p2, - Ice.Current current) + public void + opBoolSSAsync(bool[][] p1, bool[][] p2, Action<MyClass_OpBoolSSResult> response, Action<Exception> exception, + Ice.Current current) { - bool[][] p3 = new bool[p1.Length + p2.Length][]; + var p3 = new bool[p1.Length + p2.Length][]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - bool[][] r = new bool[p1.Length][]; - for(int i = 0; i < p1.Length; i++) + var r = new bool[p1.Length][]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r, p3); + + response(new MyClass_OpBoolSSResult(r, p3)); } - public void opByte_async(Test.AMD_MyClass_opByte cb, byte p1, byte p2, Ice.Current current) + public void + opByteAsync(byte p1, byte p2, Action<MyClass_OpByteResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, (byte)(p1 ^ p2)); + response(new MyClass_OpByteResult(p1, (byte)(p1 ^ p2))); } - public void opByteBoolD_async(Test.AMD_MyClass_opByteBoolD cb, Dictionary<byte, bool> p1, - Dictionary<byte, bool> p2, Ice.Current current) + public void + opByteBoolDAsync(Dictionary<byte, bool> p1, Dictionary<byte, bool> p2, Action<MyClass_OpByteBoolDResult> response, + Action<Exception> exception, Ice.Current current) { - Dictionary<byte, bool> p3 = p1; - Dictionary<byte, bool> r = new Dictionary<byte, bool>(); - foreach(KeyValuePair<byte, bool> e in p1) + var p3 = p1; + var r = new Dictionary<byte, bool>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<byte, bool> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + + response(new MyClass_OpByteBoolDResult(r, p3)); } - public void opByteS_async(Test.AMD_MyClass_opByteS cb, byte[] p1, byte[] p2, Ice.Current current) + public void + opByteSAsync(byte[] p1, byte[] p2, Action<MyClass_OpByteSResult> response, Action<Exception> exception, + Ice.Current current) { - byte[] p3 = new byte[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var p3 = new byte[p1.Length]; + for(var i = 0; i < p1.Length; i++) { p3[i] = p1[p1.Length - (i + 1)]; } - byte[] r = new byte[p1.Length + p2.Length]; + var r = new byte[p1.Length + p2.Length]; Array.Copy(p1, r, p1.Length); Array.Copy(p2, 0, r, p1.Length, p2.Length); - cb.ice_response(r, p3); + + response(new MyClass_OpByteSResult(r, p3)); } - public void opByteSS_async(Test.AMD_MyClass_opByteSS cb, byte[][] p1, byte[][] p2, - Ice.Current current) + public void + opByteSSAsync(byte[][] p1, byte[][] p2, Action<MyClass_OpByteSSResult> response, Action<Exception> exception, + Ice.Current current) { - byte[][] p3 = new byte[p1.Length][]; - for(int i = 0; i < p1.Length; i++) + var p3 = new byte[p1.Length][]; + for(var i = 0; i < p1.Length; i++) { p3[i] = p1[p1.Length - (i + 1)]; } - byte[][] r = new byte[p1.Length + p2.Length][]; + var r = new byte[p1.Length + p2.Length][]; Array.Copy(p1, r, p1.Length); Array.Copy(p2, 0, r, p1.Length, p2.Length); - cb.ice_response(r, p3); + + response(new MyClass_OpByteSSResult(r, p3)); } - public void opFloatDouble_async(Test.AMD_MyClass_opFloatDouble cb, float p1, double p2, - Ice.Current current) + public void opFloatDoubleAsync(float p1, double p2, Action<MyClass_OpFloatDoubleResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p2, p1, p2); + response(new MyClass_OpFloatDoubleResult(p2, p1, p2)); } - public void opFloatDoubleS_async(Test.AMD_MyClass_opFloatDoubleS cb, float[] p1, double[] p2, - Ice.Current current) + public void + opFloatDoubleSAsync(float[] p1, double[] p2, Action<MyClass_OpFloatDoubleSResult> response, + Action<Exception> exception, Ice.Current current) { - float[] p3 = p1; - - double[] p4 = new double[p2.Length]; - for(int i = 0; i < p2.Length; i++) + var p3 = p1; + var p4 = new double[p2.Length]; + for(var i = 0; i < p2.Length; i++) { p4[i] = p2[p2.Length - (i + 1)]; } - - double[] r = new double[p2.Length + p1.Length]; + var r = new double[p2.Length + p1.Length]; Array.Copy(p2, r, p2.Length); - for(int i = 0; i < p1.Length; i++) + for(var i = 0; i < p1.Length; i++) { - r[p2.Length + i] = (double)p1[i]; + r[p2.Length + i] = p1[i]; } - cb.ice_response(r, p3, p4); + response(new MyClass_OpFloatDoubleSResult(r, p3, p4)); } - public void opFloatDoubleSS_async(Test.AMD_MyClass_opFloatDoubleSS cb, float[][] p1, double[][] p2, - Ice.Current current) + public void + opFloatDoubleSSAsync(float[][] p1, double[][] p2, Action<MyClass_OpFloatDoubleSSResult> response, + Action<Exception> exception, Ice.Current current) { - float[][] p3 = p1; - - double[][] p4 = new double[p2.Length][]; - for(int i = 0; i < p2.Length; i++) + var p3 = p1; + var p4 = new double[p2.Length][]; + for(var i = 0; i < p2.Length; i++) { p4[i] = p2[p2.Length - (i + 1)]; } - - double[][] r = new double[p2.Length + p2.Length][]; + var r = new double[p2.Length + p2.Length][]; Array.Copy(p2, r, p2.Length); - for(int i = 0; i < p2.Length; i++) + for(var i = 0; i < p2.Length; i++) { r[p2.Length + i] = new double[p2[i].Length]; - for(int j = 0; j < p2[i].Length; j++) + for(var j = 0; j < p2[i].Length; j++) { - r[p2.Length + i][j] = (double)p2[i][j]; + r[p2.Length + i][j] = p2[i][j]; } } - cb.ice_response(r, p3, p4); + response(new MyClass_OpFloatDoubleSSResult(r, p3, p4)); } - public void opLongFloatD_async(Test.AMD_MyClass_opLongFloatD cb, Dictionary<long, float> p1, - Dictionary<long, float> p2, Ice.Current current) + public void + opLongFloatDAsync(Dictionary<long, float> p1, Dictionary<long, float> p2, + Action<MyClass_OpLongFloatDResult> response, Action<Exception> exception, Ice.Current current) { - Dictionary<long, float> p3 = p1; - Dictionary<long, float> r = new Dictionary<long, float>(); - foreach(KeyValuePair<long, float> e in p1) + var p3 = p1; + var r = new Dictionary<long, float>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<long, float> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpLongFloatDResult(r, p3)); } - public void opMyClass_async(Test.AMD_MyClass_opMyClass cb, Test.MyClassPrx p1, Ice.Current current) + public void + opMyClassAsync(MyClassPrx p1, Action<MyClass_OpMyClassResult> response, Action<Exception> exception, + Ice.Current current) { - Test.MyClassPrx p2 = p1; - Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( + var p2 = p1; + var p3 = MyClassPrxHelper.uncheckedCast(current.adapter.createProxy( current.adapter.getCommunicator().stringToIdentity("noSuchIdentity"))); - cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); + response(new MyClass_OpMyClassResult( + MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3)); } - public void opMyEnum_async(Test.AMD_MyClass_opMyEnum cb, Test.MyEnum p1, Ice.Current current) + public void + opMyEnumAsync(MyEnum p1, Action<MyClass_OpMyEnumResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(Test.MyEnum.enum3, p1); + response(new MyClass_OpMyEnumResult(MyEnum.enum3, p1)); } - public void opShortIntD_async(Test.AMD_MyClass_opShortIntD cb, Dictionary<short, int> p1, - Dictionary<short, int> p2, Ice.Current current) + public void + opShortIntDAsync(Dictionary<short, int> p1, Dictionary<short, int> p2, Action<MyClass_OpShortIntDResult> response, + Action<Exception> exception, Ice.Current current) { - Dictionary<short, int> p3 = p1; - Dictionary<short, int> r = new Dictionary<short, int>(); - foreach(KeyValuePair<short, int> e in p1) + var p3 = p1; + var r = new Dictionary<short, int>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<short, int> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpShortIntDResult(r, p3)); } - public void opShortIntLong_async(Test.AMD_MyClass_opShortIntLong cb, short p1, int p2, long p3, - Ice.Current current) + public void + opShortIntLongAsync(short p1, int p2, long p3, Action<MyClass_OpShortIntLongResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p3, p1, p2, p3); + response(new MyClass_OpShortIntLongResult(p3, p1, p2, p3)); } - - public void opShortIntLongS_async(Test.AMD_MyClass_opShortIntLongS cb, short[] p1, int[] p2, - long[] p3, Ice.Current current) + public void + opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Action<MyClass_OpShortIntLongSResult> response, + Action<Exception> exception, Ice.Current current) { - short[] p4 = p1; - - int[] p5 = new int[p2.Length]; - for(int i = 0; i < p2.Length; i++) + var p4 = p1; + var p5 = new int[p2.Length]; + for(var i = 0; i < p2.Length; i++) { p5[i] = p2[p2.Length - (i + 1)]; } - - long[] p6 = new long[p3.Length + p3.Length]; + var p6 = new long[p3.Length + p3.Length]; Array.Copy(p3, p6, p3.Length); Array.Copy(p3, 0, p6, p3.Length, p3.Length); - cb.ice_response(p3, p4, p5, p6); + response(new MyClass_OpShortIntLongSResult(p3, p4, p5, p6)); } - public void opShortIntLongSS_async(Test.AMD_MyClass_opShortIntLongSS cb, short[][] p1, - int[][] p2, long[][] p3, Ice.Current current) + public void + opShortIntLongSSAsync(short[][] p1, int[][] p2, long[][] p3, Action<MyClass_OpShortIntLongSSResult> response, + Action<Exception> exception, Ice.Current current) { - short[][] p4 = p1; - - int[][] p5 = new int[p2.Length][]; - for(int i = 0; i < p2.Length; i++) + var p4 = p1; + var p5 = new int[p2.Length][]; + for(var i = 0; i < p2.Length; i++) { p5[i] = p2[p2.Length - (i + 1)]; } - - long[][] p6 = new long[p3.Length + p3.Length][]; + var p6 = new long[p3.Length + p3.Length][]; Array.Copy(p3, p6, p3.Length); Array.Copy(p3, 0, p6, p3.Length, p3.Length); - cb.ice_response(p3, p4, p5, p6); + response(new MyClass_OpShortIntLongSSResult(p3, p4, p5, p6)); } - public void opString_async(Test.AMD_MyClass_opString cb, string p1, string p2, Ice.Current current) + public void + opStringAsync(string p1, string p2, Action<MyClass_OpStringResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1 + " " + p2, p2 + " " + p1); + response(new MyClass_OpStringResult(p1 + " " + p2, p2 + " " + p1)); } - public void opStringMyEnumD_async(Test.AMD_MyClass_opStringMyEnumD cb, Dictionary<string, Test.MyEnum> p1, - Dictionary<string, Test.MyEnum> p2, Ice.Current current) + public void + opStringMyEnumDAsync(Dictionary<string, MyEnum> p1, Dictionary<string, MyEnum> p2, + Action<MyClass_OpStringMyEnumDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, Test.MyEnum> p3 = p1; - Dictionary<string, Test.MyEnum> r = new Dictionary<string, Test.MyEnum>(); - foreach(KeyValuePair<string, Test.MyEnum> e in p1) + var p3 = p1; + var r = new Dictionary<string, Test.MyEnum>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, Test.MyEnum> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpStringMyEnumDResult(r, p3)); } - public void opMyEnumStringD_async(Test.AMD_MyClass_opMyEnumStringD cb, Dictionary<Test.MyEnum, string> p1, - Dictionary<Test.MyEnum, string> p2, Ice.Current current) + public void + opMyEnumStringDAsync(Dictionary<MyEnum, string> p1, Dictionary<MyEnum, string> p2, + Action<MyClass_OpMyEnumStringDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyEnum, string> p3 = p1; - Dictionary<Test.MyEnum, string> r = new Dictionary<Test.MyEnum, string>(); - foreach(KeyValuePair<Test.MyEnum, string> e in p1) + var p3 = p1; + var r = new Dictionary<MyEnum, string>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<Test.MyEnum, string> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpMyEnumStringDResult(r, p3)); } - public void opMyStructMyEnumD_async(Test.AMD_MyClass_opMyStructMyEnumD cb, - Dictionary<Test.MyStruct, Test.MyEnum> p1, - Dictionary<Test.MyStruct, Test.MyEnum> p2, Ice.Current current) + public void + opMyStructMyEnumDAsync(Dictionary<MyStruct, MyEnum> p1, + Dictionary<MyStruct, MyEnum> p2, + Action<MyClass_OpMyStructMyEnumDResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyStruct, Test.MyEnum> p3 = p1; - Dictionary<Test.MyStruct, Test.MyEnum> r = new Dictionary<Test.MyStruct, Test.MyEnum>(); - foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p1) + var p3 = p1; + var r = new Dictionary<MyStruct, MyEnum>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<Test.MyStruct, Test.MyEnum> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpMyStructMyEnumDResult(r, p3)); } - public void opByteBoolDS_async(Test.AMD_MyClass_opByteBoolDS cb, - Dictionary<byte, bool>[] p1, - Dictionary<byte, bool>[] p2, - Ice.Current current) + public void + opByteBoolDSAsync(Dictionary<byte, bool>[] p1, + Dictionary<byte, bool>[] p2, + Action<MyClass_OpByteBoolDSResult> response, + Action<Exception> exception, + Ice.Current current) { - Dictionary<byte, bool>[] p3 = new Dictionary<byte, bool>[p1.Length + p2.Length]; + var p3 = new Dictionary<byte, bool>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<byte, bool>[] r = new Dictionary<byte, bool>[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var r = new Dictionary<byte, bool>[p1.Length]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpByteBoolDSResult(r, p3)); } - public void opShortIntDS_async(Test.AMD_MyClass_opShortIntDS cb, - Dictionary<short, int>[] p1, - Dictionary<short, int>[] p2, - Ice.Current current) + public void + opShortIntDSAsync(Dictionary<short, int>[] p1, Dictionary<short, int>[] p2, + Action<MyClass_OpShortIntDSResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<short, int>[] p3 = new Dictionary<short, int>[p1.Length + p2.Length]; + var p3 = new Dictionary<short, int>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<short, int>[] r = new Dictionary<short, int>[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var r = new Dictionary<short, int>[p1.Length]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpShortIntDSResult(r, p3)); } - public void opLongFloatDS_async(Test.AMD_MyClass_opLongFloatDS cb, - Dictionary<long, float>[] p1, - Dictionary<long, float>[] p2, - Ice.Current current) + public void + opLongFloatDSAsync(Dictionary<long, float>[] p1, Dictionary<long, float>[] p2, + Action<MyClass_OpLongFloatDSResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<long, float>[] p3 = new Dictionary<long, float>[p1.Length + p2.Length]; + var p3 = new Dictionary<long, float>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<long, float>[] r = new Dictionary<long, float>[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var r = new Dictionary<long, float>[p1.Length]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpLongFloatDSResult(r, p3)); } - public void opStringStringDS_async(Test.AMD_MyClass_opStringStringDS cb, - Dictionary<string, string>[] p1, - Dictionary<string, string>[] p2, - Ice.Current current) + public void + opStringStringDSAsync(Dictionary<string, string>[] p1, Dictionary<string, string>[] p2, + Action<MyClass_OpStringStringDSResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, string>[] p3 = new Dictionary<string, string>[p1.Length + p2.Length]; + var p3 = new Dictionary<string, string>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<string, string>[] r = new Dictionary<string, string>[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var r = new Dictionary<string, string>[p1.Length]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpStringStringDSResult(r, p3)); } - public void opStringMyEnumDS_async(Test.AMD_MyClass_opStringMyEnumDS cb, - Dictionary<string, Test.MyEnum>[] p1, - Dictionary<string, Test.MyEnum>[] p2, - Ice.Current current) + public void + opStringMyEnumDSAsync(Dictionary<string, MyEnum>[] p1, Dictionary<string, MyEnum>[] p2, + Action<MyClass_OpStringMyEnumDSResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, Test.MyEnum>[] p3 = new Dictionary<string, Test.MyEnum>[p1.Length + p2.Length]; + var p3 = new Dictionary<string, MyEnum>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<string, Test.MyEnum>[] r = new Dictionary<string, Test.MyEnum>[p1.Length]; + var r = new Dictionary<string, MyEnum>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpStringMyEnumDSResult(r, p3)); } - public void opMyEnumStringDS_async(Test.AMD_MyClass_opMyEnumStringDS cb, - Dictionary<Test.MyEnum, string>[] p1, - Dictionary<Test.MyEnum, string>[] p2, - Ice.Current current) + public void + opMyEnumStringDSAsync(Dictionary<MyEnum, string>[] p1, Dictionary<MyEnum, string>[] p2, + Action<MyClass_OpMyEnumStringDSResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyEnum, string>[] p3 = new Dictionary<Test.MyEnum, string>[p1.Length + p2.Length]; + var p3 = new Dictionary<MyEnum, string>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<Test.MyEnum, string>[] r = new Dictionary<Test.MyEnum, string>[p1.Length]; - for(int i = 0; i < p1.Length; i++) + var r = new Dictionary<MyEnum, string>[p1.Length]; + for(var i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpMyEnumStringDSResult(r, p3)); } - public void opMyStructMyEnumDS_async(Test.AMD_MyClass_opMyStructMyEnumDS cb, - Dictionary<Test.MyStruct, Test.MyEnum>[] p1, - Dictionary<Test.MyStruct, Test.MyEnum>[] p2, - Ice.Current current) + public void + opMyStructMyEnumDSAsync(Dictionary<MyStruct, MyEnum>[] p1, Dictionary<MyStruct, MyEnum>[] p2, + Action<MyClass_OpMyStructMyEnumDSResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<Test.MyStruct, Test.MyEnum>[] p3 = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length + p2.Length]; + var p3 = new Dictionary<Test.MyStruct, MyEnum>[p1.Length + p2.Length]; Array.Copy(p2, p3, p2.Length); Array.Copy(p1, 0, p3, p2.Length, p1.Length); - - Dictionary<Test.MyStruct, Test.MyEnum>[] r = new Dictionary<Test.MyStruct, Test.MyEnum>[p1.Length]; + var r = new Dictionary<MyStruct, MyEnum>[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r,p3); + response(new MyClass_OpMyStructMyEnumDSResult(r, p3)); } - public void opByteByteSD_async(Test.AMD_MyClass_opByteByteSD cb, - Dictionary<byte, byte[]> p1, - Dictionary<byte, byte[]> p2, - Ice.Current current) + public void + opByteByteSDAsync(Dictionary<byte, byte[]> p1, Dictionary<byte, byte[]> p2, + Action<MyClass_OpByteByteSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<byte, byte[]> p3 = p2; - Dictionary<byte, byte[]> r = new Dictionary<byte, byte[]>(); - foreach(KeyValuePair<byte, byte[]> e in p1) + var p3 = p2; + var r = new Dictionary<byte, byte[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<byte, byte[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpByteByteSDResult(r, p3)); } - public void opBoolBoolSD_async(Test.AMD_MyClass_opBoolBoolSD cb, - Dictionary<bool, bool[]> p1, - Dictionary<bool, bool[]> p2, - Ice.Current current) + public void + opBoolBoolSDAsync(Dictionary<bool, bool[]> p1, Dictionary<bool, bool[]> p2, + Action<MyClass_OpBoolBoolSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<bool, bool[]> p3 = p2; - Dictionary<bool, bool[]> r = new Dictionary<bool, bool[]>(); - foreach(KeyValuePair<bool, bool[]> e in p1) + var p3 = p2; + var r = new Dictionary<bool, bool[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<bool, bool[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpBoolBoolSDResult(r, p3)); } - public void opShortShortSD_async(Test.AMD_MyClass_opShortShortSD cb, - Dictionary<short, short[]> p1, - Dictionary<short, short[]> p2, - Ice.Current current) + public void + opShortShortSDAsync(Dictionary<short, short[]> p1, Dictionary<short, short[]> p2, + Action<MyClass_OpShortShortSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<short, short[]> p3 = p2; - Dictionary<short, short[]> r = new Dictionary<short, short[]>(); - foreach(KeyValuePair<short, short[]> e in p1) + var p3 = p2; + var r = new Dictionary<short, short[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<short, short[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpShortShortSDResult(r, p3)); } - public void opIntIntSD_async(Test.AMD_MyClass_opIntIntSD cb, - Dictionary<int, int[]> p1, - Dictionary<int, int[]> p2, - Ice.Current current) + public void + opIntIntSDAsync(Dictionary<int, int[]> p1, Dictionary<int, int[]> p2, + Action<MyClass_OpIntIntSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<int, int[]> p3 = p2; - Dictionary<int, int[]> r = new Dictionary<int, int[]>(); - foreach(KeyValuePair<int, int[]> e in p1) + var p3 = p2; + var r = new Dictionary<int, int[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<int, int[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpIntIntSDResult(r, p3)); } - public void opLongLongSD_async(Test.AMD_MyClass_opLongLongSD cb, - Dictionary<long, long[]> p1, - Dictionary<long, long[]> p2, - Ice.Current current) + public void + opLongLongSDAsync(Dictionary<long, long[]> p1, Dictionary<long, long[]> p2, + Action<MyClass_OpLongLongSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<long, long[]> p3 = p2; - Dictionary<long, long[]> r = new Dictionary<long, long[]>(); - foreach(KeyValuePair<long, long[]> e in p1) + var p3 = p2; + var r = new Dictionary<long, long[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<long, long[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpLongLongSDResult(r, p3)); } - public void opStringFloatSD_async(Test.AMD_MyClass_opStringFloatSD cb, - Dictionary<string, float[]> p1, - Dictionary<string, float[]> p2, - Ice.Current current) + public void + opStringFloatSDAsync(Dictionary<string, float[]> p1, Dictionary<string, float[]> p2, + Action<MyClass_OpStringFloatSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, float[]> p3 = p2; - Dictionary<string, float[]> r = new Dictionary<string, float[]>(); - foreach(KeyValuePair<string, float[]> e in p1) + var p3 = p2; + var r = new Dictionary<string, float[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, float[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpStringFloatSDResult(r, p3)); } - public void opStringDoubleSD_async(Test.AMD_MyClass_opStringDoubleSD cb, - Dictionary<string, double[]> p1, - Dictionary<string, double[]> p2, - Ice.Current current) + public void + opStringDoubleSDAsync(Dictionary<string, double[]> p1, Dictionary<string, double[]> p2, + Action<MyClass_OpStringDoubleSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, double[]> p3 = p2; - Dictionary<string, double[]> r = new Dictionary<string, double[]>(); - foreach(KeyValuePair<string, double[]> e in p1) + var p3 = p2; + var r = new Dictionary<string, double[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, double[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpStringDoubleSDResult(r, p3)); } - public void opStringStringSD_async(Test.AMD_MyClass_opStringStringSD cb, - Dictionary<string, string[]> p1, - Dictionary<string, string[]> p2, - Ice.Current current) + public void + opStringStringSDAsync(Dictionary<string, string[]> p1, Dictionary<string, string[]> p2, + Action<MyClass_OpStringStringSDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, string[]> p3 = p2; - Dictionary<string, string[]> r = new Dictionary<string, string[]>(); - foreach(KeyValuePair<string, string[]> e in p1) + var p3 = p2; + var r = new Dictionary<string, string[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, string[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpStringStringSDResult(r, p3)); } - public void opMyEnumMyEnumSD_async(Test.AMD_MyClass_opMyEnumMyEnumSD cb, - Dictionary<Test.MyEnum, Test.MyEnum[]> p1, - Dictionary<Test.MyEnum, Test.MyEnum[]> p2, - Ice.Current ice) + public void + opMyEnumMyEnumSDAsync(Dictionary<MyEnum, MyEnum[]> p1, Dictionary<MyEnum, MyEnum[]> p2, + Action<MyClass_OpMyEnumMyEnumSDResult> response, Action<Exception> exception, + Ice.Current ice) { - Dictionary<Test.MyEnum, Test.MyEnum[]> p3 = p2; - Dictionary<Test.MyEnum, Test.MyEnum[]> r = new Dictionary<Test.MyEnum, Test.MyEnum[]>(); - foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p1) + var p3 = p2; + var r = new Dictionary<MyEnum, MyEnum[]>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<Test.MyEnum, Test.MyEnum[]> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r,p3); + response(new MyClass_OpMyEnumMyEnumSDResult(r, p3)); } - public void opIntS_async(Test.AMD_MyClass_opIntS cb, int[] s, Ice.Current current) + public void opIntSAsync(int[] s, Action<int[]> response, Action<Exception> exception, Ice.Current current) { - int[] r = new int[s.Length]; - for(int i = 0; i < s.Length; ++i) + var r = new int[s.Length]; + for(var i = 0; i < s.Length; ++i) { r[i] = -s[i]; } - cb.ice_response(r); + response(r); } - public void opContext_async(Test.AMD_MyClass_opContext cb, Ice.Current current) + public void + opContextAsync(Action<Dictionary<string, string>> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(current.ctx); + response(current.ctx); } - public void opByteSOneway_async(Test.AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current) + public void + opByteSOnewayAsync(byte[] s, Action response, Action<Exception> exception, Ice.Current current) { lock(this) { ++_opByteSOnewayCallCount; } - cb.ice_response(); + response(); } - public void opByteSOnewayCallCount_async(Test.AMD_MyClass_opByteSOnewayCallCount cb, Ice.Current current) + public void + opByteSOnewayCallCountAsync(Action<int> response, Action<Exception> exception, Ice.Current current) { lock(this) { - int count = _opByteSOnewayCallCount; + var count = _opByteSOnewayCallCount; _opByteSOnewayCallCount = 0; - cb.ice_response(count); + response(count); } } - public void opDoubleMarshaling_async(Test.AMD_MyClass_opDoubleMarshaling cb, double p1, double[] p2, - Ice.Current current) + public void + opDoubleMarshalingAsync(double p1, double[] p2, Action response, Action<Exception> exceptin, Ice.Current current) { - double d = 1278312346.0 / 13.0; + var d = 1278312346.0 / 13.0; test(p1 == d); - for(int i = 0; i < p2.Length; ++i) + for(var i = 0; i < p2.Length; ++i) { test(p2[i] == d); } - cb.ice_response(); + response(); } - public void opStringS_async(Test.AMD_MyClass_opStringS cb, string[] p1, string[] p2, - Ice.Current current) + public void + opStringSAsync(string[] p1, string[] p2, Action<MyClass_OpStringSResult> response, Action<Exception> exception, + Ice.Current current) { - string[] p3 = new string[p1.Length + p2.Length]; + var p3 = new string[p1.Length + p2.Length]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - - string[] r = new string[p1.Length]; + var r = new string[p1.Length]; for(int i = 0; i < p1.Length; i++) { r[i] = p1[p1.Length - (i + 1)]; } - cb.ice_response(r, p3); + response(new MyClass_OpStringSResult(r, p3)); } - public void opStringSS_async(Test.AMD_MyClass_opStringSS cb, string[][] p1, string[][] p2, - Ice.Current current) + public void + opStringSSAsync(string[][] p1, string[][] p2, Action<MyClass_OpStringSSResult> response, + Action<Exception> exception, Ice.Current current) { - string[][] p3 = new string[p1.Length + p2.Length][]; + var p3 = new string[p1.Length + p2.Length][]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - - string[][] r = new string[p2.Length][]; + var r = new string[p2.Length][]; for(int i = 0; i < p2.Length; i++) { r[i] = p2[p2.Length - (i + 1)]; } - cb.ice_response(r, p3); + response(new MyClass_OpStringSSResult(r, p3)); } - public void opStringSSS_async(Test.AMD_MyClass_opStringSSS cb, string[][][] p1, string[][][] p2, - Ice.Current current) + public void + opStringSSSAsync(string[][][] p1, string[][][] p2, Action<MyClass_OpStringSSSResult> response, + Action<Exception> exception, Ice.Current current) { - string[][][] p3 = new string[p1.Length + p2.Length][][]; + var p3 = new string[p1.Length + p2.Length][][]; Array.Copy(p1, p3, p1.Length); Array.Copy(p2, 0, p3, p1.Length, p2.Length); - - string[][][] r = new string[p2.Length][][]; - for(int i = 0; i < p2.Length; i++) + var r = new string[p2.Length][][]; + for(var i = 0; i < p2.Length; i++) { r[i] = p2[p2.Length - (i + 1)]; } - cb.ice_response(r, p3); + response(new MyClass_OpStringSSSResult(r, p3)); } - public void opStringStringD_async(Test.AMD_MyClass_opStringStringD cb, Dictionary<string, string> p1, - Dictionary<string, string> p2, Ice.Current current) + public void + opStringStringDAsync(Dictionary<string, string> p1, Dictionary<string, string> p2, + Action<MyClass_OpStringStringDResult> response, Action<Exception> exception, + Ice.Current current) { - Dictionary<string, string> p3 = p1; - Dictionary<string, string> r = new Dictionary<string, string>(); - foreach(KeyValuePair<string, string> e in p1) + var p3 = p1; + var r = new Dictionary<string, string>(); + foreach(var e in p1) { r[e.Key] = e.Value; } - foreach(KeyValuePair<string, string> e in p2) + foreach(var e in p2) { r[e.Key] = e.Value; } - cb.ice_response(r, p3); + response(new MyClass_OpStringStringDResult(r, p3)); } - public void opStruct_async(Test.AMD_MyClass_opStruct cb, Test.Structure p1, Test.Structure p2, Ice.Current current) + public void + opStructAsync(Structure p1, Structure p2, Action<MyClass_OpStructResult> response, Action<Exception> exeption, + Ice.Current current) { - Test.Structure p3 = p1; + var p3 = p1; p3.s.s = "a new string"; - cb.ice_response(p2, p3); + response(new MyClass_OpStructResult(p2, p3)); } - public void opIdempotent_async(Test.AMD_MyClass_opIdempotent cb, Ice.Current current) + public void opIdempotentAsync(Action response, Action<Exception> exception, Ice.Current current) { test(current.mode == Ice.OperationMode.Idempotent); - cb.ice_response(); + response(); } - public void opNonmutating_async(Test.AMD_MyClass_opNonmutating cb, Ice.Current current) + public void opNonmutatingAsync(Action response, Action<Exception> exception, Ice.Current current) { test(current.mode == Ice.OperationMode.Nonmutating); - cb.ice_response(); + response(); } - public void opDerived_async(Test.AMD_MyDerivedClass_opDerived cb, Ice.Current current) + public void opDerivedAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - - public void opByte1_async(Test.AMD_MyClass_opByte1 cb, byte value, Ice.Current current) + + public void + opByte1Async(byte value, Action<byte> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opShort1_async(Test.AMD_MyClass_opShort1 cb, short value, Ice.Current current) + + public void + opShort1Async(short value, Action<short> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opInt1_async(Test.AMD_MyClass_opInt1 cb, int value, Ice.Current current) + + public void opInt1Async(int value, Action<int> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opLong1_async(Test.AMD_MyClass_opLong1 cb, long value, Ice.Current current) + + public void + opLong1Async(long value, Action<long> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opFloat1_async(Test.AMD_MyClass_opFloat1 cb, float value, Ice.Current current) + + public void + opFloat1Async(float value, Action<float> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opDouble1_async(Test.AMD_MyClass_opDouble1 cb, double value, Ice.Current current) + + public void + opDouble1Async(double value, Action<double> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opString1_async(Test.AMD_MyClass_opString1 cb, string value, Ice.Current current) + + public void + opString1Async(string value, Action<string> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opStringS1_async(Test.AMD_MyClass_opStringS1 cb, string[] value, Ice.Current current) + + public void + opStringS1Async(string[] value, Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opByteBoolD1_async(Test.AMD_MyClass_opByteBoolD1 cb, Dictionary<byte, bool> value, - Ice.Current current) + + public void + opByteBoolD1Async(Dictionary<byte, bool> value, Action<Dictionary<byte, bool>> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opStringS2_async(Test.AMD_MyClass_opStringS2 cb, string[] value, Ice.Current current) + + public void + opStringS2Async(string[] value, Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opByteBoolD2_async(Test.AMD_MyClass_opByteBoolD2 cb, Dictionary<byte, bool> value, - Ice.Current current) + + public void + opByteBoolD2Async(Dictionary<byte, bool> value, Action<Dictionary<byte, bool>> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opMyClass1_async(Test.AMD_MyDerivedClass_opMyClass1 cb, Test.MyClass1 value, - Ice.Current current) + + public void + opMyClass1Async(MyClass1 value, Action<MyClass1> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opMyStruct1_async(Test.AMD_MyDerivedClass_opMyStruct1 cb, Test.MyStruct1 value, - Ice.Current current) + + public void + opMyStruct1Async(MyStruct1 value, Action<MyStruct1> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(value); + response(value); } - - public void opStringLiterals_async(Test.AMD_MyClass_opStringLiterals cb, Ice.Current current) + + + public void + opStringLiteralsAsync(Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(new string[] + response(new string[] { - Test.s0.value, - Test.s1.value, - Test.s2.value, - Test.s3.value, - Test.s4.value, - Test.s5.value, - Test.s6.value, - Test.s7.value, - Test.s8.value, - Test.s9.value, - Test.s10.value, - - Test.sw0.value, - Test.sw1.value, - Test.sw2.value, - Test.sw3.value, - Test.sw4.value, - Test.sw5.value, - Test.sw6.value, - Test.sw7.value, - Test.sw8.value, - Test.sw9.value, - Test.sw10.value, - - Test.ss0.value, - Test.ss1.value, - Test.ss2.value, - Test.ss3.value, - Test.ss4.value, - Test.ss5.value, - - Test.su0.value, - Test.su1.value, - Test.su2.value + s0.value, + s1.value, + s2.value, + s3.value, + s4.value, + s5.value, + s6.value, + s7.value, + s8.value, + s9.value, + s10.value, + + sw0.value, + sw1.value, + sw2.value, + sw3.value, + sw4.value, + sw5.value, + sw6.value, + sw7.value, + sw8.value, + sw9.value, + sw10.value, + + ss0.value, + ss1.value, + ss2.value, + ss3.value, + ss4.value, + ss5.value, + + su0.value, + su1.value, + su2.value }); } - - public void opWStringLiterals_async(Test.AMD_MyClass_opWStringLiterals cb, Ice.Current current) + + public void + opWStringLiteralsAsync(Action<string[]> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(new string[] + response(new string[] { - Test.s0.value, - Test.s1.value, - Test.s2.value, - Test.s3.value, - Test.s4.value, - Test.s5.value, - Test.s6.value, - Test.s7.value, - Test.s8.value, - Test.s9.value, - Test.s10.value, - - Test.sw0.value, - Test.sw1.value, - Test.sw2.value, - Test.sw3.value, - Test.sw4.value, - Test.sw5.value, - Test.sw6.value, - Test.sw7.value, - Test.sw8.value, - Test.sw9.value, - Test.sw10.value, - - Test.ss0.value, - Test.ss1.value, - Test.ss2.value, - Test.ss3.value, - Test.ss4.value, - Test.ss5.value, - - Test.su0.value, - Test.su1.value, - Test.su2.value + s0.value, + s1.value, + s2.value, + s3.value, + s4.value, + s5.value, + s6.value, + s7.value, + s8.value, + s9.value, + s10.value, + + sw0.value, + sw1.value, + sw2.value, + sw3.value, + sw4.value, + sw5.value, + sw6.value, + sw7.value, + sw8.value, + sw9.value, + sw10.value, + + ss0.value, + ss1.value, + ss2.value, + ss3.value, + ss4.value, + ss5.value, + + su0.value, + su1.value, + su2.value }); } diff --git a/csharp/test/Ice/operations/msbuild/client/client.csproj b/csharp/test/Ice/operations/msbuild/client/client.csproj index 61719ff948d..6e116a15824 100644 --- a/csharp/test/Ice/operations/msbuild/client/client.csproj +++ b/csharp/test/Ice/operations/msbuild/client/client.csproj @@ -74,7 +74,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj b/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj index 6d87c334f52..67a0dde772d 100644 --- a/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/operations/msbuild/collocated/collocated.csproj @@ -89,7 +89,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/operations/msbuild/server/server.csproj b/csharp/test/Ice/operations/msbuild/server/server.csproj index 216b3830fd2..6edb89d7cad 100644 --- a/csharp/test/Ice/operations/msbuild/server/server.csproj +++ b/csharp/test/Ice/operations/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj index d9ef933a48b..e2804ad9826 100644 --- a/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramd/serveramd.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj b/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj index b79f51f8452..dfe3e93cbce 100644 --- a/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj +++ b/csharp/test/Ice/operations/msbuild/serveramdtie/serveramdtie.csproj @@ -51,7 +51,6 @@ <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> <IceBuilderTie>yes</IceBuilderTie> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj b/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj index d1a9a0454db..4a7afdfe86a 100644 --- a/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj +++ b/csharp/test/Ice/operations/msbuild/servertie/servertie.csproj @@ -54,7 +54,6 @@ <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> <IceBuilderTie>yes</IceBuilderTie> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/optional/TestAMDI.cs b/csharp/test/Ice/optional/TestAMDI.cs index 0760f4d753a..6917c974809 100644 --- a/csharp/test/Ice/optional/TestAMDI.cs +++ b/csharp/test/Ice/optional/TestAMDI.cs @@ -9,39 +9,38 @@ using System; using System.Collections.Generic; +using Test; public class InitialI : Test.Initial { - public override void shutdown_async(Test.AMD_Initial_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void pingPong_async(Test.AMD_Initial_pingPong cb, Ice.Object obj, Ice.Current current) + public override void pingPongAsync(Ice.Object obj, Action<Ice.Object> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(obj); + response(obj); } - public override void opOptionalException_async(Test.AMD_Initial_opOptionalException cb, Ice.Optional<int> a, - Ice.Optional<string> b, Ice.Optional<Test.OneOptional> o, - Ice.Current current) + public override void opOptionalExceptionAsync(Ice.Optional<int> a, Ice.Optional<string> b, Ice.Optional<OneOptional> o, + Action action, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Test.OptionalException(false, a, b, o)); + exception(new OptionalException(false, a, b, o)); } - public override void opDerivedException_async(Test.AMD_Initial_opDerivedException cb, Ice.Optional<int> a, - Ice.Optional<string> b, Ice.Optional<Test.OneOptional> o, - Ice.Current current) + public override void opDerivedExceptionAsync(Ice.Optional<int> a, Ice.Optional<string> b, Ice.Optional<OneOptional> o, + Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Test.DerivedException(false, a, b, o, b, o)); + exception(new DerivedException(false, a, b, o, b, o)); } - public override void opRequiredException_async(Test.AMD_Initial_opRequiredException cb, Ice.Optional<int> a, - Ice.Optional<string> b, Ice.Optional<Test.OneOptional> o, - Ice.Current current) + public override void opRequiredExceptionAsync(Ice.Optional<int> a, Ice.Optional<string> b, Ice.Optional<OneOptional> o, + Action response, Action<Exception> exception, Ice.Current current) { - Test.RequiredException e = new Test.RequiredException(); + var e = new RequiredException(); e.a = a; e.b = b; e.o = o; @@ -53,236 +52,274 @@ public class InitialI : Test.Initial { e.o2 = o.Value; } - cb.ice_exception(e); + exception(e); } - public override void opByte_async(Test.AMD_Initial_opByte cb, Ice.Optional<byte> p1, Ice.Current current) + public override void + opByteAsync(Ice.Optional<byte> p1, Action<Initial_OpByteResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpByteResult(p1, p1)); } - public override void opBool_async(Test.AMD_Initial_opBool cb, Ice.Optional<bool> p1, Ice.Current current) + public override void + opBoolAsync(Ice.Optional<bool> p1, Action<Initial_OpBoolResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpBoolResult(p1, p1)); } - public override void opShort_async(Test.AMD_Initial_opShort cb, Ice.Optional<short> p1, Ice.Current current) + public override void + opShortAsync(Ice.Optional<short> p1, Action<Initial_OpShortResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpShortResult(p1, p1)); } - public override void opInt_async(Test.AMD_Initial_opInt cb, Ice.Optional<int> p1, Ice.Current current) + public override void + opIntAsync(Ice.Optional<int> p1, Action<Initial_OpIntResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpIntResult(p1, p1)); } - public override void opLong_async(Test.AMD_Initial_opLong cb, Ice.Optional<long> p1, Ice.Current current) + public override void + opLongAsync(Ice.Optional<long> p1, Action<Initial_OpLongResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpLongResult(p1, p1)); } - public override void opFloat_async(Test.AMD_Initial_opFloat cb, Ice.Optional<float> p1, Ice.Current current) + public override void + opFloatAsync(Ice.Optional<float> p1, Action<Initial_OpFloatResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpFloatResult(p1, p1)); } - public override void opDouble_async(Test.AMD_Initial_opDouble cb, Ice.Optional<double> p1, Ice.Current current) + public override void + opDoubleAsync(Ice.Optional<double> p1, Action<Initial_OpDoubleResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpDoubleResult(p1, p1)); } - public override void opString_async(Test.AMD_Initial_opString cb, Ice.Optional<string> p1, Ice.Current current) + public override void + opStringAsync(Ice.Optional<string> p1, Action<Initial_OpStringResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpStringResult(p1, p1)); } - public override void opMyEnum_async(Test.AMD_Initial_opMyEnum cb, Ice.Optional<Test.MyEnum> p1, Ice.Current current) + public override void + opMyEnumAsync(Ice.Optional<MyEnum> p1, Action<Initial_OpMyEnumResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpMyEnumResult(p1, p1)); } - public override void opSmallStruct_async(Test.AMD_Initial_opSmallStruct cb, Ice.Optional<Test.SmallStruct> p1, - Ice.Current current) + public override void + opSmallStructAsync(Ice.Optional<SmallStruct> p1, Action<Initial_OpSmallStructResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpSmallStructResult(p1, p1)); } - public override void opFixedStruct_async(Test.AMD_Initial_opFixedStruct cb, Ice.Optional<Test.FixedStruct> p1, - Ice.Current current) + public override void + opFixedStructAsync(Ice.Optional<FixedStruct> p1, Action<Initial_OpFixedStructResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpFixedStructResult(p1, p1)); } - public override void opVarStruct_async(Test.AMD_Initial_opVarStruct cb, Ice.Optional<Test.VarStruct> p1, - Ice.Current current) + public override void + opVarStructAsync(Ice.Optional<VarStruct> p1, Action<Initial_OpVarStructResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpVarStructResult(p1, p1)); } - public override void opOneOptional_async(Test.AMD_Initial_opOneOptional cb, Ice.Optional<Test.OneOptional> p1, - Ice.Current current) + public override void + opOneOptionalAsync(Ice.Optional<OneOptional> p1, Action<Initial_OpOneOptionalResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpOneOptionalResult(p1, p1)); } - public override void opOneOptionalProxy_async(Test.AMD_Initial_opOneOptionalProxy cb, - Ice.Optional<Test.OneOptionalPrx> p1, - Ice.Current current) + public override void + opOneOptionalProxyAsync(Ice.Optional<OneOptionalPrx> p1, Action<Initial_OpOneOptionalProxyResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpOneOptionalProxyResult(p1, p1)); } - public override void opByteSeq_async(Test.AMD_Initial_opByteSeq cb, Ice.Optional<byte[]> p1, Ice.Current current) + public override void + opByteSeqAsync(Ice.Optional<byte[]> p1, Action<Initial_OpByteSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpByteSeqResult(p1, p1)); } - public override void opBoolSeq_async(Test.AMD_Initial_opBoolSeq cb, Ice.Optional<bool[]> p1, Ice.Current current) + public override void + opBoolSeqAsync(Ice.Optional<bool[]> p1, Action<Initial_OpBoolSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpBoolSeqResult(p1, p1)); } - public override void opShortSeq_async(Test.AMD_Initial_opShortSeq cb, Ice.Optional<short[]> p1, Ice.Current current) + public override void + opShortSeqAsync(Ice.Optional<short[]> p1, Action<Initial_OpShortSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpShortSeqResult(p1, p1)); } - public override void opIntSeq_async(Test.AMD_Initial_opIntSeq cb, Ice.Optional<int[]> p1, Ice.Current current) + public override void + opIntSeqAsync(Ice.Optional<int[]> p1, Action<Initial_OpIntSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpIntSeqResult(p1, p1)); } - public override void opLongSeq_async(Test.AMD_Initial_opLongSeq cb, Ice.Optional<long[]> p1, Ice.Current current) + public override void + opLongSeqAsync(Ice.Optional<long[]> p1, Action<Initial_OpLongSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpLongSeqResult(p1, p1)); } - public override void opFloatSeq_async(Test.AMD_Initial_opFloatSeq cb, Ice.Optional<float[]> p1, Ice.Current current) + public override void + opFloatSeqAsync(Ice.Optional<float[]> p1, Action<Initial_OpFloatSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpFloatSeqResult(p1, p1)); } - public override void opDoubleSeq_async(Test.AMD_Initial_opDoubleSeq cb, Ice.Optional<double[]> p1, - Ice.Current current) + public override void + opDoubleSeqAsync(Ice.Optional<double[]> p1, Action<Initial_OpDoubleSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpDoubleSeqResult(p1, p1)); } - public override void opStringSeq_async(Test.AMD_Initial_opStringSeq cb, Ice.Optional<string[]> p1, - Ice.Current current) + public override void + opStringSeqAsync(Ice.Optional<string[]> p1, Action<Initial_OpStringSeqResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpStringSeqResult(p1, p1)); } - public override void opSmallStructSeq_async(Test.AMD_Initial_opSmallStructSeq cb, - Ice.Optional<Test.SmallStruct[]> p1, - Ice.Current current) + public override void + opSmallStructSeqAsync(Ice.Optional<SmallStruct[]> p1, Action<Initial_OpSmallStructSeqResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpSmallStructSeqResult(p1, p1)); } - public override void opSmallStructList_async(Test.AMD_Initial_opSmallStructList cb, - Ice.Optional<List<Test.SmallStruct>> p1, - Ice.Current current) + public override void + opSmallStructListAsync(Ice.Optional<List<SmallStruct>> p1, Action<Initial_OpSmallStructListResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpSmallStructListResult(p1, p1)); } - public override void opFixedStructSeq_async(Test.AMD_Initial_opFixedStructSeq cb, - Ice.Optional<Test.FixedStruct[]> p1, - Ice.Current current) + public override void + opFixedStructSeqAsync(Ice.Optional<FixedStruct[]> p1, Action<Initial_OpFixedStructSeqResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpFixedStructSeqResult(p1, p1)); } - public override void opFixedStructList_async(Test.AMD_Initial_opFixedStructList cb, - Ice.Optional<LinkedList<Test.FixedStruct>> p1, - Ice.Current current) + public override void + opFixedStructListAsync(Ice.Optional<LinkedList<FixedStruct>> p1, Action<Initial_OpFixedStructListResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpFixedStructListResult(p1, p1)); } - public override void opVarStructSeq_async(Test.AMD_Initial_opVarStructSeq cb, Ice.Optional<Test.VarStruct[]> p1, - Ice.Current current) + public override void + opVarStructSeqAsync(Ice.Optional<VarStruct[]> p1, Action<Initial_OpVarStructSeqResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpVarStructSeqResult(p1, p1)); } - public override void opSerializable_async(Test.AMD_Initial_opSerializable cb, - Ice.Optional<Test.SerializableClass> p1, - Ice.Current current) + public override void + opSerializableAsync(Ice.Optional<SerializableClass> p1, Action<Initial_OpSerializableResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpSerializableResult(p1, p1)); } - public override void opIntIntDict_async(Test.AMD_Initial_opIntIntDict cb, Ice.Optional<Dictionary<int, int>> p1, - Ice.Current current) + public override void + opIntIntDictAsync(Ice.Optional<Dictionary<int, int>> p1, Action<Initial_OpIntIntDictResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpIntIntDictResult(p1, p1)); } - public override void opStringIntDict_async(Test.AMD_Initial_opStringIntDict cb, - Ice.Optional<Dictionary<string, int>> p1, - Ice.Current current) + public override void + opStringIntDictAsync(Ice.Optional<Dictionary<string, int>> p1, Action<Initial_OpStringIntDictResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpStringIntDictResult(p1, p1)); } - public override void opIntOneOptionalDict_async(Test.AMD_Initial_opIntOneOptionalDict cb, - Ice.Optional<Dictionary<int, Test.OneOptional>> p1, - Ice.Current current) + public override void + opIntOneOptionalDictAsync(Ice.Optional<Dictionary<int, OneOptional>> p1, Action<Initial_OpIntOneOptionalDictResult> response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1, p1); + response(new Initial_OpIntOneOptionalDictResult(p1, p1)); } - public override void opClassAndUnknownOptional_async(Test.AMD_Initial_opClassAndUnknownOptional cb, Test.A p, - Ice.Current current) + public override void opClassAndUnknownOptionalAsync(A p, Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void sendOptionalClass_async(Test.AMD_Initial_sendOptionalClass cb, bool req, - Ice.Optional<Test.OneOptional> o, Ice.Current current) + public override void sendOptionalClassAsync(bool req, Ice.Optional<OneOptional> o, Action response, + Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void returnOptionalClass_async(Test.AMD_Initial_returnOptionalClass cb, bool req, - Ice.Current current) + public override void + returnOptionalClassAsync(bool req, Action<Ice.Optional<OneOptional>> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(new Test.OneOptional(53)); + response(new OneOptional(53)); } - public override void opG_async(Test.AMD_Initial_opG cb, Test.G g, Ice.Current current) + public override void opGAsync(G g, Action<G> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(g); + response(g); } - public override void opVoid_async(Test.AMD_Initial_opVoid cb, Ice.Current current) + public override void opVoidAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void supportsRequiredParams_async(Test.AMD_Initial_supportsRequiredParams cb, Ice.Current current) + public override void + supportsRequiredParamsAsync(Action<bool> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(false); + response(false); } - public override void supportsJavaSerializable_async(Test.AMD_Initial_supportsJavaSerializable cb, - Ice.Current current) + public override void + supportsJavaSerializableAsync(Action<bool> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(false); + response(false); } - public override void supportsCsharpSerializable_async(Test.AMD_Initial_supportsCsharpSerializable cb, - Ice.Current current) + public override void + supportsCsharpSerializableAsync(Action<bool> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(true); + response(true); } - public override void supportsCppStringView_async(Test.AMD_Initial_supportsCppStringView cb, - Ice.Current current) + public override void + supportsCppStringViewAsync(Action<bool> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(false); + response(false); } } diff --git a/csharp/test/Ice/optional/msbuild/client/client.csproj b/csharp/test/Ice/optional/msbuild/client/client.csproj index b23a6d59541..8df47f819ab 100644 --- a/csharp/test/Ice/optional/msbuild/client/client.csproj +++ b/csharp/test/Ice/optional/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/optional/msbuild/server/server.csproj b/csharp/test/Ice/optional/msbuild/server/server.csproj index c7b97c46ee8..bc556fc7944 100644 --- a/csharp/test/Ice/optional/msbuild/server/server.csproj +++ b/csharp/test/Ice/optional/msbuild/server/server.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj index b159fde7096..125f55ddb41 100644 --- a/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/optional/msbuild/serveramd/serveramd.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/plugin/msbuild/client/client.csproj b/csharp/test/Ice/plugin/msbuild/client/client.csproj index 54c431ec485..5af285f66b7 100644 --- a/csharp/test/Ice/plugin/msbuild/client/client.csproj +++ b/csharp/test/Ice/plugin/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj b/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj index 1c40101e6ed..bf4ff7e1637 100644 --- a/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj +++ b/csharp/test/Ice/plugin/msbuild/plugin/plugin.csproj @@ -70,7 +70,6 @@ <Import Project="$(IceBuilderCsharpProps)" Condition="Exists('$(IceBuilderCsharpProps)')" /> <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/properties/msbuild/client/client.csproj b/csharp/test/Ice/properties/msbuild/client/client.csproj index 65c61b272bd..d7d788382eb 100644 --- a/csharp/test/Ice/properties/msbuild/client/client.csproj +++ b/csharp/test/Ice/properties/msbuild/client/client.csproj @@ -46,7 +46,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs b/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs index db1eece2fd0..caeaed9c6fa 100644 --- a/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs +++ b/csharp/test/Ice/proxy/MyDerivedClassAMDI.cs @@ -7,6 +7,8 @@ // // ********************************************************************** +using System; +using System.Threading.Tasks; using System.Collections.Generic; public sealed class MyDerivedClassI : Test.MyDerivedClass @@ -15,22 +17,22 @@ public sealed class MyDerivedClassI : Test.MyDerivedClass { } - public override void echo_async(Test.AMD_MyDerivedClass_echo cb, - Ice.ObjectPrx obj, - Ice.Current c) + public override void + echoAsync(Ice.ObjectPrx obj, Action<Ice.ObjectPrx> response, Action<Exception> exception, Ice.Current c) { - cb.ice_response(obj); + response(obj); } - public override void shutdown_async(Test.AMD_MyClass_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void getContext_async(Test.AMD_MyClass_getContext cb, Ice.Current current) + public override void + getContextAsync(Action<Dictionary<string, string>> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(_ctx); + response(_ctx); } public override bool ice_isA(string s, Ice.Current current) diff --git a/csharp/test/Ice/proxy/msbuild/client/client.csproj b/csharp/test/Ice/proxy/msbuild/client/client.csproj index 9fd734d4be0..ac7f6feda65 100644 --- a/csharp/test/Ice/proxy/msbuild/client/client.csproj +++ b/csharp/test/Ice/proxy/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj b/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj index 979a7015a0f..8919756b82d 100644 --- a/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/proxy/msbuild/collocated/collocated.csproj @@ -71,7 +71,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/server/server.csproj b/csharp/test/Ice/proxy/msbuild/server/server.csproj index c3026b6cef4..9f12690f21f 100644 --- a/csharp/test/Ice/proxy/msbuild/server/server.csproj +++ b/csharp/test/Ice/proxy/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj index 1014b80f6bc..82007d03481 100644 --- a/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/proxy/msbuild/serveramd/serveramd.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/retry/msbuild/client/client.csproj b/csharp/test/Ice/retry/msbuild/client/client.csproj index e7efd74cc9f..6f628b0d351 100644 --- a/csharp/test/Ice/retry/msbuild/client/client.csproj +++ b/csharp/test/Ice/retry/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj b/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj index 59877d8902c..8d9ede181b5 100644 --- a/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/retry/msbuild/collocated/collocated.csproj @@ -77,7 +77,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/retry/msbuild/server/server.csproj b/csharp/test/Ice/retry/msbuild/server/server.csproj index 5b671962c67..d06048e6c6f 100644 --- a/csharp/test/Ice/retry/msbuild/server/server.csproj +++ b/csharp/test/Ice/retry/msbuild/server/server.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/seqMapping/MyClassAMDI.cs b/csharp/test/Ice/seqMapping/MyClassAMDI.cs index 3c6d1f4c0ac..d297d39183a 100644 --- a/csharp/test/Ice/seqMapping/MyClassAMDI.cs +++ b/csharp/test/Ice/seqMapping/MyClassAMDI.cs @@ -13,405 +13,542 @@ using Test; public sealed class MyClassI : MyClass { - public override void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void opAByteS_async(AMD_MyClass_opAByteS cb, byte[] i, Ice.Current current) + public override void + opAByteSAsync(byte[] i, Action<MyClass_OpAByteSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAByteSResult(i, i)); } - public override void opLByteS_async(AMD_MyClass_opLByteS cb, List<byte> i, Ice.Current current) + public override void + opLByteSAsync(List<byte> i, Action<MyClass_OpLByteSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLByteSResult(i, i)); } - public override void opKByteS_async(AMD_MyClass_opKByteS cb, LinkedList<byte> i, Ice.Current current) + public override void + opKByteSAsync(LinkedList<byte> i, Action<MyClass_OpKByteSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKByteSResult(i, i)); } - public override void opQByteS_async(AMD_MyClass_opQByteS cb, Queue<byte> i, Ice.Current current) + public override void + opQByteSAsync(Queue<byte> i, Action<MyClass_OpQByteSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQByteSResult(i, i)); } - public override void opSByteS_async(AMD_MyClass_opSByteS cb, Stack<byte> i, Ice.Current current) + public override void + opSByteSAsync(Stack<byte> i, Action<MyClass_OpSByteSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSByteSResult(i, i)); } - public override void opABoolS_async(AMD_MyClass_opABoolS cb, bool[] i, Ice.Current current) + public override void + opABoolSAsync(bool[] i, Action<MyClass_OpABoolSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpABoolSResult(i, i)); } - public override void opLBoolS_async(AMD_MyClass_opLBoolS cb, List<bool> i, Ice.Current current) + public override void + opLBoolSAsync(List<bool> i, Action<MyClass_OpLBoolSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLBoolSResult(i, i)); } - public override void opKBoolS_async(AMD_MyClass_opKBoolS cb, LinkedList<bool> i, Ice.Current current) + public override void + opKBoolSAsync(LinkedList<bool> i, Action<MyClass_OpKBoolSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKBoolSResult(i, i)); } - public override void opQBoolS_async(AMD_MyClass_opQBoolS cb, Queue<bool> i, Ice.Current current) + public override void + opQBoolSAsync(Queue<bool> i, Action<MyClass_OpQBoolSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQBoolSResult(i, i)); } - public override void opSBoolS_async(AMD_MyClass_opSBoolS cb, Stack<bool> i, Ice.Current current) + public override void + opSBoolSAsync(Stack<bool> i, Action<MyClass_OpSBoolSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSBoolSResult(i, i)); } - public override void opAShortS_async(AMD_MyClass_opAShortS cb, short[] i, Ice.Current current) + public override void + opAShortSAsync(short[] i, Action<MyClass_OpAShortSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAShortSResult(i, i)); } - public override void opLShortS_async(AMD_MyClass_opLShortS cb, List<short> i, Ice.Current current) + public override void + opLShortSAsync(List<short> i, Action<MyClass_OpLShortSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLShortSResult(i, i)); } - public override void opKShortS_async(AMD_MyClass_opKShortS cb, LinkedList<short> i, Ice.Current current) + public override void + opKShortSAsync(LinkedList<short> i, Action<MyClass_OpKShortSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKShortSResult(i, i)); } - public override void opQShortS_async(AMD_MyClass_opQShortS cb, Queue<short> i, Ice.Current current) + public override void + opQShortSAsync(Queue<short> i, Action<MyClass_OpQShortSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQShortSResult(i, i)); } - public override void opSShortS_async(AMD_MyClass_opSShortS cb, Stack<short> i, Ice.Current current) + public override void + opSShortSAsync(Stack<short> i, Action<MyClass_OpSShortSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSShortSResult(i, i)); } - public override void opAIntS_async(AMD_MyClass_opAIntS cb, int[] i, Ice.Current current) + public override void + opAIntSAsync(int[] i, Action<MyClass_OpAIntSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAIntSResult(i, i)); } - public override void opLIntS_async(AMD_MyClass_opLIntS cb, List<int> i, Ice.Current current) + public override void + opLIntSAsync(List<int> i, Action<MyClass_OpLIntSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLIntSResult(i, i)); } - public override void opKIntS_async(AMD_MyClass_opKIntS cb, LinkedList<int> i, Ice.Current current) + public override void + opKIntSAsync(LinkedList<int> i, Action<MyClass_OpKIntSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKIntSResult(i, i)); } - public override void opQIntS_async(AMD_MyClass_opQIntS cb, Queue<int> i, Ice.Current current) + public override void + opQIntSAsync(Queue<int> i, Action<MyClass_OpQIntSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQIntSResult(i, i)); } - public override void opSIntS_async(AMD_MyClass_opSIntS cb, Stack<int> i, Ice.Current current) + public override void + opSIntSAsync(Stack<int> i, Action<MyClass_OpSIntSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSIntSResult(i, i)); } - public override void opALongS_async(AMD_MyClass_opALongS cb, long[] i, Ice.Current current) + public override void + opALongSAsync(long[] i, Action<MyClass_OpALongSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpALongSResult(i, i)); } - public override void opLLongS_async(AMD_MyClass_opLLongS cb, List<long> i, Ice.Current current) + public override void + opLLongSAsync(List<long> i, Action<MyClass_OpLLongSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLLongSResult(i, i)); } - public override void opKLongS_async(AMD_MyClass_opKLongS cb, LinkedList<long> i, Ice.Current current) + public override void + opKLongSAsync(LinkedList<long> i, Action<MyClass_OpKLongSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKLongSResult(i, i)); } - public override void opQLongS_async(AMD_MyClass_opQLongS cb, Queue<long> i, Ice.Current current) + public override void + opQLongSAsync(Queue<long> i, Action<MyClass_OpQLongSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQLongSResult(i, i)); } - public override void opSLongS_async(AMD_MyClass_opSLongS cb, Stack<long> i, Ice.Current current) + public override void + opSLongSAsync(Stack<long> i, Action<MyClass_OpSLongSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSLongSResult(i, i)); } - public override void opAFloatS_async(AMD_MyClass_opAFloatS cb, float[] i, Ice.Current current) + public override void + opAFloatSAsync(float[] i, Action<MyClass_OpAFloatSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAFloatSResult(i, i)); } - public override void opLFloatS_async(AMD_MyClass_opLFloatS cb, List<float> i, Ice.Current current) + public override void + opLFloatSAsync(List<float> i, Action<MyClass_OpLFloatSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLFloatSResult(i, i)); } - public override void opKFloatS_async(AMD_MyClass_opKFloatS cb, LinkedList<float> i, Ice.Current current) + public override void + opKFloatSAsync(LinkedList<float> i, Action<MyClass_OpKFloatSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKFloatSResult(i, i)); } - public override void opQFloatS_async(AMD_MyClass_opQFloatS cb, Queue<float> i, Ice.Current current) + public override void + opQFloatSAsync(Queue<float> i, Action<MyClass_OpQFloatSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQFloatSResult(i, i)); } - public override void opSFloatS_async(AMD_MyClass_opSFloatS cb, Stack<float> i, Ice.Current current) + public override void + opSFloatSAsync(Stack<float> i, Action<MyClass_OpSFloatSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSFloatSResult(i, i)); } - public override void opADoubleS_async(AMD_MyClass_opADoubleS cb, double[] i, Ice.Current current) + public override void + opADoubleSAsync(double[] i, Action<MyClass_OpADoubleSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpADoubleSResult(i, i)); } - public override void opLDoubleS_async(AMD_MyClass_opLDoubleS cb, List<double> i, Ice.Current current) + public override void + opLDoubleSAsync(List<double> i, Action<MyClass_OpLDoubleSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLDoubleSResult(i, i)); } - public override void opKDoubleS_async(AMD_MyClass_opKDoubleS cb, LinkedList<double> i, Ice.Current current) + public override void + opKDoubleSAsync(LinkedList<double> i, Action<MyClass_OpKDoubleSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKDoubleSResult(i, i)); } - public override void opQDoubleS_async(AMD_MyClass_opQDoubleS cb, Queue<double> i, Ice.Current current) + public override void + opQDoubleSAsync(Queue<double> i, Action<MyClass_OpQDoubleSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQDoubleSResult(i, i)); } - public override void opSDoubleS_async(AMD_MyClass_opSDoubleS cb, Stack<double> i, Ice.Current current) + public override void + opSDoubleSAsync(Stack<double> i, Action<MyClass_OpSDoubleSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSDoubleSResult(i, i)); } - public override void opAStringS_async(AMD_MyClass_opAStringS cb, string[] i, Ice.Current current) + public override void + opAStringSAsync(string[] i, Action<MyClass_OpAStringSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAStringSResult(i, i)); } - public override void opLStringS_async(AMD_MyClass_opLStringS cb, List<string> i, Ice.Current current) + public override void + opLStringSAsync(List<string> i, Action<MyClass_OpLStringSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLStringSResult(i, i)); } - public override void opKStringS_async(AMD_MyClass_opKStringS cb, LinkedList<string> i, Ice.Current current) + public override void + opKStringSAsync(LinkedList<string> i, Action<MyClass_OpKStringSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKStringSResult(i, i)); } - public override void opQStringS_async(AMD_MyClass_opQStringS cb, Queue<string> i, Ice.Current current) + public override void + opQStringSAsync(Queue<string> i, Action<MyClass_OpQStringSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQStringSResult(i, i)); } - public override void opSStringS_async(AMD_MyClass_opSStringS cb, Stack<string> i, Ice.Current current) + public override void + opSStringSAsync(Stack<string> i, Action<MyClass_OpSStringSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSStringSResult(i, i)); } - public override void opAObjectS_async(AMD_MyClass_opAObjectS cb, Ice.Object[] i, Ice.Current current) + public override void opAObjectSAsync(Ice.Object[] i, Action<MyClass_OpAObjectSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAObjectSResult(i, i)); } - public override void opLObjectS_async(AMD_MyClass_opLObjectS cb, List<Ice.Object> i, Ice.Current current) + public override void + opLObjectSAsync(List<Ice.Object> i, Action<MyClass_OpLObjectSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLObjectSResult(i, i)); } - public override void opAObjectPrxS_async(AMD_MyClass_opAObjectPrxS cb, Ice.ObjectPrx[] i, Ice.Current current) + public override void + opAObjectPrxSAsync(Ice.ObjectPrx[] i, Action<MyClass_OpAObjectPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAObjectPrxSResult(i, i)); } - public override void opLObjectPrxS_async(AMD_MyClass_opLObjectPrxS cb, List<Ice.ObjectPrx> i, Ice.Current current) + public override void + opLObjectPrxSAsync(List<Ice.ObjectPrx> i, Action<MyClass_OpLObjectPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLObjectPrxSResult(i, i)); } - public override void opKObjectPrxS_async(AMD_MyClass_opKObjectPrxS cb, LinkedList<Ice.ObjectPrx> i, Ice.Current current) + public override void + opKObjectPrxSAsync(LinkedList<Ice.ObjectPrx> i, Action<MyClass_OpKObjectPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKObjectPrxSResult(i, i)); } - public override void opQObjectPrxS_async(AMD_MyClass_opQObjectPrxS cb, Queue<Ice.ObjectPrx> i, Ice.Current current) + public override void + opQObjectPrxSAsync(Queue<Ice.ObjectPrx> i, Action<MyClass_OpQObjectPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQObjectPrxSResult(i, i)); } - public override void opSObjectPrxS_async(AMD_MyClass_opSObjectPrxS cb, Stack<Ice.ObjectPrx> i, Ice.Current current) + public override void + opSObjectPrxSAsync(Stack<Ice.ObjectPrx> i, Action<MyClass_OpSObjectPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSObjectPrxSResult(i, i)); } - public override void opAStructS_async(AMD_MyClass_opAStructS cb, S[] i, Ice.Current current) + public override void + opAStructSAsync(S[] i, Action<MyClass_OpAStructSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAStructSResult(i, i)); } - public override void opLStructS_async(AMD_MyClass_opLStructS cb, List<S> i, Ice.Current current) + public override void + opLStructSAsync(List<S> i, Action<MyClass_OpLStructSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLStructSResult(i, i)); } - public override void opKStructS_async(AMD_MyClass_opKStructS cb, LinkedList<S> i, Ice.Current current) + public override void + opKStructSAsync(LinkedList<S> i, Action<MyClass_OpKStructSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKStructSResult(i, i)); } - public override void opQStructS_async(AMD_MyClass_opQStructS cb, Queue<S> i, Ice.Current current) + public override void + opQStructSAsync(Queue<S> i, Action<MyClass_OpQStructSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQStructSResult(i, i)); } - public override void opSStructS_async(AMD_MyClass_opSStructS cb, Stack<S> i, Ice.Current current) + public override void + opSStructSAsync(Stack<S> i, Action<MyClass_OpSStructSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSStructSResult(i, i)); } - public override void opAStructSD_async(AMD_MyClass_opAStructSD cb, SD[] i, Ice.Current current) + public override void + opAStructSDAsync(SD[] i, Action<MyClass_OpAStructSDResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAStructSDResult(i, i)); } - public override void opLStructSD_async(AMD_MyClass_opLStructSD cb, List<SD> i, Ice.Current current) + public override void + opLStructSDAsync(List<SD> i, Action<MyClass_OpLStructSDResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLStructSDResult(i, i)); } - public override void opKStructSD_async(AMD_MyClass_opKStructSD cb, LinkedList<SD> i, Ice.Current current) + public override void + opKStructSDAsync(LinkedList<SD> i, Action<MyClass_OpKStructSDResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKStructSDResult(i, i)); } - public override void opQStructSD_async(AMD_MyClass_opQStructSD cb, Queue<SD> i, Ice.Current current) + public override void + opQStructSDAsync(Queue<SD> i, Action<MyClass_OpQStructSDResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQStructSDResult(i, i)); } - public override void opSStructSD_async(AMD_MyClass_opSStructSD cb, Stack<SD> i, Ice.Current current) + public override void + opSStructSDAsync(Stack<SD> i, Action<MyClass_OpSStructSDResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSStructSDResult(i, i)); } - public override void opACVS_async(AMD_MyClass_opACVS cb, CV[] i, Ice.Current current) + public override void + opACVSAsync(CV[] i, Action<MyClass_OpACVSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpACVSResult(i, i)); } - public override void opLCVS_async(AMD_MyClass_opLCVS cb, List<CV> i, Ice.Current current) + public override void + opLCVSAsync(List<CV> i, Action<MyClass_OpLCVSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLCVSResult(i, i)); } - public override void opACVPrxS_async(AMD_MyClass_opACVPrxS cb, CVPrx[] i, Ice.Current current) + public override void + opACVPrxSAsync(CVPrx[] i, Action<MyClass_OpACVPrxSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpACVPrxSResult(i, i)); } - public override void opLCVPrxS_async(AMD_MyClass_opLCVPrxS cb, List<CVPrx> i, Ice.Current current) + public override void + opLCVPrxSAsync(List<CVPrx> i, Action<MyClass_OpLCVPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLCVPrxSResult(i, i)); } - public override void opKCVPrxS_async(AMD_MyClass_opKCVPrxS cb, LinkedList<CVPrx> i, Ice.Current current) + public override void + opKCVPrxSAsync(LinkedList<CVPrx> i, Action<MyClass_OpKCVPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKCVPrxSResult(i, i)); } - public override void opQCVPrxS_async(AMD_MyClass_opQCVPrxS cb, Queue<CVPrx> i, Ice.Current current) + public override void + opQCVPrxSAsync(Queue<CVPrx> i, Action<MyClass_OpQCVPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQCVPrxSResult(i, i)); } - public override void opSCVPrxS_async(AMD_MyClass_opSCVPrxS cb, Stack<CVPrx> i, Ice.Current current) + public override void + opSCVPrxSAsync(Stack<CVPrx> i, Action<MyClass_OpSCVPrxSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSCVPrxSResult(i, i)); } - public override void opACRS_async(AMD_MyClass_opACRS cb, CR[] i, Ice.Current current) + public override void + opACRSAsync(CR[] i, Action<MyClass_OpACRSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpACRSResult(i, i)); } - public override void opLCRS_async(AMD_MyClass_opLCRS cb, List<CR> i, Ice.Current current) + public override void + opLCRSAsync(List<CR> i, Action<MyClass_OpLCRSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLCRSResult(i, i)); } - public override void opAEnS_async(AMD_MyClass_opAEnS cb, En[] i, Ice.Current current) + public override void opAEnSAsync(En[] i, Action<MyClass_OpAEnSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpAEnSResult(i, i)); } - public override void opLEnS_async(AMD_MyClass_opLEnS cb, List<En> i, Ice.Current current) + public override void + opLEnSAsync(List<En> i, Action<MyClass_OpLEnSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpLEnSResult(i, i)); } - public override void opKEnS_async(AMD_MyClass_opKEnS cb, LinkedList<En> i, Ice.Current current) + public override void + opKEnSAsync(LinkedList<En> i, Action<MyClass_OpKEnSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpKEnSResult(i, i)); } - public override void opQEnS_async(AMD_MyClass_opQEnS cb, Queue<En> i, Ice.Current current) + public override void + opQEnSAsync(Queue<En> i, Action<MyClass_OpQEnSResult> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpQEnSResult(i, i)); } - public override void opSEnS_async(AMD_MyClass_opSEnS cb, Stack<En> i, Ice.Current current) + public override void + opSEnSAsync(Stack<En> i, Action<MyClass_OpSEnSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSEnSResult(i, i)); } - public override void opCustomIntS_async(AMD_MyClass_opCustomIntS cb, Custom<int> i, Ice.Current current) + public override void + opCustomIntSAsync(Custom<int> i, Action<MyClass_OpCustomIntSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpCustomIntSResult(i, i)); } - public override void opCustomCVS_async(AMD_MyClass_opCustomCVS cb, Custom<CV> i, Ice.Current current) + public override void + opCustomCVSAsync(Custom<CV> i, Action<MyClass_OpCustomCVSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpCustomCVSResult(i, i)); } - public override void opCustomIntSS_async(AMD_MyClass_opCustomIntSS cb, Custom<Custom<int>> i, Ice.Current current) + public override void + opCustomIntSSAsync(Custom<Custom<int>> i, Action<MyClass_OpCustomIntSSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpCustomIntSSResult(i, i)); } - public override void opCustomCVSS_async(AMD_MyClass_opCustomCVSS cb, Custom<Custom<CV>> i, Ice.Current current) + public override void + opCustomCVSSAsync(Custom<Custom<CV>> i, Action<MyClass_OpCustomCVSSResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpCustomCVSSResult(i, i)); } - public override void opSerialSmallCSharp_async(AMD_MyClass_opSerialSmallCSharp cb, - Serialize.Small i, - Ice.Current current) + public override void + opSerialSmallCSharpAsync(Serialize.Small i, Action<MyClass_OpSerialSmallCSharpResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSerialSmallCSharpResult(i, i)); } - public override void opSerialLargeCSharp_async(AMD_MyClass_opSerialLargeCSharp cb, - Serialize.Large i, - Ice.Current current) + public override void + opSerialLargeCSharpAsync(Serialize.Large i, Action<MyClass_OpSerialLargeCSharpResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSerialLargeCSharpResult(i, i)); } - public override void opSerialStructCSharp_async(AMD_MyClass_opSerialStructCSharp cb, - Serialize.Struct i, - Ice.Current current) + public override void + opSerialStructCSharpAsync(Serialize.Struct i, Action<MyClass_OpSerialStructCSharpResult> response, Action<Exception> exception, + Ice.Current current) { - cb.ice_response(i, i); + response(new MyClass_OpSerialStructCSharpResult(i, i)); } } diff --git a/csharp/test/Ice/seqMapping/msbuild/client/client.csproj b/csharp/test/Ice/seqMapping/msbuild/client/client.csproj index e4a6a8d1122..3fad5160966 100644 --- a/csharp/test/Ice/seqMapping/msbuild/client/client.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/client/client.csproj @@ -71,7 +71,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj b/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj index bef0cb1e484..82ee6c48187 100644 --- a/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/collocated/collocated.csproj @@ -86,7 +86,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/server/server.csproj b/csharp/test/Ice/seqMapping/msbuild/server/server.csproj index e67cc93dff9..ade8cf42273 100644 --- a/csharp/test/Ice/seqMapping/msbuild/server/server.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/server/server.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj index a1198e6dcdd..cd2597890a3 100644 --- a/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/seqMapping/msbuild/serveramd/serveramd.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/serialize/msbuild/client/client.csproj b/csharp/test/Ice/serialize/msbuild/client/client.csproj index 2e319a644dc..da18c82d063 100644 --- a/csharp/test/Ice/serialize/msbuild/client/client.csproj +++ b/csharp/test/Ice/serialize/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/servantLocator/TestAMDI.cs b/csharp/test/Ice/servantLocator/TestAMDI.cs index cee862a4a51..55f1c4ab60b 100644 --- a/csharp/test/Ice/servantLocator/TestAMDI.cs +++ b/csharp/test/Ice/servantLocator/TestAMDI.cs @@ -7,58 +7,58 @@ // // ********************************************************************** +using System; using Test; public sealed class TestI : TestIntfDisp_ { - public override void requestFailedException_async(AMD_TestIntf_requestFailedException cb, Ice.Current current) + public override void requestFailedExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void unknownUserException_async(AMD_TestIntf_unknownUserException cb, Ice.Current current) + public override void unknownUserExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void unknownLocalException_async(AMD_TestIntf_unknownLocalException cb, Ice.Current current) + public override void unknownLocalExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void unknownException_async(AMD_TestIntf_unknownException cb, Ice.Current current) + public override void unknownExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void localException_async(AMD_TestIntf_localException cb, Ice.Current current) + public override void localExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void userException_async(AMD_TestIntf_userException cb, Ice.Current current) + public override void userExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } - public override void csException_async(AMD_TestIntf_csException cb, Ice.Current current) + public override void csExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); + response(); } public override void - unknownExceptionWithServantException_async(AMD_TestIntf_unknownExceptionWithServantException cb, - Ice.Current current) + unknownExceptionWithServantExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Ice.ObjectNotExistException()); + exception(new Ice.ObjectNotExistException()); } - public override void impossibleException_async(AMD_TestIntf_impossibleException cb, bool @throw, - Ice.Current current) + public override void + impossibleExceptionAsync(bool @throw, Action<string> response, Action<Exception> exception, Ice.Current current) { if(@throw) { - cb.ice_exception(new Test.TestImpossibleException()); + exception(new TestImpossibleException()); } else { @@ -66,15 +66,16 @@ public sealed class TestI : TestIntfDisp_ // Return a value so we can be sure that the stream position // is reset correctly iuf finished throws. // - cb.ice_response("Hello"); + response("Hello"); } } - public override void intfUserException_async(AMD_TestIntf_intfUserException cb, bool @throw, Ice.Current current) + public override void + intfUserExceptionAsync(bool @throw, Action<string> response, Action<Exception> exception, Ice.Current current) { if(@throw) { - cb.ice_exception(new Test.TestIntfUserException()); + exception(new TestIntfUserException()); } else { @@ -82,25 +83,25 @@ public sealed class TestI : TestIntfDisp_ // Return a value so we can be sure that the stream position // is reset correctly iuf finished throws. // - cb.ice_response("Hello"); + response("Hello"); } } - public override void asyncResponse_async(AMD_TestIntf_asyncResponse cb, Ice.Current current) + public override void asyncResponseAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(); - throw new Ice.ObjectNotExistException(); + response(); + throw new Ice.ObjectNotExistException(); } - public override void asyncException_async(AMD_TestIntf_asyncException cb, Ice.Current current) + public override void asyncExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - cb.ice_exception(new Test.TestIntfUserException()); + exception(new TestIntfUserException()); throw new Ice.ObjectNotExistException(); } - public override void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.deactivate(); - cb.ice_response(); + response(); } } diff --git a/csharp/test/Ice/servantLocator/msbuild/client/client.csproj b/csharp/test/Ice/servantLocator/msbuild/client/client.csproj index 67aec13e3fe..311525d8d23 100644 --- a/csharp/test/Ice/servantLocator/msbuild/client/client.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj b/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj index bac813dab53..61aff746f67 100644 --- a/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/collocated/collocated.csproj @@ -80,7 +80,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/server/server.csproj b/csharp/test/Ice/servantLocator/msbuild/server/server.csproj index a01b6484416..997dce0f744 100644 --- a/csharp/test/Ice/servantLocator/msbuild/server/server.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/server/server.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj index ca69f157748..a4a8700ff01 100644 --- a/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/servantLocator/msbuild/serveramd/serveramd.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/slicing/exceptions/TestAMDI.cs b/csharp/test/Ice/slicing/exceptions/TestAMDI.cs index fdc05fe2048..080eec37210 100644 --- a/csharp/test/Ice/slicing/exceptions/TestAMDI.cs +++ b/csharp/test/Ice/slicing/exceptions/TestAMDI.cs @@ -20,157 +20,110 @@ public sealed class TestI : TestIntfDisp_ } } - public override void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception,Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void baseAsBase_async(AMD_TestIntf_baseAsBase cb, Ice.Current current) + public override void baseAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - Base b = new Base(); - b.b = "Base.b"; - cb.ice_exception(b); + exception(new Base("Base.b")); } - public override void unknownDerivedAsBase_async(AMD_TestIntf_unknownDerivedAsBase cb, Ice.Current current) + public override void unknownDerivedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - UnknownDerived d = new UnknownDerived(); - d.b = "UnknownDerived.b"; - d.ud = "UnknownDerived.ud"; - cb.ice_exception(d); + exception(new UnknownDerived("UnknownDerived.b", "UnknownDerived.ud")); } - public override void knownDerivedAsBase_async(AMD_TestIntf_knownDerivedAsBase cb, Ice.Current current) + public override void knownDerivedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownDerived d = new KnownDerived(); - d.b = "KnownDerived.b"; - d.kd = "KnownDerived.kd"; - cb.ice_exception(d); + exception(new KnownDerived("KnownDerived.b", "KnownDerived.kd")); } - public override void knownDerivedAsKnownDerived_async(AMD_TestIntf_knownDerivedAsKnownDerived cb, - Ice.Current current) + public override void + knownDerivedAsKnownDerivedAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownDerived d = new KnownDerived(); - d.b = "KnownDerived.b"; - d.kd = "KnownDerived.kd"; - cb.ice_exception(d); + exception(new KnownDerived("KnownDerived.b", "KnownDerived.kd")); } - public override void unknownIntermediateAsBase_async(AMD_TestIntf_unknownIntermediateAsBase cb, Ice.Current current) + public override void + unknownIntermediateAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - UnknownIntermediate ui = new UnknownIntermediate(); - ui.b = "UnknownIntermediate.b"; - ui.ui = "UnknownIntermediate.ui"; - cb.ice_exception(ui); + exception(new UnknownIntermediate("UnknownIntermediate.b", "UnknownIntermediate.ui")); } - public override void knownIntermediateAsBase_async(AMD_TestIntf_knownIntermediateAsBase cb, Ice.Current current) + public override void + knownIntermediateAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownIntermediate ki = new KnownIntermediate(); - ki.b = "KnownIntermediate.b"; - ki.ki = "KnownIntermediate.ki"; - cb.ice_exception(ki); + exception(new KnownIntermediate("KnownIntermediate.b", "KnownIntermediate.ki")); } - public override void knownMostDerivedAsBase_async(AMD_TestIntf_knownMostDerivedAsBase cb, Ice.Current current) + public override void + knownMostDerivedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownMostDerived kmd = new KnownMostDerived(); - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - cb.ice_exception(kmd); + exception(new KnownMostDerived("KnownMostDerived.b", "KnownMostDerived.ki", "KnownMostDerived.kmd")); } - public override void knownIntermediateAsKnownIntermediate_async( - AMD_TestIntf_knownIntermediateAsKnownIntermediate cb, Ice.Current current) + public override void + knownIntermediateAsKnownIntermediateAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownIntermediate ki = new KnownIntermediate(); - ki.b = "KnownIntermediate.b"; - ki.ki = "KnownIntermediate.ki"; - cb.ice_exception(ki); + exception(new KnownIntermediate("KnownIntermediate.b", "KnownIntermediate.ki")); } - public override void knownMostDerivedAsKnownIntermediate_async(AMD_TestIntf_knownMostDerivedAsKnownIntermediate cb, - Ice.Current current) + public override void + knownMostDerivedAsKnownIntermediateAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownMostDerived kmd = new KnownMostDerived(); - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - cb.ice_exception(kmd); + exception(new KnownMostDerived("KnownMostDerived.b", "KnownMostDerived.ki", "KnownMostDerived.kmd")); } - public override void knownMostDerivedAsKnownMostDerived_async(AMD_TestIntf_knownMostDerivedAsKnownMostDerived cb, - Ice.Current current) + public override void + knownMostDerivedAsKnownMostDerivedAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownMostDerived kmd = new KnownMostDerived(); - kmd.b = "KnownMostDerived.b"; - kmd.ki = "KnownMostDerived.ki"; - kmd.kmd = "KnownMostDerived.kmd"; - cb.ice_exception(kmd); + exception(new KnownMostDerived("KnownMostDerived.b", "KnownMostDerived.ki", "KnownMostDerived.kmd")); } - public override void unknownMostDerived1AsBase_async(AMD_TestIntf_unknownMostDerived1AsBase cb, Ice.Current current) + public override void + unknownMostDerived1AsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - UnknownMostDerived1 umd1 = new UnknownMostDerived1(); - umd1.b = "UnknownMostDerived1.b"; - umd1.ki = "UnknownMostDerived1.ki"; - umd1.umd1 = "UnknownMostDerived1.umd1"; - cb.ice_exception(umd1); + exception(new UnknownMostDerived1("UnknownMostDerived1.b", "UnknownMostDerived1.ki", + "UnknownMostDerived1.umd1")); } - public override void unknownMostDerived1AsKnownIntermediate_async( - AMD_TestIntf_unknownMostDerived1AsKnownIntermediate cb, Ice.Current current) + public override void + unknownMostDerived1AsKnownIntermediateAsync(Action response, Action<Exception> exception, Ice.Current current) { - UnknownMostDerived1 umd1 = new UnknownMostDerived1(); - umd1.b = "UnknownMostDerived1.b"; - umd1.ki = "UnknownMostDerived1.ki"; - umd1.umd1 = "UnknownMostDerived1.umd1"; - cb.ice_exception(umd1); + exception(new UnknownMostDerived1("UnknownMostDerived1.b", "UnknownMostDerived1.ki", + "UnknownMostDerived1.umd1")); } - public override void unknownMostDerived2AsBase_async(AMD_TestIntf_unknownMostDerived2AsBase cb, Ice.Current current) + public override void + unknownMostDerived2AsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - UnknownMostDerived2 umd2 = new UnknownMostDerived2(); - umd2.b = "UnknownMostDerived2.b"; - umd2.ui = "UnknownMostDerived2.ui"; - umd2.umd2 = "UnknownMostDerived2.umd2"; - cb.ice_exception(umd2); + exception(new UnknownMostDerived2("UnknownMostDerived2.b", "UnknownMostDerived2.ui", + "UnknownMostDerived2.umd2")); } - public override void unknownMostDerived2AsBaseCompact_async(AMD_TestIntf_unknownMostDerived2AsBaseCompact cb, - Ice.Current current) + public override void + unknownMostDerived2AsBaseCompactAsync(Action response, Action<Exception> exception, Ice.Current current) { - UnknownMostDerived2 umd2 = new UnknownMostDerived2(); - umd2.b = "UnknownMostDerived2.b"; - umd2.ui = "UnknownMostDerived2.ui"; - umd2.umd2 = "UnknownMostDerived2.umd2"; - cb.ice_exception(umd2); + exception(new UnknownMostDerived2("UnknownMostDerived2.b", "UnknownMostDerived2.ui", + "UnknownMostDerived2.umd2")); } - public override void knownPreservedAsBase_async(AMD_TestIntf_knownPreservedAsBase cb, Ice.Current current) + public override void knownPreservedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownPreservedDerived ex = new KnownPreservedDerived(); - ex.b = "base"; - ex.kp = "preserved"; - ex.kpd = "derived"; - cb.ice_exception(ex); + exception(new KnownPreservedDerived("base", "preserved", "derived")); } - public override void knownPreservedAsKnownPreserved_async(AMD_TestIntf_knownPreservedAsKnownPreserved cb, - Ice.Current current) + public override void + knownPreservedAsKnownPreservedAsync(Action response, Action<Exception> exception, Ice.Current current) { - KnownPreservedDerived ex = new KnownPreservedDerived(); - ex.b = "base"; - ex.kp = "preserved"; - ex.kpd = "derived"; - cb.ice_exception(ex); + exception(new KnownPreservedDerived("base", "preserved", "derived")); } - public override void relayKnownPreservedAsBase_async(AMD_TestIntf_relayKnownPreservedAsBase cb, - RelayPrx r, Ice.Current current) + public override void + relayKnownPreservedAsBaseAsync(RelayPrx r, Action response, Action<Exception> exception, Ice.Current current) { try { @@ -179,16 +132,17 @@ public sealed class TestI : TestIntfDisp_ } catch(Ice.UserException ex) { - cb.ice_exception(ex); + exception(ex); } catch(Ice.LocalException ex) { - cb.ice_exception(ex); + exception(ex); } } - public override void relayKnownPreservedAsKnownPreserved_async(AMD_TestIntf_relayKnownPreservedAsKnownPreserved cb, - RelayPrx r, Ice.Current current) + public override void + relayKnownPreservedAsKnownPreservedAsync(RelayPrx r, Action response, Action<Exception> exception, + Ice.Current current) { try { @@ -197,15 +151,15 @@ public sealed class TestI : TestIntfDisp_ } catch(Ice.UserException ex) { - cb.ice_exception(ex); + exception(ex); } catch(Ice.LocalException ex) { - cb.ice_exception(ex); + exception(ex); } } - public override void unknownPreservedAsBase_async(AMD_TestIntf_unknownPreservedAsBase cb, Ice.Current current) + public override void unknownPreservedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { SPreserved2 ex = new SPreserved2(); ex.b = "base"; @@ -213,11 +167,11 @@ public sealed class TestI : TestIntfDisp_ ex.kpd = "derived"; ex.p1 = new SPreservedClass("bc", "spc"); ex.p2 = ex.p1; - cb.ice_exception(ex); + exception(ex); } - public override void unknownPreservedAsKnownPreserved_async(AMD_TestIntf_unknownPreservedAsKnownPreserved cb, - Ice.Current current) + public override void + unknownPreservedAsKnownPreservedAsync(Action response, Action<Exception> exception, Ice.Current current) { SPreserved2 ex = new SPreserved2(); ex.b = "base"; @@ -225,11 +179,11 @@ public sealed class TestI : TestIntfDisp_ ex.kpd = "derived"; ex.p1 = new SPreservedClass("bc", "spc"); ex.p2 = ex.p1; - cb.ice_exception(ex); + exception(ex); } - public override void relayUnknownPreservedAsBase_async(AMD_TestIntf_relayUnknownPreservedAsBase cb, - RelayPrx r, Ice.Current current) + public override void + relayUnknownPreservedAsBaseAsync(RelayPrx r, Action response, Action<Exception> exception, Ice.Current current) { try { @@ -238,16 +192,17 @@ public sealed class TestI : TestIntfDisp_ } catch(Ice.UserException ex) { - cb.ice_exception(ex); + exception(ex); } catch(Ice.LocalException ex) { - cb.ice_exception(ex); + exception(ex); } } - public override void relayUnknownPreservedAsKnownPreserved_async( - AMD_TestIntf_relayUnknownPreservedAsKnownPreserved cb, RelayPrx r, Ice.Current current) + public override void + relayUnknownPreservedAsKnownPreservedAsync(RelayPrx r, Action response, Action<Exception> exception, + Ice.Current current) { try { @@ -256,11 +211,12 @@ public sealed class TestI : TestIntfDisp_ } catch(Ice.UserException ex) { - cb.ice_exception(ex); + exception(ex); } catch(Ice.LocalException ex) { - cb.ice_exception(ex); + exception(ex); } + } } diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj index 6df3ddf4872..bd40c1aa7f1 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/client/client.csproj @@ -60,7 +60,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj index 8a897ca386e..1e107f61453 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/server/server.csproj @@ -57,7 +57,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj index 6b178130375..52563fad0c8 100644 --- a/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.csproj @@ -54,7 +54,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/slicing/objects/TestAMDI.cs b/csharp/test/Ice/slicing/objects/TestAMDI.cs index d70ce4579a2..3a0070dab6f 100644 --- a/csharp/test/Ice/slicing/objects/TestAMDI.cs +++ b/csharp/test/Ice/slicing/objects/TestAMDI.cs @@ -17,72 +17,58 @@ public sealed class TestI : TestIntfDisp_ { if(!b) { - throw new System.Exception(); + throw new Exception(); } } - public override void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) + public override void shutdownAsync(Action response, Action<Exception> exception, Ice.Current current) { current.adapter.getCommunicator().shutdown(); - cb.ice_response(); + response(); } - public override void SBaseAsObject_async(AMD_TestIntf_SBaseAsObject cb, Ice.Current current) + public override void + SBaseAsObjectAsync(Action<Ice.Object> response, Action<Exception> exception, Ice.Current current) { - SBase sb = new SBase(); - sb.sb = "SBase.sb"; - cb.ice_response(sb); + response(new SBase("SBase.sb")); } - public override void SBaseAsSBase_async(AMD_TestIntf_SBaseAsSBase cb, Ice.Current current) + public override void SBaseAsSBaseAsync(Action<SBase> response, Action<Exception> exception, Ice.Current current) { - SBase sb = new SBase(); - sb.sb = "SBase.sb"; - cb.ice_response(sb); + response(new SBase("SBase.sb")); } - public override void SBSKnownDerivedAsSBase_async(AMD_TestIntf_SBSKnownDerivedAsSBase cb, Ice.Current current) + public override void + SBSKnownDerivedAsSBaseAsync(Action<SBase> response, Action<Exception> exception, Ice.Current current) { - SBSKnownDerived sbskd = new SBSKnownDerived(); - sbskd.sb = "SBSKnownDerived.sb"; - sbskd.sbskd = "SBSKnownDerived.sbskd"; - cb.ice_response(sbskd); + response(new SBSKnownDerived("SBSKnownDerived.sb", "SBSKnownDerived.sbskd")); } - public override void SBSKnownDerivedAsSBSKnownDerived_async(AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerived cb, - Ice.Current current) + public override void + SBSKnownDerivedAsSBSKnownDerivedAsync(Action<SBSKnownDerived> response, Action<Exception> exception, + Ice.Current current) { - SBSKnownDerived sbskd = new SBSKnownDerived(); - sbskd.sb = "SBSKnownDerived.sb"; - sbskd.sbskd = "SBSKnownDerived.sbskd"; - cb.ice_response(sbskd); + response(new SBSKnownDerived("SBSKnownDerived.sb", "SBSKnownDerived.sbskd")); } - public override void SBSUnknownDerivedAsSBase_async(AMD_TestIntf_SBSUnknownDerivedAsSBase cb, Ice.Current current) + public override void + SBSUnknownDerivedAsSBaseAsync(Action<SBase> response, Action<Exception> exception, Ice.Current current) { - SBSUnknownDerived sbsud = new SBSUnknownDerived(); - sbsud.sb = "SBSUnknownDerived.sb"; - sbsud.sbsud = "SBSUnknownDerived.sbsud"; - cb.ice_response(sbsud); + response(new SBSUnknownDerived("SBSUnknownDerived.sb", "SBSUnknownDerived.sbsud")); } - public override void SBSUnknownDerivedAsSBaseCompact_async(AMD_TestIntf_SBSUnknownDerivedAsSBaseCompact cb, - Ice.Current current) + public override void + SBSUnknownDerivedAsSBaseCompactAsync(Action<SBase> response, Action<Exception> exception, Ice.Current current) { - SBSUnknownDerived sbsud = new SBSUnknownDerived(); - sbsud.sb = "SBSUnknownDerived.sb"; - sbsud.sbsud = "SBSUnknownDerived.sbsud"; - cb.ice_response(sbsud); + response(new SBSUnknownDerived("SBSUnknownDerived.sb", "SBSUnknownDerived.sbsud")); } - public override void SUnknownAsObject_async(AMD_TestIntf_SUnknownAsObject cb, Ice.Current current) + public override void SUnknownAsObjectAsync(Action<Ice.Object> response, Action<Exception> exception, Ice.Current current) { - SUnknown su = new SUnknown(); - su.su = "SUnknown.su"; - cb.ice_response(su); + response(new SUnknown("SUnknown.su")); } - public override void checkSUnknown_async(AMD_TestIntf_checkSUnknown cb, Ice.Object obj, Ice.Current current) + public override void checkSUnknownAsync(Ice.Object obj, Action response, Action<Exception> exception, Ice.Current current) { if(current.encoding.Equals(Ice.Util.Encoding_1_0)) { @@ -93,18 +79,18 @@ public sealed class TestI : TestIntfDisp_ SUnknown su = obj as SUnknown; test(su.su.Equals("SUnknown.su")); } - cb.ice_response(); + response(); } - public override void oneElementCycle_async(AMD_TestIntf_oneElementCycle cb, Ice.Current current) + public override void oneElementCycleAsync(Action<B> response, Action<Exception> exception, Ice.Current current) { B b = new B(); b.sb = "B1.sb"; b.pb = b; - cb.ice_response(b); + response(b); } - public override void twoElementCycle_async(AMD_TestIntf_twoElementCycle cb, Ice.Current current) + public override void twoElementCycleAsync(Action<B> response, Action<Exception> exception, Ice.Current current) { B b1 = new B(); b1.sb = "B1.sb"; @@ -112,10 +98,10 @@ public sealed class TestI : TestIntfDisp_ b2.sb = "B2.sb"; b2.pb = b1; b1.pb = b2; - cb.ice_response(b1); + response(b1); } - public override void D1AsB_async(AMD_TestIntf_D1AsB cb, Ice.Current current) + public override void D1AsBAsync(Action<B> response, Action<Exception> exception, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -127,10 +113,10 @@ public sealed class TestI : TestIntfDisp_ d2.pd2 = d1; d1.pb = d2; d1.pd1 = d2; - cb.ice_response(d1); + response(d1); } - public override void D1AsD1_async(AMD_TestIntf_D1AsD1 cb, Ice.Current current) + public override void D1AsD1Async(Action<D1> response, Action<Exception> exception, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -142,10 +128,10 @@ public sealed class TestI : TestIntfDisp_ d2.pd2 = d1; d1.pb = d2; d1.pd1 = d2; - cb.ice_response(d1); + response(d1); } - public override void D2AsB_async(AMD_TestIntf_D2AsB cb, Ice.Current current) + public override void D2AsBAsync(Action<B> response, Action<Exception> exception, Ice.Current current) { D2 d2 = new D2(); d2.sb = "D2.sb"; @@ -157,10 +143,11 @@ public sealed class TestI : TestIntfDisp_ d1.pd1 = d2; d2.pb = d1; d2.pd2 = d1; - cb.ice_response(d2); + response(d2); } - public override void paramTest1_async(AMD_TestIntf_paramTest1 cb, Ice.Current current) + public override void + paramTest1Async(Action<TestIntf_ParamTest1Result> response, Action<Exception> exception, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -172,10 +159,11 @@ public sealed class TestI : TestIntfDisp_ d2.pd2 = d1; d1.pb = d2; d1.pd1 = d2; - cb.ice_response(d1, d2); + response(new TestIntf_ParamTest1Result(d1, d2)); } - public override void paramTest2_async(AMD_TestIntf_paramTest2 cb, Ice.Current current) + public override void + paramTest2Async(Action<TestIntf_ParamTest2Result> response, Action<Exception> exception, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -187,10 +175,11 @@ public sealed class TestI : TestIntfDisp_ d2.pd2 = d1; d1.pb = d2; d1.pd1 = d2; - cb.ice_response(d2, d1); + response(new TestIntf_ParamTest2Result(d2, d1)); } - public override void paramTest3_async(AMD_TestIntf_paramTest3 cb, Ice.Current current) + public override void + paramTest3Async(Action<TestIntf_ParamTest3Result> response, Action<Exception> exception, Ice.Current current) { D2 d2 = new D2(); d2.sb = "D2.sb (p1 1)"; @@ -215,10 +204,12 @@ public sealed class TestI : TestIntfDisp_ d3.sd1 = "D1.sd2 (p2 2)"; d3.pd1 = null; d4.pd2 = d3; - cb.ice_response(d3, d2, d4); + + response(new TestIntf_ParamTest3Result(d3, d2, d4)); } - public override void paramTest4_async(AMD_TestIntf_paramTest4 cb, Ice.Current current) + public override void + paramTest4Async(Action<TestIntf_ParamTest4Result> response, Action<Exception> exception, Ice.Current current) { D4 d4 = new D4(); d4.sb = "D4.sb (1)"; @@ -227,10 +218,11 @@ public sealed class TestI : TestIntfDisp_ d4.p1.sb = "B.sb (1)"; d4.p2 = new B(); d4.p2.sb = "B.sb (2)"; - cb.ice_response(d4.p2, d4); + response(new TestIntf_ParamTest4Result(d4.p2, d4)); } - public override void returnTest1_async(AMD_TestIntf_returnTest1 cb, Ice.Current current) + public override void + returnTest1Async(Action<TestIntf_ReturnTest1Result> response, Action<Exception> exception, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -242,10 +234,11 @@ public sealed class TestI : TestIntfDisp_ d2.pd2 = d1; d1.pb = d2; d1.pd1 = d2; - cb.ice_response(d2, d2, d1); + response(new TestIntf_ReturnTest1Result(d2, d2, d1)); } - public override void returnTest2_async(AMD_TestIntf_returnTest2 cb, Ice.Current current) + public override void + returnTest2Async(Action<TestIntf_ReturnTest2Result> response, Action<Exception> exception, Ice.Current current) { D1 d1 = new D1(); d1.sb = "D1.sb"; @@ -257,57 +250,59 @@ public sealed class TestI : TestIntfDisp_ d2.pd2 = d1; d1.pb = d2; d1.pd1 = d2; - cb.ice_response(d1, d1, d2); + response(new TestIntf_ReturnTest2Result(d1, d1, d2)); } - public override void returnTest3_async(AMD_TestIntf_returnTest3 cb, B p1, B p2, Ice.Current current) + public override void + returnTest3Async(B p1, B p2, Action<B> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(p1); + response(p1); } - public override void sequenceTest_async(AMD_TestIntf_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) + public override void + sequenceTestAsync(SS1 p1, SS2 p2, Action<SS3> response, Action<Exception> exception, Ice.Current current) { - SS3 ss = new SS3(); - ss.c1 = p1; - ss.c2 = p2; - cb.ice_response(ss); + response(new SS3(p1, p2)); } - public override void dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, Dictionary<int, B> bin, - Ice.Current current) + public override void + dictionaryTestAsync(Dictionary<int, B> bin, Action<TestIntf_DictionaryTestResult> response, + Action<Exception> exception, Ice.Current current) { - Dictionary<int, B> bout = new Dictionary<int, B>(); + var bout = new Dictionary<int, B>(); int i; for(i = 0; i < 10; ++i) { B b = bin[i]; - D2 d2 = new D2(); + var d2 = new D2(); d2.sb = b.sb; d2.pb = b.pb; d2.sd2 = "D2"; d2.pd2 = d2; bout[i * 10] = d2; } - Dictionary<int, B> r = new Dictionary<int, B>(); + var r = new Dictionary<int, B>(); for(i = 0; i < 10; ++i) { string s = "D1." + (i * 20).ToString(); - D1 d1 = new D1(); + var d1 = new D1(); d1.sb = s; d1.pb = (i == 0 ? null : r[(i - 1) * 20]); d1.sd1 = s; d1.pd1 = d1; r[i * 20] = d1; } - cb.ice_response(r, bout); + response(new TestIntf_DictionaryTestResult(r, bout)); } - public override void exchangePBase_async(AMD_TestIntf_exchangePBase cb, PBase pb, Ice.Current current) + public override void + exchangePBaseAsync(PBase pb, Action<PBase> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(pb); + response(pb); } - public override void PBSUnknownAsPreserved_async(AMD_TestIntf_PBSUnknownAsPreserved cb, Ice.Current current) + public override void + PBSUnknownAsPreservedAsync(Action<Preserved> response, Action<Exception> exception, Ice.Current current) { PSUnknown r = new PSUnknown(); r.pi = 5; @@ -322,10 +317,11 @@ public sealed class TestI : TestIntfDisp_ // r.cl = new MyClass(15); } - cb.ice_response(r); + response(r); } - public override void checkPBSUnknown_async(AMD_TestIntf_checkPBSUnknown cb, Preserved p, Ice.Current current) + public override void + checkPBSUnknownAsync(Preserved p, Action response, Action<Exception> exception, Ice.Current current) { if(current.encoding.Equals(Ice.Util.Encoding_1_0)) { @@ -335,20 +331,20 @@ public sealed class TestI : TestIntfDisp_ } else { - PSUnknown pu = p as PSUnknown; + var pu = p as PSUnknown; test(pu.pi == 5); test(pu.ps.Equals("preserved")); test(pu.psu.Equals("unknown")); test(pu.graph == null); test(pu.cl != null && pu.cl.i == 15); } - cb.ice_response(); + response(); } - public override void PBSUnknownAsPreservedWithGraph_async(AMD_TestIntf_PBSUnknownAsPreservedWithGraph cb, - Ice.Current current) + public override void + PBSUnknownAsPreservedWithGraphAsync(Action<Preserved> response, Action<Exception> exception, Ice.Current current) { - PSUnknown r = new PSUnknown(); + var r = new PSUnknown(); r.pi = 5; r.ps = "preserved"; r.psu = "unknown"; @@ -356,12 +352,11 @@ public sealed class TestI : TestIntfDisp_ r.graph.next = new PNode(); r.graph.next.next = new PNode(); r.graph.next.next.next = r.graph; - cb.ice_response(r); - r.graph.next.next.next = null; // Break the cycle. + response(r); } - public override void checkPBSUnknownWithGraph_async(AMD_TestIntf_checkPBSUnknownWithGraph cb, - Preserved p, Ice.Current current) + public override void + checkPBSUnknownWithGraphAsync(Preserved p, Action response, Action<Exception> exception, Ice.Current current) { if(current.encoding.Equals(Ice.Util.Encoding_1_0)) { @@ -371,31 +366,29 @@ public sealed class TestI : TestIntfDisp_ } else { - PSUnknown pu = p as PSUnknown; + var pu = p as PSUnknown; test(pu.pi == 5); test(pu.ps.Equals("preserved")); test(pu.psu.Equals("unknown")); test(pu.graph != pu.graph.next); test(pu.graph.next != pu.graph.next.next); test(pu.graph.next.next.next == pu.graph); - pu.graph.next.next.next = null; // Break the cycle. } - cb.ice_response(); + response(); } - public override void PBSUnknown2AsPreservedWithGraph_async(AMD_TestIntf_PBSUnknown2AsPreservedWithGraph cb, - Ice.Current current) + public override void + PBSUnknown2AsPreservedWithGraphAsync(Action<Preserved> response, Action<Exception> exception, Ice.Current current) { - PSUnknown2 r = new PSUnknown2(); + var r = new PSUnknown2(); r.pi = 5; r.ps = "preserved"; r.pb = r; - cb.ice_response(r); - r.pb = null; // Break the cycle. + response(r); } - public override void checkPBSUnknown2WithGraph_async(AMD_TestIntf_checkPBSUnknown2WithGraph cb, Preserved p, - Ice.Current current) + public override void + checkPBSUnknown2WithGraphAsync(Preserved p, Action response, Action<Exception> exception, Ice.Current current) { if(current.encoding.Equals(Ice.Util.Encoding_1_0)) { @@ -405,31 +398,31 @@ public sealed class TestI : TestIntfDisp_ } else { - PSUnknown2 pu = p as PSUnknown2; + var pu = p as PSUnknown2; test(pu.pi == 5); test(pu.ps.Equals("preserved")); test(pu.pb == pu); - pu.pb = null; // Break the cycle. } - cb.ice_response(); + response(); } - public override void exchangePNode_async(AMD_TestIntf_exchangePNode cb, PNode pn, Ice.Current current) + public override void + exchangePNodeAsync(PNode pn, Action<PNode> response, Action<Exception> exception, Ice.Current current) { - cb.ice_response(pn); + response(pn); } - public override void throwBaseAsBase_async(AMD_TestIntf_throwBaseAsBase cb, Ice.Current current) + public override void throwBaseAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - BaseException be = new BaseException(); + var be = new BaseException(); be.sbe = "sbe"; be.pb = new B(); be.pb.sb = "sb"; be.pb.pb = be.pb; - cb.ice_exception(be); + exception(be); } - public override void throwDerivedAsBase_async(AMD_TestIntf_throwDerivedAsBase cb, Ice.Current current) + public override void throwDerivedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { DerivedException de = new DerivedException(); de.sbe = "sbe"; @@ -442,12 +435,13 @@ public sealed class TestI : TestIntfDisp_ de.pd1.pb = de.pd1; de.pd1.sd1 = "sd2"; de.pd1.pd1 = de.pd1; - cb.ice_exception(de); + exception(de); } - public override void throwDerivedAsDerived_async(AMD_TestIntf_throwDerivedAsDerived cb, Ice.Current current) + public override + void throwDerivedAsDerivedAsync(Action response, Action<Exception> exception, Ice.Current current) { - DerivedException de = new DerivedException(); + var de = new DerivedException(); de.sbe = "sbe"; de.pb = new B(); de.pb.sb = "sb1"; @@ -458,42 +452,44 @@ public sealed class TestI : TestIntfDisp_ de.pd1.pb = de.pd1; de.pd1.sd1 = "sd2"; de.pd1.pd1 = de.pd1; - cb.ice_exception(de); + exception(de); } - public override void throwUnknownDerivedAsBase_async(AMD_TestIntf_throwUnknownDerivedAsBase cb, Ice.Current current) + public override void throwUnknownDerivedAsBaseAsync(Action response, Action<Exception> exception, Ice.Current current) { - D2 d2 = new D2(); + var d2 = new D2(); d2.sb = "sb d2"; d2.pb = d2; d2.sd2 = "sd2 d2"; d2.pd2 = d2; - UnknownDerivedException ude = new UnknownDerivedException(); + var ude = new UnknownDerivedException(); ude.sbe = "sbe"; ude.pb = d2; ude.sude = "sude"; ude.pd2 = d2; - cb.ice_exception(ude); + + exception(ude); } - public override void throwPreservedException_async(AMD_TestIntf_throwPreservedException cb, Ice.Current current) + public override void throwPreservedExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - PSUnknownException ue = new PSUnknownException(); + var ue = new PSUnknownException(); ue.p = new PSUnknown2(); ue.p.pi = 5; ue.p.ps = "preserved"; ue.p.pb = ue.p; - cb.ice_exception(ue); - ue.p.pb = null; // Break the cycle. + + exception(ue); } - public override void useForward_async(AMD_TestIntf_useForward cb, Ice.Current current) + public override void + useForwardAsync(Action<Forward> response, Action<Exception> exception, Ice.Current current) { - Forward f = new Forward(); + var f = new Forward(); f = new Forward(); f.h = new Hidden(); f.h.f = f; - cb.ice_response(f); + response(f); } } diff --git a/csharp/test/Ice/slicing/objects/TestI.cs b/csharp/test/Ice/slicing/objects/TestI.cs index a53472cf65e..845fd879f41 100644 --- a/csharp/test/Ice/slicing/objects/TestI.cs +++ b/csharp/test/Ice/slicing/objects/TestI.cs @@ -317,10 +317,10 @@ public sealed class TestI : TestIntfDisp_ } } - public override void PBSUnknownAsPreservedWithGraph_async(AMD_TestIntf_PBSUnknownAsPreservedWithGraph cb, - Ice.Current current) + public override void + PBSUnknownAsPreservedWithGraphAsync(Action<Preserved> response, Action<Exception> exception, Ice.Current current) { - PSUnknown r = new PSUnknown(); + var r = new PSUnknown(); r.pi = 5; r.ps = "preserved"; r.psu = "unknown"; @@ -328,8 +328,7 @@ public sealed class TestI : TestIntfDisp_ r.graph.next = new PNode(); r.graph.next.next = new PNode(); r.graph.next.next.next = r.graph; - cb.ice_response(r); - r.graph.next.next.next = null; // Break the cycle. + response(r); } public override void checkPBSUnknownWithGraph(Preserved p, Ice.Current current) @@ -349,19 +348,17 @@ public sealed class TestI : TestIntfDisp_ test(pu.graph != pu.graph.next); test(pu.graph.next != pu.graph.next.next); test(pu.graph.next.next.next == pu.graph); - pu.graph.next.next.next = null; // Break the cycle. } } - public override void PBSUnknown2AsPreservedWithGraph_async(AMD_TestIntf_PBSUnknown2AsPreservedWithGraph cb, - Ice.Current current) + public override void + PBSUnknown2AsPreservedWithGraphAsync(Action<Preserved> response, Action<Exception> exception, Ice.Current current) { - PSUnknown2 r = new PSUnknown2(); + var r = new PSUnknown2(); r.pi = 5; r.ps = "preserved"; r.pb = r; - cb.ice_response(r); - r.pb = null; // Break the cycle. + response(r); } public override void checkPBSUnknown2WithGraph(Preserved p, Ice.Current current) @@ -378,7 +375,6 @@ public sealed class TestI : TestIntfDisp_ test(pu.pi == 5); test(pu.ps.Equals("preserved")); test(pu.pb == pu); - pu.pb = null; // Break the cycle. } } @@ -445,15 +441,15 @@ public sealed class TestI : TestIntfDisp_ throw ude; } - public override void throwPreservedException_async(AMD_TestIntf_throwPreservedException cb, Ice.Current current) + public override void + throwPreservedExceptionAsync(Action response, Action<Exception> exception, Ice.Current current) { - PSUnknownException ue = new PSUnknownException(); + var ue = new PSUnknownException(); ue.p = new PSUnknown2(); ue.p.pi = 5; ue.p.ps = "preserved"; ue.p.pb = ue.p; - cb.ice_exception(ue); - ue.p.pb = null; // Break the cycle. + exception(ue); } public override void useForward(out Forward f, Ice.Current current) diff --git a/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj b/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj index fc8d6a56b4f..43c89f318d3 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj b/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj index 96cc2980146..b245b1afcc0 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/server/server.csproj @@ -61,7 +61,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj b/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj index b445d99ec19..2da6ae36452 100644 --- a/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj +++ b/csharp/test/Ice/slicing/objects/msbuild/serveramd/serveramd.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice;$(MSBuildProjectDirectory)\..\..</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/stream/msbuild/client/client.csproj b/csharp/test/Ice/stream/msbuild/client/client.csproj index 11c7d301094..9fa30f107f3 100644 --- a/csharp/test/Ice/stream/msbuild/client/client.csproj +++ b/csharp/test/Ice/stream/msbuild/client/client.csproj @@ -62,7 +62,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj index 177e0605cfb..d9e0b7ceb97 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/client/client.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj b/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj index 7e49e725b57..cbb506b3df8 100644 --- a/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj +++ b/csharp/test/Ice/threadPoolPriority/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/timeout/msbuild/client/client.csproj b/csharp/test/Ice/timeout/msbuild/client/client.csproj index 117c26913d3..59b1444b9e4 100644 --- a/csharp/test/Ice/timeout/msbuild/client/client.csproj +++ b/csharp/test/Ice/timeout/msbuild/client/client.csproj @@ -59,7 +59,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/timeout/msbuild/server/server.csproj b/csharp/test/Ice/timeout/msbuild/server/server.csproj index 917190f9874..002cfad016f 100644 --- a/csharp/test/Ice/timeout/msbuild/server/server.csproj +++ b/csharp/test/Ice/timeout/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/udp/msbuild/client/client.csproj b/csharp/test/Ice/udp/msbuild/client/client.csproj index 3d3b91fbfac..1643907d767 100644 --- a/csharp/test/Ice/udp/msbuild/client/client.csproj +++ b/csharp/test/Ice/udp/msbuild/client/client.csproj @@ -56,7 +56,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Ice/udp/msbuild/server/server.csproj b/csharp/test/Ice/udp/msbuild/server/server.csproj index 895f5fca24a..62ffee80c26 100644 --- a/csharp/test/Ice/udp/msbuild/server/server.csproj +++ b/csharp/test/Ice/udp/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceBox/admin/msbuild/client/client.csproj b/csharp/test/IceBox/admin/msbuild/client/client.csproj index 2db20c1112d..f5c502f5132 100644 --- a/csharp/test/IceBox/admin/msbuild/client/client.csproj +++ b/csharp/test/IceBox/admin/msbuild/client/client.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj b/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj index 226bf8d01a8..96514e6968e 100644 --- a/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj +++ b/csharp/test/IceBox/admin/msbuild/testservice/testservice.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceBox/configuration/msbuild/client/client.csproj b/csharp/test/IceBox/configuration/msbuild/client/client.csproj index d773f2636e2..fc4ec34204a 100644 --- a/csharp/test/IceBox/configuration/msbuild/client/client.csproj +++ b/csharp/test/IceBox/configuration/msbuild/client/client.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj b/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj index d46dcdb1052..42cfbd672e1 100644 --- a/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj +++ b/csharp/test/IceBox/configuration/msbuild/testservice/testservice.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj b/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj index e742ad76ab1..a8d9aca896e 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/client/client.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj index b2be657fc75..f6e23e9424b 100644 --- a/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj +++ b/csharp/test/IceDiscovery/simple/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceGrid/simple/msbuild/client/client.csproj b/csharp/test/IceGrid/simple/msbuild/client/client.csproj index 653f2d603d8..57b0336c0d3 100644 --- a/csharp/test/IceGrid/simple/msbuild/client/client.csproj +++ b/csharp/test/IceGrid/simple/msbuild/client/client.csproj @@ -63,7 +63,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceGrid/simple/msbuild/server/server.csproj b/csharp/test/IceGrid/simple/msbuild/server/server.csproj index f269f867c03..7f4329fc961 100644 --- a/csharp/test/IceGrid/simple/msbuild/server/server.csproj +++ b/csharp/test/IceGrid/simple/msbuild/server/server.csproj @@ -53,7 +53,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceSSL/configuration/msbuild/client/client.csproj b/csharp/test/IceSSL/configuration/msbuild/client/client.csproj index 875ea1f1420..3858b1e1bb6 100644 --- a/csharp/test/IceSSL/configuration/msbuild/client/client.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/client/client.csproj @@ -64,7 +64,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceSSL/configuration/msbuild/server/server.csproj b/csharp/test/IceSSL/configuration/msbuild/server/server.csproj index 9513e932b6f..1b85f52142c 100644 --- a/csharp/test/IceSSL/configuration/msbuild/server/server.csproj +++ b/csharp/test/IceSSL/configuration/msbuild/server/server.csproj @@ -58,7 +58,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj b/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj index d99b3831c4d..4e7395f232f 100644 --- a/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj +++ b/csharp/test/IceUtil/inputUtil/msbuild/client/client.csproj @@ -46,7 +46,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Slice/keyword/Client.cs b/csharp/test/Slice/keyword/Client.cs index 168f0e9063e..2d0728a94ee 100644 --- a/csharp/test/Slice/keyword/Client.cs +++ b/csharp/test/Slice/keyword/Client.cs @@ -8,7 +8,6 @@ // ********************************************************************** using System; -using System.Diagnostics; using System.Collections.Generic; public class Client @@ -23,10 +22,10 @@ public class Client public sealed class caseI : @abstract.caseDisp_ { - public override void catch_async(@abstract.AMD_case_catch cb__, int @checked, Ice.Current current__) + public override void + catchAsync(int @checked, Action<int> response, Action<Exception> exception, Ice.Current current__) { - int @continue = 0; - cb__.ice_response(@continue); + response(0); } } @@ -47,10 +46,10 @@ public class Client public sealed class explicitI : @abstract.@explicit { - public override void catch_async(@abstract.AMD_case_catch cb__, int @checked, Ice.Current current__) + public override void + catchAsync(int @checked, Action<int> response, Action<Exception> exception, Ice.Current current__) { - int @continue = 0; - cb__.ice_response(@continue); + response(0); } public override void @default(Ice.Current current) diff --git a/csharp/test/Slice/keyword/msbuild/client/client.csproj b/csharp/test/Slice/keyword/msbuild/client/client.csproj index 2a04eacabb6..fa9e8d350cf 100644 --- a/csharp/test/Slice/keyword/msbuild/client/client.csproj +++ b/csharp/test/Slice/keyword/msbuild/client/client.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Slice/macros/msbuild/client/client.csproj b/csharp/test/Slice/macros/msbuild/client/client.csproj index c363f936147..230e2f872dd 100644 --- a/csharp/test/Slice/macros/msbuild/client/client.csproj +++ b/csharp/test/Slice/macros/msbuild/client/client.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> diff --git a/csharp/test/Slice/structure/msbuild/client/client.csproj b/csharp/test/Slice/structure/msbuild/client/client.csproj index 022d43cdf21..46a1dfd82e6 100644 --- a/csharp/test/Slice/structure/msbuild/client/client.csproj +++ b/csharp/test/Slice/structure/msbuild/client/client.csproj @@ -50,7 +50,6 @@ <PropertyGroup Label="IceBuilder"> <IceBuilderIncludeDirectories>$(IceHome)\slice</IceBuilderIncludeDirectories> <IceBuilderAllowIcePrefix>yes</IceBuilderAllowIcePrefix> - <IceBuilderAdditionalOptions>--compat</IceBuilderAdditionalOptions> </PropertyGroup> <Import Project="$(IceBuilderCsharpTargets)" Condition="Exists('$(IceBuilderCsharpTargets)')" /> </Project> |