Merge branch 'master' of https://github.com/dapr/dotnet-sdk into work…

…flow-log-tracing
dapr · Nov 5, 2023 · 71064cf · 71064cf
2 parents 3917fb9 + 2332388
commit 71064cf
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 11 deletions.
diff --git a/examples/Actor/ActorClient/Program.cs b/examples/Actor/ActorClient/Program.cs
@@ -18,7 +18,6 @@ namespace ActorClient
     using System.Threading.Tasks;
     using Dapr.Actors;
     using Dapr.Actors.Client;
-    using Dapr.Actors.Communication;
     using IDemoActorInterface;
 
     /// <summary>
@@ -69,7 +68,7 @@ public static async Task Main(string[] args)
             }
             catch (ActorMethodInvocationException ex)
             {
-                if (ex.InnerException is NotImplementedException)
+                if (ex.InnerException is ActorInvokeException invokeEx && invokeEx.ActualExceptionType is "System.NotImplementedException")
                 {
                     Console.WriteLine($"Got Correct Exception from actor method invocation.");
                 }
@@ -111,7 +110,7 @@ public static async Task Main(string[] args)
             await Task.Delay(5000);
             Console.WriteLine("Getting details of the registered reminder");
             reminder = await proxy.GetReminder();
-            Console.WriteLine($"Received reminder is {reminder}.");
+            Console.WriteLine($"Received reminder is {reminder?.ToString() ?? "None"} (expecting None).");
             Console.WriteLine("Registering reminder with ttl and repetitions, i.e. reminder stops when either condition is met - The reminder will repeat 2 times.");
             await proxy.RegisterReminderWithTtlAndRepetitions(TimeSpan.FromSeconds(5), 2);
             Console.WriteLine("Getting details of the registered reminder");

diff --git a/examples/Actor/DemoActor/DemoActor.cs b/examples/Actor/DemoActor/DemoActor.cs
@@ -85,9 +85,18 @@ public async Task RegisterReminderWithTtlAndRepetitions(TimeSpan ttl, int repeti
             await this.RegisterReminderAsync("TestReminder", null, TimeSpan.FromSeconds(0), TimeSpan.FromSeconds(1), repetitions, ttl);
         }
 
-        public async Task<IActorReminder> GetReminder()
-        {
-            return await this.GetReminderAsync("TestReminder");
+        public async Task<ActorReminderData> GetReminder()
+        {
+            var reminder = await this.GetReminderAsync("TestReminder");
+
+            return reminder is not null
+                ? new ActorReminderData
+                {
+                    Name = reminder.Name,
+                    Period = reminder.Period,
+                    DueTime = reminder.DueTime
+                }
+                : null;
         }
 
         public Task UnregisterReminder()

diff --git a/examples/Actor/IDemoActor/IDemoActor.cs b/examples/Actor/IDemoActor/IDemoActor.cs
@@ -100,7 +100,7 @@ public interface IDemoActor : IActor
         /// </summary>
         /// <param name="reminderName">The name of the reminder.</param>
         /// <returns>A task that returns the reminder after completion.</returns>
-        Task<IActorReminder> GetReminder();
+        Task<ActorReminderData> GetReminder();
 
         /// <summary>
         /// Unregisters the registered timer.
@@ -132,4 +132,18 @@ public override string ToString()
             return $"PropertyA: {propAValue}, PropertyB: {propBValue}";
         }
     }
+
+    public class ActorReminderData
+    {
+        public string Name { get; set; }
+
+        public TimeSpan DueTime { get; set; }
+
+        public TimeSpan Period { get; set; }
+
+        public override string ToString()
+        {
+            return $"Name: {this.Name}, DueTime: {this.DueTime}, Period: {this.Period}";
+        }
+    }
 }
diff --git a/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj b/examples/Workflow/WorkflowConsoleApp/WorkflowConsoleApp.csproj
@@ -8,7 +8,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>latest</LangVersion>
     <NoWarn>612,618</NoWarn>
   </PropertyGroup>
 

diff --git a/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj b/examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/properties/dapr_managed_netcore.props b/properties/dapr_managed_netcore.props
@@ -3,7 +3,7 @@
   <Import Project="dapr_common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>

diff --git a/src/Dapr.Workflow/Dapr.Workflow.csproj b/src/Dapr.Workflow/Dapr.Workflow.csproj
@@ -9,7 +9,6 @@
     <Description>Dapr Workflow SDK for building workflows as code with Dapr</Description>
     <VersionPrefix>0.3.0</VersionPrefix>
     <VersionSuffix>alpha</VersionSuffix>
-    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>