Skip to content

Commit

Permalink
Merge branch 'main' into 964-create-modules-sdk
Browse files Browse the repository at this point in the history
Signed-off-by: Serhii A. Hrytsenko <[email protected]>

# Conflicts:
#	src/HomeInventory/Directory.Packages.props
#	src/HomeInventory/HomeInventory.Api/AppBuilder.cs
#	src/HomeInventory/HomeInventory.Api/AssemblyReference.cs
#	src/HomeInventory/HomeInventory.Api/Program.cs
#	src/HomeInventory/HomeInventory.Application.Framework/FeatureManagerExtensions.cs
#	src/HomeInventory/HomeInventory.Application.Framework/Messaging/CommandHandler.cs
#	src/HomeInventory/HomeInventory.Application/Cqrs/Behaviors/LoggingBehavior.cs
#	src/HomeInventory/HomeInventory.Domain/DomainServiceCollectionExtensions.cs
#	src/HomeInventory/HomeInventory.Infrastructure.Framework/Repository.cs
#	src/HomeInventory/HomeInventory.Infrastructure.UserManagement/InfrastructureUserManagementServiceCollectionExtensions.cs
#	src/HomeInventory/HomeInventory.Infrastructure.UserManagement/Models/UserModel.cs
#	src/HomeInventory/HomeInventory.Infrastructure.UserManagement/UserRepository.cs
#	src/HomeInventory/HomeInventory.Infrastructure/InfrastructureServiceCollectionExtensions.cs
#	src/HomeInventory/HomeInventory.Infrastructure/Persistence/DatabaseContext.cs
#	src/HomeInventory/HomeInventory.Tests.Framework/Assertions/AssertionExtensions.cs
#	src/HomeInventory/HomeInventory.Tests.Framework/Assertions/UlidAssertions.cs
#	src/HomeInventory/HomeInventory.Tests.Framework/BaseTest.cs
#	src/HomeInventory/HomeInventory.Tests.Framework/Customizations/FixtureExtensions.cs
#	src/HomeInventory/HomeInventory.Tests.Framework/GivenContext.cs
#	src/HomeInventory/HomeInventory.Tests/Application/FeatureFlagTests.cs
#	src/HomeInventory/HomeInventory.Tests/DependencyInjection/InfrastructureDependencyInjectionTests.cs
#	src/HomeInventory/HomeInventory.Tests/DependencyInjection/TestAppBuilder.cs
#	src/HomeInventory/HomeInventory.Tests/Domain/EntityTests.cs
#	src/HomeInventory/HomeInventory.Tests/Domain/EquatableComponentTests.cs
#	src/HomeInventory/HomeInventory.Tests/HomeInventory.Tests.csproj
#	src/HomeInventory/HomeInventory.Tests/Middlewares/CorrelationIdMiddlewareTests.cs
#	src/HomeInventory/HomeInventory.Tests/Presentation/Web/SectionPathTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Authentication/BCryptPasswordHasherTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Handlers/RegisterCommandHandlerTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Mapping/UlidIdConverterTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Modules/AuthenticationModuleTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Modules/BaseApiModuleGivenTestContext.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Modules/ErrorMappingTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Modules/JsonOpenApiValueConverterTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Modules/UserManagementModuleTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Persistence/AmountValueObjectConverterTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Persistence/EventsPersistenceServiceTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Persistence/OutboxMessageConfigurationTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Persistence/RepositoryTests.cs
#	src/HomeInventory/HomeInventory.Tests/Systems/Persistence/UserModelConfigurationTests.cs
#	src/HomeInventory/HomeInventory.Web.Framework/WebFrameworkServiceCollectionExtensions.cs
#	src/HomeInventory/HomeInventory.Web.UserManagement/UserManagementContractsMappings.cs
#	src/HomeInventory/HomeInventory.Web/Authorization/Dynamic/DynamicAuthorizationServiceCollectionExtensions.cs
#	src/HomeInventory/HomeInventory.Web/WebServiceCollectionExtensions.cs
  • Loading branch information
gritcsenko committed Nov 19, 2024
2 parents 74bcada + 4f9354f commit 454aa81
Show file tree
Hide file tree
Showing 88 changed files with 477 additions and 274 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
if: ${{ success() || steps.report.conclusion == 'failure' }}
run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY
- name: Create code coverage report
uses: danielpalme/ReportGenerator-GitHub-Action@5.3.11
uses: danielpalme/ReportGenerator-GitHub-Action@5.4.1
if: ${{ success() || steps.report.conclusion == 'failure' }}
with:
reports: "./src/HomeInventory/coverage.cobertura.xml" # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
- name: Install Living Documentation Tool
run: dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI
- name: Generate Living Documentation Specification
run: livingdoc test-assembly "HomeInventory.Tests.Acceptance/bin/Release/net8/HomeInventory.Tests.Acceptance.dll" -t "HomeInventory.Tests.Acceptance/bin/Release/net8/TestExecution.json" -o "./Acceptance/AcceptanceTestResults.html"
run: livingdoc test-assembly "HomeInventory.Tests.Acceptance/bin/Release/net9/HomeInventory.Tests.Acceptance.dll" -t "HomeInventory.Tests.Acceptance/bin/Release/net9/TestExecution.json" -o "./Acceptance/AcceptanceTestResults.html"
working-directory: ./src/HomeInventory
- name: Publish Specflow Test Results
if: success() || failure()
Expand Down
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,17 @@ MigrationBackup/
.ionide/
*.feature.cs
src/HomeInventory/coverage

# Default ignored files for Idea
/shelf/
/workspace.xml
# Rider ignored files
/projectSettingsUpdater.xml
/.idea.HomeInventory.iml
/contentModel.xml
/modules.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
13 changes: 13 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 66 additions & 10 deletions src/HomeInventory/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
dotnet_diagnostic.CA2016.severity = warning

# IDE0008: Use explicit type
csharp_style_var_elsewhere = true
csharp_style_var_elsewhere = true:suggestion

[*.cs]
#### Naming styles ####
Expand All @@ -30,21 +30,30 @@ dotnet_naming_style.begin_with__.capitalization = camel_case
csharp_indent_labels = one_less_than_current
csharp_using_directive_placement = outside_namespace:silent
csharp_prefer_simple_using_statement = true:suggestion
csharp_prefer_braces = true:silent
csharp_prefer_braces = true:suggestion
csharp_style_namespace_declarations = file_scoped:suggestion
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent
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
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent
csharp_style_expression_bodied_methods = true:suggestion
csharp_style_expression_bodied_constructors = true:suggestion
csharp_style_expression_bodied_operators = true:suggestion
csharp_style_expression_bodied_properties = true:suggestion
csharp_style_expression_bodied_indexers = true:suggestion
csharp_style_expression_bodied_accessors = true:suggestion
csharp_style_expression_bodied_lambdas = true:suggestion
csharp_style_expression_bodied_local_functions = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_prefer_null_check_over_type_check = true:suggestion

# CS1591: Missing XML comment for publicly visible type or member
dotnet_diagnostic.CS1591.severity = none

# IDE0058: Expression value is never used
dotnet_diagnostic.IDE0058.severity = suggestion

# CA1515: Consider making public types internal
dotnet_diagnostic.CA1515.severity = suggestion

[*.{cs,vb}]
#### Naming styles ####

Expand Down Expand Up @@ -121,3 +130,50 @@ spelling_exclusion_path = .\exclusion.dic
spelling_use_default_exclusion_dictionary = true
csharp_style_prefer_primary_constructors = true:suggestion
dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
csharp_space_around_binary_operators = before_and_after
csharp_prefer_system_threading_lock = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_prefer_local_over_anonymous_function = true:suggestion
csharp_style_prefer_index_operator = true:suggestion
csharp_style_prefer_range_operator = true:suggestion
csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
csharp_style_prefer_tuple_swap = true:suggestion
csharp_style_prefer_utf8_string_literals = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_style_unused_value_assignment_preference = unused_local_variable:silent
csharp_style_unused_value_expression_statement_preference = unused_local_variable:suggestion
dotnet_style_readonly_field = true:suggestion
dotnet_style_predefined_type_for_member_access = true:silent
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
csharp_prefer_static_anonymous_function = true:suggestion
csharp_prefer_static_local_function = true:suggestion
csharp_style_prefer_readonly_struct_member = true:suggestion
csharp_style_prefer_readonly_struct = true:suggestion
dotnet_style_allow_multiple_blank_lines_experimental = false:suggestion
dotnet_style_allow_statement_immediately_after_block_experimental = false:suggestion
csharp_style_allow_embedded_statements_on_same_line_experimental = false:suggestion
csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:suggestion
csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:suggestion
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = false:suggestion
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
dotnet_code_quality_unused_parameters = non_public:suggestion
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
dotnet_style_qualification_for_event = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_field = false:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
csharp_style_prefer_extended_property_pattern = true:suggestion
csharp_style_prefer_not_pattern = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_prefer_pattern_matching = true:suggestion
csharp_style_prefer_switch_expression = true:suggestion
dotnet_diagnostic.xUnit2001.severity = suggestion
71 changes: 71 additions & 0 deletions src/HomeInventory/.idea/.idea.HomeInventory/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/HomeInventory/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net9</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
Expand All @@ -12,13 +12,15 @@
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<WarningLevel>9999</WarningLevel>
<IsPackable>false</IsPackable>
<NoWarn>CA1062;CA2007;CA1716;VISLIB0001</NoWarn>
<NoWarn>$(NoWarn);CA1062;CA2007;CA1716</NoWarn>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="HomeInventory.Tests"/>
<InternalsVisibleTo Include="HomeInventory.Tests.Acceptance"/>
<InternalsVisibleTo Include="HomeInventory.Tests.Framework"/>
<InternalsVisibleTo Include="HomeInventory.Tests.Integration"/>
<InternalsVisibleTo Include="DynamicProxyGenAssembly2"/>
</ItemGroup>

Expand Down
Loading

0 comments on commit 454aa81

Please sign in to comment.