Skip to content

Commit 6f579c2

Browse files
dodygdodyg
authored
Merge pull request #379 from dodyg/net6.0
Sync with .NET 6
2 parents 4b42375 + 73ce4f9 commit 6f579c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+242
-107
lines changed

‎.vscode/settings.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
{
22
"gitdoc.enabled": false,
3-
"dotnet.defaultSolution": "disable"
3+
"dotnet.defaultSolution": "disable",
4+
"workbench.colorCustomizations": {
5+
"activityBar.activeBackground": "#3399ff",
6+
"activityBar.background": "#3399ff",
7+
"activityBar.foreground": "#15202b",
8+
"activityBar.inactiveForeground": "#15202b99",
9+
"activityBarBadge.background": "#bf0060",
10+
"activityBarBadge.foreground": "#e7e7e7",
11+
"commandCenter.border": "#e7e7e799",
12+
"sash.hoverBorder": "#3399ff",
13+
"statusBar.background": "#007fff",
14+
"statusBar.debuggingBackground": "#ff8000",
15+
"statusBar.debuggingForeground": "#15202b",
16+
"statusBar.foreground": "#e7e7e7",
17+
"statusBarItem.hoverBackground": "#3399ff",
18+
"statusBarItem.remoteBackground": "#007fff",
19+
"statusBarItem.remoteForeground": "#e7e7e7",
20+
"titleBar.activeBackground": "#007fff",
21+
"titleBar.activeForeground": "#e7e7e7",
22+
"titleBar.inactiveBackground": "#007fff99",
23+
"titleBar.inactiveForeground": "#e7e7e799"
24+
},
25+
"peacock.color": "#007fff"
426
}

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Samples for ASP.NET Core 8.0
22

3-
> [!NOTE]
4-
> This branch is still work in progress. I am restructuring the whole repository to work better for beginners and experts alike.
53

64
Greetings from Cairo, Egypt. You can [sponsor](https://github.com/sponsors/dodyg) this project [here](https://github.com/sponsors/dodyg).
75

@@ -22,7 +20,7 @@ Greetings from Cairo, Egypt. You can [sponsor](https://github.com/sponsors/dodyg
2220
| [Diagnostics](/projects/diagnostics) | 6 | |
2321
| [Endpoint Routing](/projects/endpoint-routing) | 32 | |
2422
| [Email](/projects/mailkit) | 2 | |
25-
| [Elsa Workflow](/projects/elsa) | 14 | |
23+
| [Elsa Workflow - .NET8](/projects/elsa) | 14 | |
2624
| [Features](/projects/features) | 11 | |
2725
| [Generic Hosting](/projects/generic-host) | 9 | |
2826
| [gRPC](/projects/grpc) (including grpc-Web) | 12 | |

‎projects/elsa/composite-activity/.vscode/settings.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"workbench.colorCustomizations": {
3+
"activityBar.activeBackground": "#9ecee7",
4+
"activityBar.background": "#9ecee7",
5+
"activityBar.foreground": "#15202b",
6+
"activityBar.inactiveForeground": "#15202b99",
7+
"activityBarBadge.background": "#d34ca5",
8+
"activityBarBadge.foreground": "#e7e7e7",
9+
"commandCenter.border": "#15202b99",
10+
"sash.hoverBorder": "#9ecee7",
11+
"statusBar.background": "#75b9dd",
12+
"statusBar.debuggingBackground": "#dd9975",
13+
"statusBar.debuggingForeground": "#15202b",
14+
"statusBar.foreground": "#15202b",
15+
"statusBarItem.hoverBackground": "#4ca4d3",
16+
"statusBarItem.remoteBackground": "#75b9dd",
17+
"statusBarItem.remoteForeground": "#15202b",
18+
"titleBar.activeBackground": "#75b9dd",
19+
"titleBar.activeForeground": "#15202b",
20+
"titleBar.inactiveBackground": "#75b9dd99",
21+
"titleBar.inactiveForeground": "#15202b99"
22+
},
23+
"peacock.color": "#75b9dd"
24+
}

‎projects/elsa/composite-activity/Program.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Security.Cryptography;
22
using Elsa.Extensions;
3-
using Elsa.Workflows.Core;
4-
using Elsa.Workflows.Core.Activities;
5-
using Elsa.Workflows.Core.Contracts;
6-
using Elsa.Workflows.Core.Memory;
3+
using Elsa.Workflows;
4+
using Elsa.Workflows.Activities;
5+
using Elsa.Workflows.Contracts;
6+
using Elsa.Workflows.Memory;
77

88
var services = new ServiceCollection();
99
services.AddElsa();

‎projects/elsa/composite-activity/composite-activity.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>true</ImplicitUsings>
5+
<NoWarn>ASP0000</NoWarn>
56
</PropertyGroup>
67
<ItemGroup>
7-
<PackageReference Include="Elsa" Version="3.0.0-preview-preview-3.0.0-740-hotfix-1.771" />
8+
<PackageReference Include="Elsa" Version="3.0.0" />
89
</ItemGroup>
910
</Project>

‎projects/elsa/for-activity/.vscode/settings.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"workbench.colorCustomizations": {
3+
"activityBar.activeBackground": "#2bec95",
4+
"activityBar.background": "#2bec95",
5+
"activityBar.foreground": "#15202b",
6+
"activityBar.inactiveForeground": "#15202b99",
7+
"activityBarBadge.background": "#b66df2",
8+
"activityBarBadge.foreground": "#15202b",
9+
"commandCenter.border": "#15202b99",
10+
"sash.hoverBorder": "#2bec95",
11+
"statusBar.background": "#13d17b",
12+
"statusBar.debuggingBackground": "#d11369",
13+
"statusBar.debuggingForeground": "#e7e7e7",
14+
"statusBar.foreground": "#15202b",
15+
"statusBarItem.hoverBackground": "#0fa25f",
16+
"statusBarItem.remoteBackground": "#13d17b",
17+
"statusBarItem.remoteForeground": "#15202b",
18+
"titleBar.activeBackground": "#13d17b",
19+
"titleBar.activeForeground": "#15202b",
20+
"titleBar.inactiveBackground": "#13d17b99",
21+
"titleBar.inactiveForeground": "#15202b99"
22+
},
23+
"peacock.color": "#13d17b"
24+
}

‎projects/elsa/for-activity/Program.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
using Elsa.Expressions.Models;
21
using Elsa.Extensions;
3-
using Elsa.Workflows.Core.Activities;
4-
using Elsa.Workflows.Core.Contracts;
5-
using Elsa.Workflows.Core.Memory;
6-
using Elsa.Workflows.Core.Models;
7-
using Elsa.Workflows.Core.Services;
2+
using Elsa.Workflows.Activities;
3+
using Elsa.Workflows.Contracts;
4+
using Elsa.Workflows.Memory;
5+
using Elsa.Workflows.Models;
86

97
var services = new ServiceCollection();
108
services.AddElsa();
@@ -20,7 +18,7 @@
2018
Variables = { counter },
2119
Activities =
2220
{
23-
new For(1, 10)
21+
new For(start:1, end:10, step:1)
2422
{
2523
CurrentValue = new Output<object>(counter),
2624
Body = new Sequence

‎projects/elsa/for-activity/for-activity.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>true</ImplicitUsings>
5+
<NoWarn>ASP0000</NoWarn>
56
</PropertyGroup>
67
<ItemGroup>
7-
<PackageReference Include="Elsa" Version="3.0.0-preview-preview-3.0.0-740-hotfix-1.771" />
8+
<PackageReference Include="Elsa" Version="3.0.0" />
89
</ItemGroup>
910
</Project>

‎projects/elsa/foreach-activity/Program.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Elsa.Extensions;
2-
using Elsa.Workflows.Core.Activities;
3-
using Elsa.Workflows.Core.Contracts;
4-
using Elsa.Workflows.Core.Memory;
5-
using Elsa.Workflows.Core.Models;
2+
using Elsa.Workflows.Activities;
3+
using Elsa.Workflows.Contracts;
4+
using Elsa.Workflows.Memory;
5+
using Elsa.Workflows.Models;
66

77
var services = new ServiceCollection();
88
services.AddElsa();

‎projects/elsa/foreach-activity/foreach-activity.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<ImplicitUsings>true</ImplicitUsings>
5+
<NoWarn>ASP0000</NoWarn>
56
</PropertyGroup>
67
<ItemGroup>
7-
<PackageReference Include="Elsa" Version="3.0.0-preview-preview-3.0.0-740-hotfix-1.771" />
8+
<PackageReference Include="Elsa" Version="3.0.0" />
89
</ItemGroup>
910
</Project>

0 commit comments

Comments
 (0)