Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
bfarmer67 committed Oct 23, 2024
2 parents 275df7a + 346bad7 commit 465cb03
Show file tree
Hide file tree
Showing 65 changed files with 7,034 additions and 750 deletions.
132 changes: 132 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
###############################
# Core EditorConfig Options #
###############################
root = true
# All files
[*]
indent_style = space

# XML project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2

# XML config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
indent_size = 2

# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom
###############################
# .NET Coding Conventions #
###############################
[*.{cs,vb}]
# Organize usings
dotnet_sort_system_directives_first = true
# this. preferences
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_style_readonly_field = true:suggestion
# Expression-level preferences
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
###############################
# Naming Conventions #
###############################
# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Use PascalCase for constant fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.required_modifiers = const
###############################
# C# Coding Conventions #
###############################
[*.cs]
# var preferences
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_elsewhere = true:silent
# Expression-bodied members
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
# Pattern matching preferences
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
# Null-checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
# Expression-level preferences
csharp_prefer_braces = true:silent
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_prefer_local_over_anonymous_function = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
###############################
# C# Formatting Rules #
###############################
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true
# Indentation preferences
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left
# Space preferences
csharp_space_after_cast = true
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_call_parameter_list_parentheses = true
csharp_space_between_method_declaration_parameter_list_parentheses = true
csharp_space_between_parentheses = control_flow_statements
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true
###############################
# VB Coding Conventions #
###############################
[*.vb]
# Modifier preferences
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
name: Deploy GitHub Pages

on:
# Runs on pushes targeting the default branch
Expand Down
2 changes: 0 additions & 2 deletions AsyncExpressions.sln.DotSettings

This file was deleted.

4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<!-- Solution version numbers -->
<PropertyGroup>
<MajorVersion>1</MajorVersion>
<MinorVersion>1</MinorVersion>
<PatchVersion>5</PatchVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
</PropertyGroup>
<!-- Disable automatic package publishing -->
<PropertyGroup>
Expand Down
31 changes: 19 additions & 12 deletions AsyncExpressions.sln → Hyperbee.Expressions.sln
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,42 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Tests", "Solution Tests", "{FCA0C3C6-AA4C-4EB8-869B-9B12913518FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.AsyncExpressions.Tests", "test\Hyperbee.AsyncExpressions.Tests\Hyperbee.AsyncExpressions.Tests.csproj", "{842C5608-1B04-4287-B46B-5C57C064F936}"
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "docs", "docs\docs.shproj", "{20E826AE-B347-4B31-979F-A58BD97ACDC7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.AsyncExpressions", "src\Hyperbee.AsyncExpressions\Hyperbee.AsyncExpressions.csproj", "{9F20A665-4CEB-4260-AD9B-FA30522878A6}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Expressions.Benchmark", "test\Hyperbee.Expressions.Benchmark\Hyperbee.Expressions.Benchmark.csproj", "{A5460634-68D6-4FBD-A2CF-6AF4083C11F1}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "docs", "docs\docs.shproj", "{20E826AE-B347-4B31-979F-A58BD97ACDC7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Expressions.Tests", "test\Hyperbee.Expressions.Tests\Hyperbee.Expressions.Tests.csproj", "{306BEF61-1D2A-4069-B8FE-FA0405216962}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbee.Expressions", "src\Hyperbee.Expressions\Hyperbee.Expressions.csproj", "{FE9D5B52-7683-4B78-A7E4-2DB55EE61F22}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{842C5608-1B04-4287-B46B-5C57C064F936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{842C5608-1B04-4287-B46B-5C57C064F936}.Debug|Any CPU.Build.0 = Debug|Any CPU
{842C5608-1B04-4287-B46B-5C57C064F936}.Release|Any CPU.ActiveCfg = Release|Any CPU
{842C5608-1B04-4287-B46B-5C57C064F936}.Release|Any CPU.Build.0 = Release|Any CPU
{9F20A665-4CEB-4260-AD9B-FA30522878A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F20A665-4CEB-4260-AD9B-FA30522878A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F20A665-4CEB-4260-AD9B-FA30522878A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F20A665-4CEB-4260-AD9B-FA30522878A6}.Release|Any CPU.Build.0 = Release|Any CPU
{A5460634-68D6-4FBD-A2CF-6AF4083C11F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5460634-68D6-4FBD-A2CF-6AF4083C11F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5460634-68D6-4FBD-A2CF-6AF4083C11F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5460634-68D6-4FBD-A2CF-6AF4083C11F1}.Release|Any CPU.Build.0 = Release|Any CPU
{306BEF61-1D2A-4069-B8FE-FA0405216962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{306BEF61-1D2A-4069-B8FE-FA0405216962}.Debug|Any CPU.Build.0 = Debug|Any CPU
{306BEF61-1D2A-4069-B8FE-FA0405216962}.Release|Any CPU.ActiveCfg = Release|Any CPU
{306BEF61-1D2A-4069-B8FE-FA0405216962}.Release|Any CPU.Build.0 = Release|Any CPU
{FE9D5B52-7683-4B78-A7E4-2DB55EE61F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE9D5B52-7683-4B78-A7E4-2DB55EE61F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE9D5B52-7683-4B78-A7E4-2DB55EE61F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE9D5B52-7683-4B78-A7E4-2DB55EE61F22}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{23A52623-C45D-4588-A695-C40CD8EC1EB0} = {6103145C-EC79-4B5F-9CE6-8F10BFC6ACC5}
{639ADCDD-E258-40E6-BBC3-70D71DE97191} = {23A52623-C45D-4588-A695-C40CD8EC1EB0}
{842C5608-1B04-4287-B46B-5C57C064F936} = {FCA0C3C6-AA4C-4EB8-869B-9B12913518FF}
{20E826AE-B347-4B31-979F-A58BD97ACDC7} = {6103145C-EC79-4B5F-9CE6-8F10BFC6ACC5}
{A5460634-68D6-4FBD-A2CF-6AF4083C11F1} = {FCA0C3C6-AA4C-4EB8-869B-9B12913518FF}
{306BEF61-1D2A-4069-B8FE-FA0405216962} = {FCA0C3C6-AA4C-4EB8-869B-9B12913518FF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9C364B22-809B-45B7-8A8F-2B7A66D3A098}
Expand Down
8 changes: 8 additions & 0 deletions Hyperbee.Expressions.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="__" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Awaiters/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Castclass/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=gotos/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Hyperbee/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ldarg/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Ldarga/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
17 changes: 17 additions & 0 deletions docs/.todo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Things TODO

## Work to be done

- Investigate alternative StateMachine implementation that would allow us to use a struct instead of a class for the state machine.

## State machine Fields
- Are we over adding fields to the StateMachine?
- Look into shared Exceptions object
- Add shared awaiters based on common types

## Documentation
- Add fast compile documation
- Find/Document known limitations
- Unsupported `Await` in SwitchCase TestValues
- Unsupported `Await` in Finally blocks

6 changes: 3 additions & 3 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
title: Hyperbee.CookieCutter
description: Documentation for Hyperbee CookieCutter Projects.
title: Hyperbee.Expressions
description: Documentation for Hyperbee Expressions.
remote_theme: pmarsceill/just-the-docs

# Optional configuration
search_enabled: true
aux_links:
"GitHub Repository":
- "//github.com/Stillpoint-Software/hyperbee.cookiecutter"
- "//github.com/Stillpoint-Software/hyperbee.expressions"
6 changes: 5 additions & 1 deletion docs/docs.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@
<Import_RootNamespace>docs</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)state-machine\overview.md" />
<None Include="$(MSBuildThisFileDirectory)state-machine\state-machine-builder.md" />
<None Include="$(MSBuildThisFileDirectory)state-machine\lowering-visitor.md" />
<None Include="$(MSBuildThisFileDirectory)state-machine\state-machine.md" />
<None Include="$(MSBuildThisFileDirectory)index.md" />
<None Include="$(MSBuildThisFileDirectory)todo.md" />
<None Include="$(MSBuildThisFileDirectory).todo.md" />
<None Include="$(MSBuildThisFileDirectory)_config.yml" />
</ItemGroup>
</Project>
Loading

0 comments on commit 465cb03

Please sign in to comment.