Skip to content

Commit a0ce70b

Browse files
Merge branch 'develop'
2 parents 4946620 + 4ee2d99 commit a0ce70b

File tree

67 files changed

+1103
-135
lines changed

Some content is hidden

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

67 files changed

+1103
-135
lines changed

.editorconfig

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
###############################
2+
# Core EditorConfig Options #
3+
###############################
4+
root = true
5+
# All files
6+
[*]
7+
indent_style = space
8+
9+
# XML project files
10+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
11+
indent_size = 2
12+
13+
# XML config files
14+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
15+
indent_size = 2
16+
17+
# Code files
18+
[*.{cs,csx,vb,vbx}]
19+
indent_size = 4
20+
insert_final_newline = true
21+
charset = utf-8-bom
22+
###############################
23+
# .NET Coding Conventions #
24+
###############################
25+
[*.{cs,vb}]
26+
# Organize usings
27+
dotnet_sort_system_directives_first = true
28+
# this. preferences
29+
dotnet_style_qualification_for_field = false:silent
30+
dotnet_style_qualification_for_property = false:silent
31+
dotnet_style_qualification_for_method = false:silent
32+
dotnet_style_qualification_for_event = false:silent
33+
# Language keywords vs BCL types preferences
34+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
35+
dotnet_style_predefined_type_for_member_access = true:silent
36+
# Parentheses preferences
37+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
38+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
39+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
40+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
43+
dotnet_style_readonly_field = true:suggestion
44+
# Expression-level preferences
45+
dotnet_style_object_initializer = true:suggestion
46+
dotnet_style_collection_initializer = true:suggestion
47+
dotnet_style_explicit_tuple_names = true:suggestion
48+
dotnet_style_null_propagation = true:suggestion
49+
dotnet_style_coalesce_expression = true:suggestion
50+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
51+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
52+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
53+
dotnet_style_prefer_auto_properties = true:silent
54+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
55+
dotnet_style_prefer_conditional_expression_over_return = true:silent
56+
###############################
57+
# Naming Conventions #
58+
###############################
59+
# Style Definitions
60+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
61+
# Use PascalCase for constant fields
62+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
63+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
64+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
65+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
66+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
67+
dotnet_naming_symbols.constant_fields.required_modifiers = const
68+
###############################
69+
# C# Coding Conventions #
70+
###############################
71+
[*.cs]
72+
# var preferences
73+
csharp_style_var_for_built_in_types = true:silent
74+
csharp_style_var_when_type_is_apparent = true:silent
75+
csharp_style_var_elsewhere = true:silent
76+
# Expression-bodied members
77+
csharp_style_expression_bodied_methods = false:silent
78+
csharp_style_expression_bodied_constructors = false:silent
79+
csharp_style_expression_bodied_operators = false:silent
80+
csharp_style_expression_bodied_properties = true:silent
81+
csharp_style_expression_bodied_indexers = true:silent
82+
csharp_style_expression_bodied_accessors = true:silent
83+
# Pattern matching preferences
84+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
85+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
86+
# Null-checking preferences
87+
csharp_style_throw_expression = true:suggestion
88+
csharp_style_conditional_delegate_call = true:suggestion
89+
# Modifier preferences
90+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
91+
# Expression-level preferences
92+
csharp_prefer_braces = true:silent
93+
csharp_style_deconstructed_variable_declaration = true:suggestion
94+
csharp_prefer_simple_default_expression = true:suggestion
95+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
96+
csharp_style_inlined_variable_declaration = true:suggestion
97+
###############################
98+
# C# Formatting Rules #
99+
###############################
100+
# New line preferences
101+
csharp_new_line_before_open_brace = all
102+
csharp_new_line_before_else = true
103+
csharp_new_line_before_catch = true
104+
csharp_new_line_before_finally = true
105+
csharp_new_line_before_members_in_object_initializers = true
106+
csharp_new_line_before_members_in_anonymous_types = true
107+
csharp_new_line_between_query_expression_clauses = true
108+
# Indentation preferences
109+
csharp_indent_case_contents = true
110+
csharp_indent_switch_labels = true
111+
csharp_indent_labels = flush_left
112+
# Space preferences
113+
csharp_space_after_cast = true
114+
csharp_space_after_keywords_in_control_flow_statements = true
115+
csharp_space_between_method_call_parameter_list_parentheses = true
116+
csharp_space_between_method_declaration_parameter_list_parentheses = true
117+
csharp_space_between_parentheses = control_flow_statements
118+
csharp_space_before_colon_in_inheritance_clause = true
119+
csharp_space_after_colon_in_inheritance_clause = true
120+
csharp_space_around_binary_operators = before_and_after
121+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
122+
csharp_space_between_method_call_name_and_opening_parenthesis = false
123+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
124+
# Wrapping preferences
125+
csharp_preserve_single_line_statements = true
126+
csharp_preserve_single_line_blocks = true
127+
###############################
128+
# VB Coding Conventions #
129+
###############################
130+
[*.vb]
131+
# Modifier preferences
132+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

.github/workflows/format.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Format
2+
3+
on:
4+
push:
5+
workflow_run:
6+
workflows:
7+
- Create Prerelease
8+
- Create Release
9+
types: [requested]
10+
workflow_dispatch:
11+
pull_request:
12+
types: [opened,edited,synchronize,reopened]
13+
branches:
14+
- main
15+
- develop
16+
17+
env:
18+
DOTNET_VERSION: '8.0.x'
19+
20+
jobs:
21+
format:
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- name: Checkout Code
26+
uses: actions/checkout@v4
27+
28+
- name: Setup .NET
29+
uses: actions/setup-dotnet@v4
30+
with:
31+
dotnet-version: ${{ env.DOTNET_VERSION }}
32+
33+
- name: Format
34+
run: dotnet format
35+
36+
- name: Update Styles
37+
continue-on-error: true
38+
run: |
39+
git config --global user.name 'github-actions'
40+
git config --global user.email 'github-actions@github.com'
41+
git commit -am "Updated code formatting to match rules in .editorconfig"
42+
git push
43+

.github/workflows/publish.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: Publish
22

33
on:
4+
workflow_dispatch:
45
release:
56
types: [published]
67

78
env:
89
BRANCH_NAME: ${{ github.event.release.target_commitish }}
9-
SOLUTION_NAME: 'Hyperbee.Pipeline.sln'
10-
PROJECT_NAME: 'Hyperbee.Pipeline'
10+
SOLUTION_NAME: ${{ vars.SOLUTION_NAME }}
1111
DOTNET_VERSION: '8.0.x'
1212
NUGET_SOURCE: 'https://api.nuget.org/v3/index.json'
1313
BUILD_CONFIGURATION: ''
@@ -19,13 +19,13 @@ jobs:
1919

2020
steps:
2121
- name: Release Configuration
22-
if: ${{ env.BRANCH_NAME == 'main' && github.event.release.prerelease == false }}
22+
if: ${{ env.BRANCH_NAME == 'main' && (github.event.release.prerelease == false || github.event_name == 'workflow_dispatch') }}
2323
run: |
2424
echo "BUILD_CONFIGURATION=Release" >> $GITHUB_ENV
2525
echo "VERSION_SUFFIX=" >> $GITHUB_ENV
2626
2727
- name: Debug Configuration
28-
if: ${{ github.event.release.prerelease }}
28+
if: ${{ (github.event.release.prerelease || github.event_name == 'workflow_dispatch') }}
2929
run: |
3030
echo "BUILD_CONFIGURATION=Debug" >> $GITHUB_ENV
3131
echo "VERSION_SUFFIX=develop.$(date +'%y%m%d%H%M%S')" >> $GITHUB_ENV
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/checkout@v4
4141

4242
- name: Setup .NET
43-
uses: actions/setup-dotnet@v1
43+
uses: actions/setup-dotnet@v4
4444
with:
4545
dotnet-version: ${{ env.DOTNET_VERSION }}
4646

@@ -53,8 +53,5 @@ jobs:
5353
- name: Test
5454
run: dotnet test --no-build --verbosity normal --configuration ${{ env.BUILD_CONFIGURATION }} ${{ env.SOLUTION_NAME }}
5555

56-
- name: Publish
57-
run: dotnet publish --no-build --configuration ${{ env.BUILD_CONFIGURATION }} -o ./publish ./src/${{ env.PROJECT_NAME }}/${{ env.PROJECT_NAME }}.csproj
58-
5956
- name: Pack and Push
6057
run: dotnet pack --no-build --configuration ${{ env.BUILD_CONFIGURATION }} -p:PackageOutputPath=../../output --version-suffix "${{ env.VERSION_SUFFIX }}" -p:PackageSource='${{ env.NUGET_SOURCE }}' -p:PushAfterPack=true -p:PackageApiKey='${{ secrets.NUGET_API_KEY }}'

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/checkout@v4
3939

4040
- name: Setup .NET
41-
uses: actions/setup-dotnet@v3
41+
uses: actions/setup-dotnet@v4
4242
with:
4343
dotnet-version: ${{ env.DOTNET_VERSION }}
4444

.github/workflows/unlist-nuget.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<MajorVersion>1</MajorVersion>
55
<MinorVersion>1</MinorVersion>
6-
<PatchVersion>5</PatchVersion>
6+
<PatchVersion>6</PatchVersion>
77
</PropertyGroup>
88
<!-- Disable automatic package publishing -->
99
<PropertyGroup>

Hyperbee.Pipeline.sln

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
Directory.Build.targets = Directory.Build.targets
1010
LICENSE = LICENSE
1111
README.md = README.md
12+
solution-helper.psm1 = solution-helper.psm1
1213
EndProjectSection
1314
EndProject
1415
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Pipeline", "src\Hyperbee.Pipeline\Hyperbee.Pipeline.csproj", "{6725FAD8-FADC-413A-B352-0CF583DD1CC2}"
@@ -19,7 +20,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1FA7
1920
EndProject
2021
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{4DBDB7F5-3F66-4572-80B5-3322449C77A4}"
2122
ProjectSection(SolutionItems) = preProject
23+
.github\workflows\create-prerelease.yml = .github\workflows\create-prerelease.yml
24+
.github\workflows\create-release.yml = .github\workflows\create-release.yml
25+
.github\workflows\format.yml = .github\workflows\format.yml
26+
.github\workflows\issue-branch.yml = .github\workflows\issue-branch.yml
2227
.github\workflows\publish.yml = .github\workflows\publish.yml
28+
.github\workflows\test-report.yml = .github\workflows\test-report.yml
2329
.github\workflows\test.yml = .github\workflows\test.yml
2430
.github\workflows\update-version.yml = .github\workflows\update-version.yml
2531
EndProjectSection
@@ -28,9 +34,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Pipeline.Tests", "
2834
EndProject
2935
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{884A8242-351E-4363-9B34-E8C202CF7787}"
3036
ProjectSection(SolutionItems) = preProject
37+
docs\childPipeline.md = docs\childPipeline.md
38+
docs\dependencyInjection.md = docs\dependencyInjection.md
39+
docs\execution.md = docs\execution.md
3140
docs\middleware.md = docs\middleware.md
41+
docs\todo.md = docs\todo.md
3242
EndProjectSection
3343
EndProject
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperbee.Pipeline.Caching", "src\Hyperbee.Pipline.Caching\Hyperbee.Pipeline.Caching.csproj", "{833A7497-542F-4B88-A76A-DA520E000F6F}"
45+
EndProject
46+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyperbee.Pipeline.Caching.Tests", "test\Hyperbee.PipelineCaching.Tests\Hyperbee.Pipeline.Caching.Tests.csproj", "{B7E5FBB3-AF2A-4E48-8E6A-10887DC6C4C0}"
47+
EndProject
3448
Global
3549
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3650
Debug|Any CPU = Debug|Any CPU
@@ -45,6 +59,14 @@ Global
4559
{17DA1657-DF82-440F-B1F1-D888BFA9626B}.Debug|Any CPU.Build.0 = Debug|Any CPU
4660
{17DA1657-DF82-440F-B1F1-D888BFA9626B}.Release|Any CPU.ActiveCfg = Release|Any CPU
4761
{17DA1657-DF82-440F-B1F1-D888BFA9626B}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{833A7497-542F-4B88-A76A-DA520E000F6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{833A7497-542F-4B88-A76A-DA520E000F6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{833A7497-542F-4B88-A76A-DA520E000F6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{833A7497-542F-4B88-A76A-DA520E000F6F}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{B7E5FBB3-AF2A-4E48-8E6A-10887DC6C4C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{B7E5FBB3-AF2A-4E48-8E6A-10887DC6C4C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{B7E5FBB3-AF2A-4E48-8E6A-10887DC6C4C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{B7E5FBB3-AF2A-4E48-8E6A-10887DC6C4C0}.Release|Any CPU.Build.0 = Release|Any CPU
4870
EndGlobalSection
4971
GlobalSection(SolutionProperties) = preSolution
5072
HideSolutionNode = FALSE
@@ -54,6 +76,7 @@ Global
5476
{4DBDB7F5-3F66-4572-80B5-3322449C77A4} = {1FA7CE2A-C9DA-4DC3-A242-5A7EAF8EE4FC}
5577
{17DA1657-DF82-440F-B1F1-D888BFA9626B} = {F9B24CD9-E06B-4834-84CB-8C29E5F10BE0}
5678
{884A8242-351E-4363-9B34-E8C202CF7787} = {870D9301-BE3D-44EA-BF9C-FCC2E87FE4CD}
79+
{B7E5FBB3-AF2A-4E48-8E6A-10887DC6C4C0} = {F9B24CD9-E06B-4834-84CB-8C29E5F10BE0}
5780
EndGlobalSection
5881
GlobalSection(ExtensibilityGlobals) = postSolution
5982
SolutionGuid = {32874F5B-B467-4F28-A8E2-82C2536FB228}

0 commit comments

Comments
 (0)