Merge branch 'master' into client-docs-spelling

.github/workflows/itests.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: ['6.0', '7.0']
+        dotnet-version: ['6.0', '7.0', '8.0']
         include:
         - dotnet-version: '6.0'
           display-name: '.NET 6.0'
@@ -31,6 +31,11 @@ jobs:
           framework: 'net7'
           prefix: 'net7'
           install-version: '7.0.x'
+        - dotnet-version: '8.0'
+          display-name: '.NET 8.0'
+          framework: 'net8'
+          prefix: 'net8'
+          install-version: '8.0.x'
     env:
       NUPKG_OUTDIR: bin/Release/nugets
       GOVER: 1.20.3
@@ -101,11 +106,11 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{ matrix.install-version }}
-      - name: Setup .NET 7.0 # net7 is always required.
+      - name: Setup .NET 8.0 # net8 is always required.
         uses: actions/setup-dotnet@v1
-        if: ${{ matrix.install-version != '7.0.x' }}
+        if: ${{ matrix.install-version != '8.0.x' }}
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Build
         # disable deterministic builds, just for test run. Deterministic builds break coverage for some reason
         run: dotnet build --configuration release /p:GITHUB_ACTIONS=false

.github/workflows/sdk_build.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Build
         run: dotnet build --configuration release
       - name: Generate Packages
@@ -42,7 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: ['6.0', '7.0']
+        dotnet-version: ['6.0', '7.0', '8.0']
         include:
         - dotnet-version: '6.0'
           install-3: false
@@ -56,6 +56,12 @@ jobs:
           framework: 'net7'
           prefix: 'net7'
           install-version: '7.0.x'
+        - dotnet-version: '8.0'
+          install-3: false
+          display-name: '.NET 8.0'
+          framework: 'net8'
+          prefix: 'net8'
+          install-version: '8.0.x'
     steps:
     - uses: actions/checkout@v1
     - name: Parse release version
@@ -64,11 +70,11 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ matrix.install-version }}
-    - name: Setup .NET 7.0 # net7 is always required.
+    - name: Setup .NET 8.0 # net8 is always required.
       uses: actions/setup-dotnet@v1
-      if: ${{ matrix.install-version != '7.0.x' }}
+      if: ${{ matrix.install-version != '8.0.x' }}
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
     - name: Build
       # disable deterministic builds, just for test run. Deterministic builds break coverage for some reason
       run: dotnet build --configuration release /p:GITHUB_ACTIONS=false

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");

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()

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}";
+        }
+    }
 }

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>
 

examples/Workflow/WorkflowUnitTest/WorkflowUnitTest.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <LangVersion>10</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

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>

src/Dapr.Actors.AspNetCore/ActorsEndpointRouteBuilderExtensions.cs

@@ -109,7 +109,7 @@ private static IEndpointConventionBuilder MapActorMethodEndpoint(this IEndpointR
                         if (header != string.Empty)
                         {
                             // exception case
-                            context.Response.Headers.Add(Constants.ErrorResponseHeaderName, header); // add error header
+                            context.Response.Headers[Constants.ErrorResponseHeaderName] = header; // add error header
                         }
 
                         await context.Response.Body.WriteAsync(body, 0, body.Length); // add response message body
@@ -118,7 +118,7 @@ private static IEndpointConventionBuilder MapActorMethodEndpoint(this IEndpointR
                     {
                         var (header, body) = CreateExceptionResponseMessage(ex);
 
-                        context.Response.Headers.Add(Constants.ErrorResponseHeaderName, header);
+                        context.Response.Headers[Constants.ErrorResponseHeaderName] = header;
                         await context.Response.Body.WriteAsync(body, 0, body.Length);
                     }
                     finally

src/Dapr.Actors.AspNetCore/Dapr.Actors.AspNetCore.csproj

@@ -1,7 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
-  </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <!--

src/Dapr.Actors/Dapr.Actors.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
-  </PropertyGroup>
-
   <!-- Additional Nuget package properties. -->
   <PropertyGroup>
     <Description>This package contains the reference assemblies for developing Actor services using Dapr.</Description>

src/Dapr.AspNetCore/Dapr.AspNetCore.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
-  </PropertyGroup>
-
   <!-- Additional Nuget package properties. -->
   <PropertyGroup>
     <Description>This package contains the reference assemblies for developing services using Dapr and AspNetCore.</Description>

src/Dapr.AspNetCore/DaprAuthenticationHandler.cs

@@ -25,13 +25,22 @@ internal class DaprAuthenticationHandler : AuthenticationHandler<DaprAuthenticat
     {
         const string DaprApiToken = "Dapr-Api-Token";
 
+#if NET8_0_OR_GREATER
+        public DaprAuthenticationHandler(
+            IOptionsMonitor<DaprAuthenticationOptions> options,
+            ILoggerFactory logger,
+            UrlEncoder encoder) : base(options, logger, encoder)
+        {
+        }
+#else
         public DaprAuthenticationHandler(
             IOptionsMonitor<DaprAuthenticationOptions> options,
             ILoggerFactory logger,
             UrlEncoder encoder,
             ISystemClock clock) : base(options, logger, encoder, clock)
         {
         }
+#endif
 
         protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {

src/Dapr.Client/Dapr.Client.csproj

@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\Shared\ArgumentVerifier.cs" />
     <Compile Include="..\Shared\DaprDefaults.cs" />

src/Dapr.Client/DaprApiException.cs

@@ -92,6 +92,9 @@ public DaprApiException(string message, Exception inner, string errorCode, bool
         /// </summary>
         /// <param name="info">The <see cref="System.Runtime.Serialization.SerializationInfo" /> object that contains serialized object data of the exception being thrown.</param>
         /// <param name="context">The <see cref="System.Runtime.Serialization.StreamingContext" /> object that contains contextual information about the source or destination. The context parameter is reserved for future use and can be null.</param>
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")] // add this attribute to the serialization ctor
+#endif
         protected DaprApiException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -115,6 +118,9 @@ protected DaprApiException(SerializationInfo info, StreamingContext context)
         public bool IsTransient { get; } = false;
 
         /// <inheritdoc />
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")] // add this attribute to GetObjectData
+#endif
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             base.GetObjectData(info, context);

src/Dapr.Client/DaprException.cs

@@ -47,6 +47,9 @@ public DaprException(string message, Exception innerException)
         /// </summary>
         /// <param name="info">The <see cref="SerializationInfo" /> object that contains serialized object data of the exception being thrown.</param>
         /// <param name="context">The <see cref="StreamingContext" /> object that contains contextual information about the source or destination. The context parameter is reserved for future use and can be null.</param>
+#if NET8_0_OR_GREATER
+    [Obsolete(DiagnosticId = "SYSLIB0051")] // add this attribute to GetObjectData
+#endif
         protected DaprException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

src/Dapr.Extensions.Configuration/Dapr.Extensions.Configuration.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

src/Dapr.Workflow/Dapr.Workflow.csproj

@@ -2,14 +2,14 @@
 
   <!-- NuGet configuration -->
   <PropertyGroup>
-    <TargetFrameworks>net6;net7</TargetFrameworks>
+    <!-- NOTE: Workflows targeted .NET 7 (whereas other packages did not, so we must continue until .NET 7 EOL). -->
+    <TargetFrameworks>net6;net7;net8</TargetFrameworks>
     <Nullable>enable</Nullable>
     <PackageId>Dapr.Workflow</PackageId>
     <Title>Dapr Workflow Authoring SDK</Title>
     <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>

src/Dapr.Workflow/WorkflowLoggingService.cs

@@ -0,0 +1,75 @@
+// ------------------------------------------------------------------------
+// Copyright 2022 The Dapr Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//     http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ------------------------------------------------------------------------
+
+namespace Dapr.Workflow
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Extensions.Hosting;
+    using Microsoft.Extensions.Logging;
+    using Microsoft.Extensions.Configuration;
+
+    /// <summary>
+    /// Defines runtime options for workflows.
+    /// </summary>
+    internal sealed class WorkflowLoggingService : IHostedService
+    {
+        private readonly ILogger<WorkflowLoggingService> logger;
+        private static readonly HashSet<string> registeredWorkflows = new();
+        private static readonly HashSet<string> registeredActivities = new();
+
+        public WorkflowLoggingService(ILogger<WorkflowLoggingService> logger, IConfiguration configuration)
+        {
+            this.logger = logger;
+
+        }
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            this.logger.Log(LogLevel.Information, "WorkflowLoggingService started");
+
+            this.logger.Log(LogLevel.Information, "List of registered workflows");
+            foreach (string item in registeredWorkflows)
+            {
+                this.logger.Log(LogLevel.Information, item);
+            }
+
+            this.logger.Log(LogLevel.Information, "List of registered activities:");
+            foreach (string item in registeredActivities)
+            {
+                this.logger.Log(LogLevel.Information, item);
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            this.logger.Log(LogLevel.Information, "WorkflowLoggingService stopped");
+
+            return Task.CompletedTask;
+        }
+
+        public static void LogWorkflowName(string workflowName)
+        {
+            registeredWorkflows.Add(workflowName);
+        }
+
+        public static void LogActivityName(string activityName)
+        {
+            registeredActivities.Add(activityName);
+        }
+
+    }
+}