Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
zsrdjan committed May 17, 2024
1 parent f55b8f9 commit d56641a
Show file tree
Hide file tree
Showing 28 changed files with 233 additions and 313 deletions.
90 changes: 67 additions & 23 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,32 +1,76 @@
# editorconfig.org

# top-most EditorConfig file
root = true
; EditorConfig helps developers define and maintain consistent
; coding styles between different editors and IDEs.

# Default settings:
# A newline ending every file
# Use 4 spaces as indentation
[*]
insert_final_newline = true
; For more visit http://editorconfig.org.

; Choose between lf or rf on "end_of_line" property
[*.proto]
indent_style = tab
indent_size = tab
tab_width = 4

[*.{asax,ascx,aspx,cs,cshtml,css,htm,html,js,jsx,master,razor,skin,ts,tsx,vb,xaml,xamlx,xoml}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
tab_width = 4

# Xml project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
[*.{appxmanifest,build,config,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,xml,xsd}]
indent_style = space
indent_size = 2
tab_width = 2

[*.{csproj,vbproj,proj,nativeproj,locproj}]
charset = utf-8

# Xml files
[*.{xml,stylecop,resx,ruleset}]
indent_size = 2
[*]

# Xml config files
[*.{props,targets,config,nuspec}]
indent_size = 2
# Standard properties
end_of_line = native
insert_final_newline = false

# YAML config files
[*.{yml,yaml}]
indent_size = 2
# Microsoft .NET properties
csharp_indent_braces = false
csharp_indent_switch_labels = true
csharp_new_line_before_catch = true
csharp_new_line_before_else = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = false
csharp_new_line_before_open_brace = all
csharp_new_line_between_query_expression_clauses = true
csharp_prefer_braces = true
csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
csharp_preserve_single_line_blocks = true
csharp_space_after_cast = true
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_after_comma = true
csharp_space_after_dot = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_semicolon_in_for_statement = true
csharp_space_around_binary_operators = before_and_after
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_before_comma = false
csharp_space_before_dot = false
csharp_space_before_open_square_brackets = false
csharp_space_before_semicolon_in_for_statement = false
csharp_space_between_empty_square_brackets = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_between_square_brackets = false
csharp_style_expression_bodied_accessors = true:suggestion
csharp_style_expression_bodied_constructors = true:suggestion
csharp_style_expression_bodied_methods = true:suggestion
csharp_style_expression_bodied_properties = true:suggestion
csharp_style_var_elsewhere = true:hint
csharp_style_var_for_built_in_types = true:hint
csharp_style_var_when_type_is_apparent = true:hint
csharp_using_directive_placement = outside_namespace:silent
dotnet_style_predefined_type_for_locals_parameters_members = true:hint
dotnet_style_predefined_type_for_member_access = true:hint
dotnet_style_qualification_for_event = false:hint
dotnet_style_qualification_for_field = false:hint
dotnet_style_qualification_for_method = false:hint
dotnet_style_qualification_for_property = false:hint
dotnet_style_require_accessibility_modifiers = for_non_interface_members:hint
50 changes: 25 additions & 25 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,35 @@ name: CI
on:
push:
branches:
- main
- main
pull_request:
branches:
- main
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup dotnet 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.204'
- name: Build and Test
run: ./Build.ps1
shell: pwsh
- name: Push to MyGet
if: false
env:
NUGET_URL: https://www.myget.org/F/TODO/api/v3/index.json
NUGET_API_KEY: ${{ secrets.MYGET_FRAKTALIO_CI_API_KEY }}
run: ./Push.ps1
shell: pwsh
- name: Artifacts
if: false
uses: actions/upload-artifact@v2
with:
name: artifacts
path: artifacts/**/*
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup dotnet 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '8.0.204'
- name: Build and Test
run: ./Build.ps1
shell: pwsh
- name: Push to MyGet
if: false
env:
NUGET_URL: https://www.myget.org/F/TODO/api/v3/index.json
NUGET_API_KEY: ${{ secrets.MYGET_FRAKTALIO_CI_API_KEY }}
run: ./Push.ps1
shell: pwsh
- name: Artifacts
if: false
uses: actions/upload-artifact@v2
with:
name: artifacts
path: artifacts/**/*
20 changes: 9 additions & 11 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="FakeItEasy" Version="8.1.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="NUnit" Version="3.14.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="OneOf" Version="3.0.263" />
<PackageVersion Include="OneOf.SourceGenerator" Version="3.0.263" />
<PackageVersion Include="Verify.NUnit" Version="22.5.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.0"/>
<PackageVersion Include="FakeItEasy" Version="8.1.0"/>
<PackageVersion Include="FluentAssertions" Version="6.12.0"/>
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageVersion Include="NUnit" Version="3.14.0"/>
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0"/>
<PackageVersion Include="Verify.NUnit" Version="22.5.0"/>
<PackageVersion Include="NUnit.Analyzers" Version="4.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
</ItemGroup>
</Project>
</Project>
16 changes: 8 additions & 8 deletions src/Fraktalio.FModel.Contracts/Fraktalio.FModel.Contracts.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations"/>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Fraktalio.FModel.Contracts/IDecider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public interface IDecider<in C, S, E>
Func<C, S, IEnumerable<E>> Decide { get; }
Func<S, E, S> Evolve { get; }
S InitialState { get; }
}
}
4 changes: 1 addition & 3 deletions src/Fraktalio.FModel.Contracts/ISaga.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace Fraktalio.FModel.Contracts;

using System.Collections.Generic;

/// <summary>
/// An interface of the Saga
/// </summary>
Expand All @@ -13,4 +11,4 @@ namespace Fraktalio.FModel.Contracts;
public interface ISaga<in AR, out A>
{
IEnumerable<A> React(AR actionResult);
}
}
2 changes: 1 addition & 1 deletion src/Fraktalio.FModel/Decider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ public Decider<C, Sn, E> DimapOnState<Sn>(Func<Sn, S> fl, Func<S, Sn> fr)
var mappedInternalDecider = internalDecider.DimapOnState(fl, fr);
return mappedInternalDecider.AsDecider();
}
}
}
2 changes: 1 addition & 1 deletion src/Fraktalio.FModel/DeciderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public static class DeciderExtensions
internalDeciderY);
return combinedInternalDecider.AsDecider();
}
}
}
16 changes: 8 additions & 8 deletions src/Fraktalio.FModel/Fraktalio.FModel.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
<ProjectReference Include="..\Fraktalio.FModel.Contracts\Fraktalio.FModel.Contracts.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fraktalio.FModel.Contracts\Fraktalio.FModel.Contracts.csproj"/>
</ItemGroup>

</Project>
Loading

0 comments on commit d56641a

Please sign in to comment.