Skip to content

feat(dapr starter): Add Dapr Starter #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 31, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: DaprStarters -> DaprStarter
  • Loading branch information
zhenlei520 committed Oct 31, 2022
commit f8d3fdcf5e2e299d357f559c2bfa2a936e7f5bac
10 changes: 5 additions & 5 deletions Masa.Framework.sln
Original file line number Diff line number Diff line change
Expand Up @@ -581,23 +581,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Development", "Development"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.RulesEngine", "src\BuildingBlocks\RulesEngine\Masa.BuildingBlocks.RulesEngine\Masa.BuildingBlocks.RulesEngine.csproj", "{B03C329C-70F4-442A-B420-90DDF7E31847}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.Development.DaprStarters", "src\BuildingBlocks\Development\Masa.BuildingBlocks.Development.DaprStarters\Masa.BuildingBlocks.Development.DaprStarters.csproj", "{77A9CADA-35D6-419B-87B3-AACC50FFAD0F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.BuildingBlocks.Development.DaprStarter", "src\BuildingBlocks\Development\Masa.BuildingBlocks.Development.DaprStarter\Masa.BuildingBlocks.Development.DaprStarter.csproj", "{77A9CADA-35D6-419B-87B3-AACC50FFAD0F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.RulesEngine.MicrosoftRulesEngine", "src\Contrib\RulesEngine\Masa.Contrib.RulesEngine.MicrosoftRulesEngine\Masa.Contrib.RulesEngine.MicrosoftRulesEngine.csproj", "{4E217EC9-0616-414B-82D9-9107F9826D6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarters", "src\Contrib\Development\Masa.Contrib.Development.DaprStarters\Masa.Contrib.Development.DaprStarters.csproj", "{A6D4C293-E184-42C0-B9B7-3F856BE57EC0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarter", "src\Contrib\Development\Masa.Contrib.Development.DaprStarter\Masa.Contrib.Development.DaprStarter.csproj", "{A6D4C293-E184-42C0-B9B7-3F856BE57EC0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3FADF704-2581-47AC-A1F7-07091B6328A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarters.AspNetCore", "src\Contrib\Development\Masa.Contrib.Development.DaprStarters.AspNetCore\Masa.Contrib.Development.DaprStarters.AspNetCore.csproj", "{E47D82C7-7A1C-4BEF-ACA8-43971FD6C6BA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarter.AspNetCore", "src\Contrib\Development\Masa.Contrib.Development.DaprStarter.AspNetCore\Masa.Contrib.Development.DaprStarter.AspNetCore.csproj", "{E47D82C7-7A1C-4BEF-ACA8-43971FD6C6BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.RulesEngine.MicrosoftRulesEngine.Tests", "src\Contrib\RulesEngine\Tests\Masa.Contrib.RulesEngine.MicrosoftRulesEngine.Tests\Masa.Contrib.RulesEngine.MicrosoftRulesEngine.Tests.csproj", "{EEB2D542-5A2C-4E18-A0E6-72844C359DAD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8CDAF37E-3DB1-4573-B5AA-376C93A8D299}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarters.Tests", "src\Contrib\Development\Tests\Masa.Contrib.Development.DaprStarters.Tests\Masa.Contrib.Development.DaprStarters.Tests.csproj", "{49B51B95-3DC5-45BD-B91A-3056FF5014B5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarter.Tests", "src\Contrib\Development\Tests\Masa.Contrib.Development.DaprStarter.Tests\Masa.Contrib.Development.DaprStarter.Tests.csproj", "{49B51B95-3DC5-45BD-B91A-3056FF5014B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarters.AspNetCore.Tests", "src\Contrib\Development\Tests\Masa.Contrib.Development.DaprStarters.AspNetCore.Tests\Masa.Contrib.Development.DaprStarters.AspNetCore.Tests.csproj", "{DD899DC4-A2B7-4C7B-A644-EDB56A61145C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Contrib.Development.DaprStarter.AspNetCore.Tests", "src\Contrib\Development\Tests\Masa.Contrib.Development.DaprStarter.AspNetCore.Tests\Masa.Contrib.Development.DaprStarter.AspNetCore.Tests.csproj", "{DD899DC4-A2B7-4C7B-A644-EDB56A61145C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.BuildingBlocks.Development.DaprStarters;
namespace Masa.BuildingBlocks.Development.DaprStarter;

public static class Constant
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.BuildingBlocks.Development.DaprStarters;
namespace Masa.BuildingBlocks.Development.DaprStarter;

public enum LogLevel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.BuildingBlocks.Development.DaprStarters;
namespace Masa.BuildingBlocks.Development.DaprStarter;

public enum Protocol
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.BuildingBlocks.Development.DaprStarters;
namespace Masa.BuildingBlocks.Development.DaprStarter;

public interface IDaprProcess : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Data\Masa.BuildingBlocks.Data\Masa.BuildingBlocks.Data.csproj"/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.BuildingBlocks.Development.DaprStarters;
namespace Masa.BuildingBlocks.Development.DaprStarter;

/// <summary>
/// dapr startup configuration information
Expand Down Expand Up @@ -88,7 +88,7 @@ public int? MaxConcurrency

/// <summary>
/// The port your application is listening on
/// Required. Must be greater than 0
/// Required. Must be between 0-65535
/// </summary>
public ushort? AppPort
{
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters.AspNetCore;
namespace Masa.Contrib.Development.DaprStarter.AspNetCore;

[ExcludeFromCodeCoverage]
public class DaprBackgroundService : BackgroundService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters.AspNetCore;
namespace Masa.Contrib.Development.DaprStarter.AspNetCore;

public class DefaultAppPortProvider : IAppPortProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters.AspNetCore;
namespace Masa.Contrib.Development.DaprStarter.AspNetCore;

public interface IAppPortProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\Utils\Masa.Utils.Exceptions\Masa.Utils.Exceptions.csproj" />
<ProjectReference Include="..\Masa.Contrib.Development.DaprStarters\Masa.Contrib.Development.DaprStarters.csproj" />
<ProjectReference Include="..\Masa.Contrib.Development.DaprStarter\Masa.Contrib.Development.DaprStarter.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[中](README.zh-CN.md) | EN

## Masa.Contrib.Development.DaprStarters.AspNetCore
## Masa.Contrib.Development.DaprStarter.AspNetCore

Responsibilities:

Expand All @@ -9,12 +9,12 @@ Assist in managing the dapr process to reduce the dependency on docker compose d
Example:

``` powershell
Install-Package Masa.Contrib.Development.DaprStarters.AspNetCore
Install-Package Masa.Contrib.Development.DaprStarter.AspNetCore
```

### Get Started

1. Add DaprStarter to assist in managing the dapr process (recommended to be used in the development environment)
Add DaprStarter to assist in managing the dapr process (recommended to be used in the development environment)

``` C#
builder.Services.AddDaprStarter();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
中 | [EN](README.md)

## Masa.Contrib.Development.DaprStarters.AspNetCore
## Masa.Contrib.Development.DaprStarter.AspNetCore

职责:

Expand All @@ -9,12 +9,12 @@
用例:

``` powershell
Install-Package Masa.Contrib.Development.DaprStarters.AspNetCore
Install-Package Masa.Contrib.Development.DaprStarter.AspNetCore
```

### 入门

1添加DaprStarter协助管理dapr进程(建议在开发环境使用)
添加DaprStarter协助管理dapr进程(建议在开发环境使用)

```C#
builder.Services.AddDaprStarter();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

global using Masa.BuildingBlocks.Development.DaprStarters;
global using Masa.Contrib.Development.DaprStarters.AspNetCore;
global using Masa.BuildingBlocks.Development.DaprStarter;
global using Masa.Contrib.Development.DaprStarter.AspNetCore;
global using Microsoft.AspNetCore.Hosting.Server;
global using Microsoft.AspNetCore.Hosting.Server.Features;
global using Microsoft.Extensions.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

public class CommandLineBuilder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
public class DaprProcess : DaprProcessBase, IDaprProcess
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
public abstract class DaprProcessBase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
public class DaprProvider : IDaprProvider
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

public interface IDaprProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

// ReSharper disable once CheckNamespace
namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

internal enum DaprProcessStatus
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
internal class DaprCoreOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
internal sealed class ProcessUtils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\BuildingBlocks\Configuration\Masa.BuildingBlocks.Configuration\Masa.BuildingBlocks.Configuration.csproj" />
<ProjectReference Include="..\..\..\BuildingBlocks\Development\Masa.BuildingBlocks.Development.DaprStarters\Masa.BuildingBlocks.Development.DaprStarters.csproj" />
<ProjectReference Include="..\..\..\BuildingBlocks\Development\Masa.BuildingBlocks.Development.DaprStarter\Masa.BuildingBlocks.Development.DaprStarter.csproj" />
<ProjectReference Include="..\..\..\Utils\Extensions\Masa.Utils.Extensions.DotNet\Masa.Utils.Extensions.DotNet.csproj" />
<ProjectReference Include="..\..\..\Utils\Masa.Utils.Exceptions\Masa.Utils.Exceptions.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

// ReSharper disable once CheckNamespace
namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
public class DaprRuntimeOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

public interface IProcess
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

public interface IProcessProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
public class ProcessProvider : IProcessProvider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// ReSharper disable once CheckNamespace

namespace Masa.Contrib.Development.DaprStarters;
namespace Masa.Contrib.Development.DaprStarter;

[ExcludeFromCodeCoverage]
public class SystemProcess : IProcess
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[中](README.zh-CN.md) | EN

## Masa.Contrib.Development.DaprStarters
## Masa.Contrib.Development.DaprStarter

Dapr Starter Core Library

Responsibilities:

Provide core support for Masa.Contrib.Development.DaprStarters.AspNetCore
Provide core support for Masa.Contrib.Development.DaprStarter.AspNetCore

The start, stop, refresh, and dapr daemon of the dapr process are provided by such libraries

Example:

``` powershell
Install-Package Masa.Contrib.Development.DaprStarters
Install-Package Masa.Contrib.Development.DaprStarter
```

### Get Started
Expand All @@ -24,7 +24,7 @@ Install-Package Masa.Contrib.Development.DaprStarters
builder.Services.AddDaprStarterCore();
```

2. Inject IDaprProcess at the specified location as needed, and then call the Start method to start the dapr process or hand it over to Masa.Contrib.Development.DaprStarters.AspNetCore to manage the dapr process. Related documents can be found at [View](../Masa.Contrib.Development.DaprStarters.AspNetCore/README.md)
2. Inject IDaprProcess at the specified location as needed, and then call the Start method to start the dapr process or hand it over to Masa.Contrib.Development.DaprStarter.AspNetCore to manage the dapr process. Related documents can be found at [View](../Masa.Contrib.Development.DaprStarter.AspNetCore/README.md)

Example:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
中 | [EN](README.md)

## Masa.Contrib.Development.DaprStarters
## Masa.Contrib.Development.DaprStarter

Dapr Starter核心库

Expand All @@ -13,7 +13,7 @@ dapr进程的启动、停止、刷新、dapr守护进程均由此类库提供
用例:

``` powershell
Install-Package Masa.Contrib.Development.DaprStarters
Install-Package Masa.Contrib.Development.DaprStarter
```

### 入门
Expand All @@ -24,7 +24,7 @@ Install-Package Masa.Contrib.Development.DaprStarters
builder.Services.AddDaprStarterCore();
```

2. 根据需要在指定位置注入`IDaprProcess`, 之后调用Start方法即可启动`dapr`进程或者交由`Masa.Contrib.Development.DaprStarters.AspNetCore`管理dapr进程,相关文档可[查看](../Masa.Contrib.Development.DaprStarters.AspNetCore/README.zh-CN.md)
2. 根据需要在指定位置注入`IDaprProcess`, 之后调用Start方法即可启动`dapr`进程或者交由`Masa.Contrib.Development.DaprStarter.AspNetCore`管理dapr进程,相关文档可[查看](../Masa.Contrib.Development.DaprStarter.AspNetCore/README.zh-CN.md)

例如:

Expand Down
Loading