Skip to content

Commit 5b185ce

Browse files
authored
Merge pull request #1362 from WhitWaldo/remove-workflow-methods-mergefix
Removed deprecated Workflow methods and types from DaprClient and tests
2 parents 4d78706 + 8948152 commit 5b185ce

File tree

28 files changed

+51
-820
lines changed

28 files changed

+51
-820
lines changed

examples/Actor/ActorClient/Program.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14+
using Dapr.Actors.Communication;
15+
using IDemoActor;
16+
1417
namespace ActorClient
1518
{
1619
using System;
1720
using System.Threading;
1821
using System.Threading.Tasks;
1922
using Dapr.Actors;
2023
using Dapr.Actors.Client;
21-
using IDemoActorInterface;
2224

2325
/// <summary>
2426
/// Actor Client class.
@@ -43,7 +45,7 @@ public static async Task Main(string[] args)
4345

4446
// Make strongly typed Actor calls with Remoting.
4547
// DemoActor is the type registered with Dapr runtime in the service.
46-
var proxy = ActorProxy.Create<IDemoActor>(actorId, "DemoActor");
48+
var proxy = ActorProxy.Create<IDemoActor.IDemoActor>(actorId, "DemoActor");
4749

4850
Console.WriteLine("Making call using actor proxy to save data.");
4951
await proxy.SaveData(data, TimeSpan.FromMinutes(10));

examples/Actor/DemoActor/BankService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14-
using IDemoActorInterface;
14+
using IDemoActor;
1515

16-
namespace DaprDemoActor
16+
namespace DemoActor
1717
{
1818
public class BankService
1919
{

examples/Actor/DemoActor/DemoActor.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14-
namespace DaprDemoActor
15-
{
16-
using System;
17-
using System.Text.Json;
18-
using System.Threading.Tasks;
19-
using Dapr.Actors.Runtime;
20-
using IDemoActorInterface;
14+
using System;
15+
using System.Text.Json;
16+
using System.Threading.Tasks;
17+
using Dapr.Actors.Runtime;
18+
using IDemoActor;
2119

20+
namespace DemoActor
21+
{
2222
// The following example showcases a few features of Actors
2323
//
2424
// Every actor should inherit from the Actor type, and must implement one or more actor interfaces.
@@ -27,7 +27,7 @@ namespace DaprDemoActor
2727
// For Actors to use Reminders, it must derive from IRemindable.
2828
// If you don't intend to use Reminder feature, you can skip implementing IRemindable and reminder
2929
// specific methods which are shown in the code below.
30-
public class DemoActor : Actor, IDemoActor, IBankActor, IRemindable
30+
public class DemoActor : Actor, IDemoActor.IDemoActor, IBankActor, IRemindable
3131
{
3232
private const string StateName = "my_data";
3333

examples/Actor/DemoActor/Program.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14-
namespace DaprDemoActor
15-
{
16-
using Microsoft.AspNetCore.Hosting;
17-
using Microsoft.Extensions.Hosting;
14+
using Microsoft.AspNetCore.Hosting;
15+
using Microsoft.Extensions.Hosting;
1816

17+
namespace DemoActor
18+
{
1919
public class Program
2020
{
2121
public static void Main(string[] args)

examples/Actor/DemoActor/Startup.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14-
namespace DaprDemoActor
15-
{
16-
using Microsoft.AspNetCore.Builder;
17-
using Microsoft.AspNetCore.Hosting;
18-
using Microsoft.Extensions.Configuration;
19-
using Microsoft.Extensions.DependencyInjection;
20-
using Microsoft.Extensions.Hosting;
14+
using Microsoft.AspNetCore.Builder;
15+
using Microsoft.AspNetCore.Hosting;
16+
using Microsoft.Extensions.Configuration;
17+
using Microsoft.Extensions.DependencyInjection;
18+
using Microsoft.Extensions.Hosting;
2119

20+
namespace DemoActor
21+
{
2222
public class Startup
2323
{
2424
public Startup(IConfiguration configuration)

examples/Actor/IDemoActor/IBankActor.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14-
namespace IDemoActorInterface
15-
{
16-
using System;
17-
using System.Threading.Tasks;
18-
using Dapr.Actors;
14+
using System;
15+
using System.Threading.Tasks;
16+
using Dapr.Actors;
1917

18+
namespace IDemoActor
19+
{
2020
public interface IBankActor : IActor
2121
{
2222
Task<AccountBalance> GetAccountBalance();

examples/Actor/IDemoActor/IDemoActor.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14-
namespace IDemoActorInterface
15-
{
16-
using System;
17-
using System.Threading.Tasks;
18-
using Dapr.Actors;
19-
using Dapr.Actors.Runtime;
14+
using System;
15+
using System.Threading.Tasks;
16+
using Dapr.Actors;
2017

18+
namespace IDemoActor
19+
{
2120
/// <summary>
2221
/// Interface for Actor method.
2322
/// </summary>

examples/AspNetCore/ControllerSample/CustomTopicAttribute.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14+
using Dapr.AspNetCore;
15+
1416
namespace ControllerSample
1517
{
1618
using System;

examples/AspNetCore/ControllerSample/Startup.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// limitations under the License.
1212
// ------------------------------------------------------------------------
1313

14+
using Dapr.AspNetCore;
15+
1416
namespace ControllerSample
1517
{
1618
using Microsoft.AspNetCore.Builder;

examples/AspNetCore/GrpcServiceSample/Services/BankingService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using GrpcServiceSample.Generated;
2323
using Microsoft.Extensions.Logging;
2424

25-
namespace GrpcServiceSample
25+
namespace GrpcServiceSample.Services
2626
{
2727
/// <summary>
2828
/// BankAccount gRPC service

0 commit comments

Comments
 (0)