C# Project updates for 3.8 release

zeroc-ice · May 30, 2024 · 1709c8b · 1709c8b
1 parent ec3f9ff
commit 1709c8b
Show file tree

Hide file tree

Showing 64 changed files with 229 additions and 183 deletions.
diff --git a/csharp/Glacier2/callback/Client.cs b/csharp/Glacier2/callback/Client.cs
@@ -108,7 +108,6 @@ private static int run(Ice.Communicator communicator)
         int acmTimeout = router.getACMTimeout();
         Ice.Connection connection = router.ice_getCachedConnection();
         Debug.Assert(connection != null);
-        connection.setACM(acmTimeout, Ice.Util.None, Ice.ACMHeartbeat.HeartbeatAlways);
         connection.setCloseCallback(_ => Console.WriteLine("The Glacier2 session has been destroyed."));
 
         //

diff --git a/csharp/Glacier2/callback/msbuild/client/client.csproj b/csharp/Glacier2/callback/msbuild/client/client.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
@@ -17,7 +17,7 @@
         <Compile Include="../../CallbackI.cs" />
         <Compile Include="../../CallbackReceiverI.cs" />
         <SliceCompile Include="../../Callback.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Glacier2/callback/msbuild/server/server.csproj b/csharp/Glacier2/callback/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../CallbackI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Callback.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/async/msbuild/client/client.csproj b/csharp/Ice/async/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Hello.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/async/msbuild/server/server.csproj b/csharp/Ice/async/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Server.cs" />
         <Compile Include="../../HelloI.cs" />
         <SliceCompile Include="../../Hello.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/asyncInvocation/msbuild/client/client.csproj b/csharp/Ice/asyncInvocation/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Calculator.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/asyncInvocation/msbuild/server/server.csproj b/csharp/Ice/asyncInvocation/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Server.cs" />
         <Compile Include="../../CalculatorI.cs" />
         <SliceCompile Include="../../Calculator.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/bidir/msbuild/client/client.csproj b/csharp/Ice/bidir/msbuild/client/client.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../CallbackReceiverI.cs" />
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Callback.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/bidir/msbuild/server/server.csproj b/csharp/Ice/bidir/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../CallbackSenderI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Callback.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/callback/msbuild/client/client.csproj b/csharp/Ice/callback/msbuild/client/client.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../CallbackReceiverI.cs" />
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Callback.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/callback/msbuild/server/server.csproj b/csharp/Ice/callback/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../CallbackSenderI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Callback.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/context/msbuild/client/client.csproj b/csharp/Ice/context/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Context.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/context/msbuild/server/server.csproj b/csharp/Ice/context/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../ContextI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Context.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/hello/msbuild/client/client.csproj b/csharp/Ice/hello/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Hello.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/hello/msbuild/server/server.csproj b/csharp/Ice/hello/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../HelloI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Hello.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/interceptor/InterceptorI.cs b/csharp/Ice/interceptor/InterceptorI.cs
@@ -3,10 +3,11 @@
 //
 
 using Demo;
+using Ice;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-class InterceptorI : Ice.DispatchInterceptor
+class InterceptorI : Ice.Object
 {
     internal InterceptorI(Ice.Object servant, AuthenticatorI authenticator, HashSet<string> securedOperations)
     {
@@ -15,9 +16,9 @@ internal InterceptorI(Ice.Object servant, AuthenticatorI authenticator, HashSet<
         _securedOperations = securedOperations;
     }
 
-    public override Task<Ice.OutputStream> dispatch(Ice.Request request)
+    public ValueTask<OutgoingResponse> dispatchAsync(IncomingRequest request)
     {
-        var current = request.getCurrent();
+        var current = request.current;
         //
         // Check if the operation requires authorization to invoke.
         //
@@ -40,7 +41,7 @@ internal InterceptorI(Ice.Object servant, AuthenticatorI authenticator, HashSet<
                 throw new AuthorizationException();
             }
         }
-        return _servant.ice_dispatch(request);
+        return _servant.dispatchAsync(request);
     }
 
     private readonly Ice.Object _servant;

diff --git a/csharp/Ice/interceptor/msbuild/client/client.csproj b/csharp/Ice/interceptor/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Interceptor.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/interceptor/msbuild/server/server.csproj b/csharp/Ice/interceptor/msbuild/server/server.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
@@ -13,7 +13,7 @@
         <Compile Include="../../ThermostatI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Interceptor.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/invoke/msbuild/client/client.csproj b/csharp/Ice/invoke/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Printer.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/invoke/msbuild/server/server.csproj b/csharp/Ice/invoke/msbuild/server/server.csproj
@@ -3,15 +3,15 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../PrinterI.cs" />
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Printer.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/latency/msbuild/client/client.csproj b/csharp/Ice/latency/msbuild/client/client.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>client</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Client.cs" />
         <SliceCompile Include="../../Latency.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>
diff --git a/csharp/Ice/latency/msbuild/server/server.csproj b/csharp/Ice/latency/msbuild/server/server.csproj
@@ -3,14 +3,14 @@
     <PropertyGroup>
         <AssemblyName>server</AssemblyName>
         <OutputType>Exe</OutputType>
-        <TargetFramework>$(AppTargetFramework)</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <OutputPath>../../</OutputPath>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="../../Server.cs" />
         <SliceCompile Include="../../Latency.ice" />
-        <PackageReference Include="zeroc.ice.net" Version="3.7.10" />
+        <PackageReference Include="zeroc.ice.net" Version="3.8.0-alpha0" />
         <PackageReference Include="zeroc.icebuilder.msbuild" Version="5.0.9" />
     </ItemGroup>
 </Project>