Merge branch 'remove-workflow-methods' into remote-workflow-methods-4

# Conflicts:
#	test/Dapr.E2E.Test/Workflows/WorkflowTest.cs

examples/Actor/ActorClient/Program.cs

@@ -11,14 +11,16 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using Dapr.Actors.Communication;
+using IDemoActor;
+
 namespace ActorClient
 {
     using System;
     using System.Threading;
     using System.Threading.Tasks;
     using Dapr.Actors;
     using Dapr.Actors.Client;
-    using IDemoActorInterface;
 
     /// <summary>
     /// Actor Client class.
@@ -43,7 +45,7 @@ public static async Task Main(string[] args)
 
             // Make strongly typed Actor calls with Remoting.
             // DemoActor is the type registered with Dapr runtime in the service.
-            var proxy = ActorProxy.Create<IDemoActor>(actorId, "DemoActor");
+            var proxy = ActorProxy.Create<IDemoActor.IDemoActor>(actorId, "DemoActor");
 
             Console.WriteLine("Making call using actor proxy to save data.");
             await proxy.SaveData(data, TimeSpan.FromMinutes(10));

examples/Actor/DemoActor/BankService.cs

@@ -11,9 +11,9 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-using IDemoActorInterface;
+using IDemoActor;
 
-namespace DaprDemoActor
+namespace DemoActor
 {
     public class BankService
     {

examples/Actor/DemoActor/DemoActor.cs

@@ -11,14 +11,14 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-namespace DaprDemoActor
-{
-    using System;
-    using System.Text.Json;
-    using System.Threading.Tasks;
-    using Dapr.Actors.Runtime;
-    using IDemoActorInterface;
+using System;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Dapr.Actors.Runtime;
+using IDemoActor;
 
+namespace DemoActor
+{
     // The following example showcases a few features of Actors
     //
     // Every actor should inherit from the Actor type, and must implement one or more actor interfaces.
@@ -27,7 +27,7 @@ namespace DaprDemoActor
     // For Actors to use Reminders, it must derive from IRemindable.
     // If you don't intend to use Reminder feature, you can skip implementing IRemindable and reminder 
     // specific methods which are shown in the code below.
-    public class DemoActor : Actor, IDemoActor, IBankActor, IRemindable
+    public class DemoActor : Actor, IDemoActor.IDemoActor, IBankActor, IRemindable
     {
         private const string StateName = "my_data";
 

examples/Actor/DemoActor/Program.cs

@@ -11,11 +11,11 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-namespace DaprDemoActor
-{
-    using Microsoft.AspNetCore.Hosting;
-    using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
+namespace DemoActor
+{
     public class Program
     {
         public static void Main(string[] args)

examples/Actor/DemoActor/Startup.cs

@@ -11,14 +11,14 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-namespace DaprDemoActor
-{
-    using Microsoft.AspNetCore.Builder;
-    using Microsoft.AspNetCore.Hosting;
-    using Microsoft.Extensions.Configuration;
-    using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.Extensions.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
+namespace DemoActor
+{
     public class Startup
     {
         public Startup(IConfiguration configuration)

examples/Actor/IDemoActor/IBankActor.cs

@@ -11,12 +11,12 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-namespace IDemoActorInterface
-{
-    using System;
-    using System.Threading.Tasks;
-    using Dapr.Actors;
+using System;
+using System.Threading.Tasks;
+using Dapr.Actors;
 
+namespace IDemoActor
+{
     public interface IBankActor : IActor
     {
         Task<AccountBalance> GetAccountBalance();

examples/Actor/IDemoActor/IDemoActor.cs

@@ -11,13 +11,12 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-namespace IDemoActorInterface
-{
-    using System;
-    using System.Threading.Tasks;
-    using Dapr.Actors;
-    using Dapr.Actors.Runtime;
+using System;
+using System.Threading.Tasks;
+using Dapr.Actors;
 
+namespace IDemoActor
+{
     /// <summary>
     /// Interface for Actor method.
     /// </summary>

examples/AspNetCore/ControllerSample/CustomTopicAttribute.cs

@@ -11,6 +11,8 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using Dapr.AspNetCore;
+
 namespace ControllerSample
 {
     using System;

examples/AspNetCore/ControllerSample/Startup.cs

@@ -11,6 +11,8 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using Dapr.AspNetCore;
+
 namespace ControllerSample
 {
     using Microsoft.AspNetCore.Builder;

examples/AspNetCore/GrpcServiceSample/Services/BankingService.cs

@@ -22,7 +22,7 @@
 using GrpcServiceSample.Generated;
 using Microsoft.Extensions.Logging;
 
-namespace GrpcServiceSample
+namespace GrpcServiceSample.Services
 {
     /// <summary>
     /// BankAccount gRPC service

examples/AspNetCore/GrpcServiceSample/Startup.cs

@@ -11,6 +11,8 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using Dapr.AspNetCore;
+using GrpcServiceSample.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

examples/Client/ConfigurationApi/Startup.cs

@@ -1,4 +1,5 @@
 using System;
+using Dapr.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;

examples/Client/Cryptography/Program.cs

@@ -11,10 +11,9 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
-using Cryptography;
 using Cryptography.Examples;
 
-namespace Samples.Client
+namespace Cryptography
 {
     class Program
     {

examples/Client/DistributedLock/Startup.cs

@@ -1,4 +1,5 @@
-using DistributedLock.Services;
+using Dapr.AspNetCore;
+using DistributedLock.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;

examples/Workflow/WorkflowConsoleApp/Activities/ProcessPaymentActivity.cs

@@ -1,7 +1,6 @@
 using Dapr.Client;
 using Dapr.Workflow;
 using Microsoft.Extensions.Logging;
-using WorkflowConsoleApp.Models;
 
 namespace WorkflowConsoleApp.Activities
 {

examples/Workflow/WorkflowConsoleApp/Activities/RequestApprovalActivity.cs

@@ -1,6 +1,5 @@
 using Dapr.Workflow;
 using Microsoft.Extensions.Logging;
-using WorkflowConsoleApp.Models;
 
 namespace WorkflowConsoleApp.Activities
 {

examples/Workflow/WorkflowConsoleApp/Activities/ReserveInventoryActivity.cs

@@ -1,7 +1,6 @@
 using Dapr.Client;
 using Dapr.Workflow;
 using Microsoft.Extensions.Logging;
-using WorkflowConsoleApp.Models;
 
 namespace WorkflowConsoleApp.Activities
 {

examples/Workflow/WorkflowConsoleApp/Activities/UpdateInventoryActivity.cs

@@ -1,6 +1,5 @@
 using Dapr.Client;
 using Dapr.Workflow;
-using WorkflowConsoleApp.Models;
 using Microsoft.Extensions.Logging;
 
 namespace WorkflowConsoleApp.Activities

examples/Workflow/WorkflowConsoleApp/Models.cs

@@ -1,4 +1,4 @@
-namespace WorkflowConsoleApp.Models 
+namespace WorkflowConsoleApp 
 {
     public record OrderPayload(string Name, double TotalCost, int Quantity = 1);
     public record InventoryRequest(string RequestId, string ItemName, int Quantity);

examples/Workflow/WorkflowConsoleApp/Program.cs

@@ -1,10 +1,10 @@
 using Dapr.Client;
 using Dapr.Workflow;
 using WorkflowConsoleApp.Activities;
-using WorkflowConsoleApp.Models;
 using WorkflowConsoleApp.Workflows;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using WorkflowConsoleApp;
 
 const string StoreName = "statestore";
 

examples/Workflow/WorkflowConsoleApp/Workflows/OrderProcessingWorkflow.cs

@@ -1,6 +1,5 @@
 using Dapr.Workflow;
 using WorkflowConsoleApp.Activities;
-using WorkflowConsoleApp.Models;
 
 namespace WorkflowConsoleApp.Workflows
 {

examples/Workflow/WorkflowUnitTest/OrderProcessingTests.cs

@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
 using Dapr.Workflow;
 using Moq;
+using WorkflowConsoleApp;
 using WorkflowConsoleApp.Activities;
-using WorkflowConsoleApp.Models;
 using WorkflowConsoleApp.Workflows;
 using Xunit;