Merge branch 'master' into bug/476_multiple_methods_per_interface_wit…

…h_json_serialisation_doesntwork
dapr · Oct 28, 2024 · 9e34381 · 9e34381
2 parents a7f0a92 + 03038fa
commit 9e34381
Show file tree

Hide file tree

Showing 102 changed files with 1,206 additions and 702 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -21,7 +21,7 @@
         <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
         <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
         <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0" />
         <PackageVersion Include="Microsoft.DurableTask.Client.Grpc" Version="1.3.0" />
         <PackageVersion Include="Microsoft.DurableTask.Worker.Grpc" Version="1.3.0" />

diff --git a/examples/Actor/ActorClient/Program.cs b/examples/Actor/ActorClient/Program.cs
@@ -85,7 +85,7 @@ public static async Task Main(string[] args)
             var nonRemotingProxy = ActorProxy.Create(actorId, "DemoActor");
             await nonRemotingProxy.InvokeMethodAsync("TestNoArgumentNoReturnType");
             await nonRemotingProxy.InvokeMethodAsync("SaveData", data);
-            var res = await nonRemotingProxy.InvokeMethodAsync<MyData>("GetData");
+            await nonRemotingProxy.InvokeMethodAsync<MyData>("GetData");
 
             Console.WriteLine("Registering the timer and reminder");
             await proxy.RegisterTimer();

diff --git a/examples/AspNetCore/GrpcServiceSample/Program.cs b/examples/AspNetCore/GrpcServiceSample/Program.cs
@@ -11,11 +11,6 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Hosting;

diff --git a/examples/AspNetCore/RoutingSample/Startup.cs b/examples/AspNetCore/RoutingSample/Startup.cs
@@ -221,7 +221,6 @@ await JsonSerializer.SerializeAsync(context.Response.Body,
 
             async Task ViewErrorMessage(HttpContext context)
             {
-                var client = context.RequestServices.GetRequiredService<DaprClient>();
                 var transaction = await JsonSerializer.DeserializeAsync<Transaction>(context.Request.Body, serializerOptions);
 
                 logger.LogInformation("The amount cannot be negative: {0}", transaction.Amount);

diff --git a/examples/AspNetCore/SecretStoreConfigurationProviderSample/Program.cs b/examples/AspNetCore/SecretStoreConfigurationProviderSample/Program.cs
@@ -18,7 +18,6 @@
     using Dapr.Client;
     using Dapr.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
-    using System.Collections.Generic;
     using System;
 
     /// <summary>

diff --git a/examples/Client/ConfigurationApi/Controllers/ConfigurationController.cs b/examples/Client/ConfigurationApi/Controllers/ConfigurationController.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using ControllerSample;
 using Dapr;

diff --git a/examples/Client/ConfigurationApi/Program.cs b/examples/Client/ConfigurationApi/Program.cs
@@ -4,7 +4,6 @@
 using Dapr.Client;
 using Dapr.Extensions.Configuration;
 using System.Collections.Generic;
-using System.Threading;
 
 namespace ConfigurationApi
 {

diff --git a/examples/Client/ConfigurationApi/Startup.cs b/examples/Client/ConfigurationApi/Startup.cs
@@ -1,11 +1,8 @@
-using System;
-using Dapr.AspNetCore;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Primitives;
 
 namespace ConfigurationApi
 {

diff --git a/examples/Client/DistributedLock/Controllers/BindingController.cs b/examples/Client/DistributedLock/Controllers/BindingController.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Linq;
-using System.Text;
+using System;
+using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Dapr;

diff --git a/examples/Client/DistributedLock/Model/StateData.cs b/examples/Client/DistributedLock/Model/StateData.cs
@@ -1,5 +1,4 @@
-using System;
-namespace DistributedLock.Model
+namespace DistributedLock.Model
 {
 #nullable enable
     public class StateData

diff --git a/examples/Client/DistributedLock/Program.cs b/examples/Client/DistributedLock/Program.cs
@@ -1,11 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 
 namespace DistributedLock
 {

diff --git a/examples/Client/ServiceInvocation/InvokeServiceHttpClientExample.cs b/examples/Client/ServiceInvocation/InvokeServiceHttpClientExample.cs
@@ -13,7 +13,6 @@
 
 using System;
 using System.Net.Http.Json;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Dapr.Client;

diff --git a/examples/GeneratedActor/ActorClient/ActorClient.csproj b/examples/GeneratedActor/ActorClient/ActorClient.csproj
@@ -1,22 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6</TargetFramework>
-    <LangVersion>10.0</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6</TargetFramework>
+        <LangVersion>10.0</LangVersion>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ActorCommon\ActorCommon.csproj" />
-    <ProjectReference Include="..\..\..\src\Dapr.Actors\Dapr.Actors.csproj" />
-  </ItemGroup>
+        <!-- Persist the source generator (and other) files to disk -->
+        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+        <!-- 👇 The "base" path for the source generators -->
+        <!--<GeneratedFolder>Generated</GeneratedFolder>-->
+        <!-- 👇 Write the output for each target framework to a different sub-folder -->
+        <!--<CompilerGeneratedFilesOutputPath>$(GeneratedFolder)\$(TargetFramework)</CompilerGeneratedFilesOutputPath>-->
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Dapr.Actors.Generators\Dapr.Actors.Generators.csproj"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\ActorCommon\ActorCommon.csproj" />
+        <ProjectReference Include="..\..\..\src\Dapr.Actors\Dapr.Actors.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\..\src\Dapr.Actors.Generators\Dapr.Actors.Generators.csproj"
+                          OutputItemType="Analyzer"
+                          ReferenceOutputAssembly="false" />
+    </ItemGroup>
 
 </Project>
diff --git a/examples/GeneratedActor/ActorClient/IClientActor.cs b/examples/GeneratedActor/ActorClient/IClientActor.cs
@@ -1,4 +1,4 @@
-// ------------------------------------------------------------------------
+// ------------------------------------------------------------------------
 // Copyright 2023 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.

diff --git a/examples/GeneratedActor/ActorClient/Program.cs b/examples/GeneratedActor/ActorClient/Program.cs
@@ -23,7 +23,7 @@
 
 var client = new ClientActorClient(proxy);
 
-var state = await client.GetStateAsync(cancellationTokenSource.Token);
+await client.GetStateAsync(cancellationTokenSource.Token);
 
 await client.SetStateAsync(new ClientState("Hello, World!"), cancellationTokenSource.Token);
 

diff --git a/examples/Workflow/WorkflowConsoleApp/Activities/ProcessPaymentActivity.cs b/examples/Workflow/WorkflowConsoleApp/Activities/ProcessPaymentActivity.cs
@@ -1,5 +1,4 @@
-using Dapr.Client;
-using Dapr.Workflow;
+using Dapr.Workflow;
 using Microsoft.Extensions.Logging;
 
 namespace WorkflowConsoleApp.Activities

diff --git a/examples/Workflow/WorkflowUnitTest/OrderProcessingTests.cs b/examples/Workflow/WorkflowUnitTest/OrderProcessingTests.cs
@@ -64,7 +64,7 @@ public async Task TestInsufficientInventory()
                 .Returns(Task.FromResult(inventoryResult));
 
             // Run the workflow directly
-            OrderResult result = await new OrderProcessingWorkflow().RunAsync(mockContext.Object, order);
+            await new OrderProcessingWorkflow().RunAsync(mockContext.Object, order);
 
             // Verify that ReserveInventoryActivity was called with a specific input
             mockContext.Verify(