Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms
open_collective: genocs
custom: ['https://www.buymeacoffee.com/genocs']
custom: ["https://www.buymeacoffee.com/genocs"]
14 changes: 7 additions & 7 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build test and pack

on:
push:
branches: [ main, develop ]
branches: [main, develop]
pull_request:
branches: [ main, develop ]
branches: [main, develop]

jobs:
build:
Expand All @@ -14,20 +14,20 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Restore dependencies
run: dotnet restore

- name: Build
run: dotnet build -c Debug --no-restore

- name: Test
run: dotnet test -c Debug --no-build --verbosity normal

- name: Pack
run: dotnet pack -c Debug --no-build --verbosity normal
13 changes: 6 additions & 7 deletions .github/workflows/dockerhub-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ on:
description: "Image Version"

# Default value if no value is explicitly provided
default: "6.0.0"
default: "6.1.0"

# Input has to be provided for the workflow to run
required: true


jobs:
build:
name: Publish Docker Image
Expand All @@ -27,21 +26,21 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x

- name: Restore dependencies
run: dotnet restore

- name: Build
run: dotnet build -c Debug --no-restore

- name: Test
run: dotnet test --no-build --verbosity normal

- name: Pack
run: dotnet pack --no-build --verbosity normal

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/nuget-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ on:
description: "Packages Version"

# Default value if no value is explicitly provided
default: "6.0.0"
default: "6.1.0"

# Input has to be provided for the workflow to run
required: true


jobs:
build:
name: Update NuGet packages
Expand Down
40 changes: 18 additions & 22 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
# Changelog
### Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
All notable changes to this project will be documented in this file. Dates are displayed in UTC.

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [v6.0.0](https://github.com/Genocs/genocs-library/compare/6.0.0-preview.2.0...v6.0.0) - 2024-07-31
#### [v6.1.0](https://github.com/Genocs/genocs-library/compare/v6.0.0...v6.1.0)

> 11 October 2024

- Refactor interfaces, update Azure Key Vault options, and improve code readability [`485db2c`](https://github.com/Genocs/genocs-library/commit/485db2ca1dd13e87a785a2242248671858fb7e45)
- Refactor: Replace Jaeger with OpenTelemetry [`1eed44b`](https://github.com/Genocs/genocs-library/commit/1eed44bd91c9b187bcc1a2d3983ebe52b20e0664)
- Refactor interfaces and update Azure Key Vault options [`87edca1`](https://github.com/Genocs/genocs-library/commit/87edca186850db3cbe17398229335012308fb814)

### Commits
### [v6.0.0](https://github.com/Genocs/genocs-library/compare/6.0.0-preview.2.0...v6.0.0)

> 31 July 2024

- Refactor and update dependencies and logging level [`63533a2`](https://github.com/Genocs/genocs-library/commit/63533a2ccfb64106dd81e296ca1a1de55c556f48)
- Refactor auth and update docs [`a63d816`](https://github.com/Genocs/genocs-library/commit/a63d816a4b617246ec99b3400d019a1b46ff40b0)
- Update packages, fix typos, and improve code formatting [`d634694`](https://github.com/Genocs/genocs-library/commit/d6346942c88195b831bd66f4ff8a1e039695e0b2)

## [6.0.0-preview.2.0](https://github.com/Genocs/genocs-library/compare/v5.0.0-preview.4.0...6.0.0-preview.2.0) - 2024-07-19
#### [6.0.0-preview.2.0](https://github.com/Genocs/genocs-library/compare/v5.0.0-preview.4.0...6.0.0-preview.2.0)

### Merged
> 19 July 2024

- Bump prometheus-net from 5.0.2 to 8.2.1 [`#54`](https://github.com/Genocs/genocs-library/pull/54)
- Bump System.IdentityModel.Tokens.Jwt from 7.0.3 to 7.1.2 in /src/Genocs.Auth [`#56`](https://github.com/Genocs/genocs-library/pull/56)
Expand All @@ -27,41 +32,32 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Net8 [`#35`](https://github.com/Genocs/genocs-library/pull/35)
- Bump Serilog.Sinks.Seq from 5.1.0 to 5.2.3 [`#21`](https://github.com/Genocs/genocs-library/pull/21)
- Bump Serilog.Sinks.ElasticSearch from 8.4.1 to 9.0.3 [`#18`](https://github.com/Genocs/genocs-library/pull/18)

### Commits

- Added documentation and more control over types [`3d4c17e`](https://github.com/Genocs/genocs-library/commit/3d4c17e0e501d9174160f01569d2523472085a04)
- Refactor configs and update docs across projects [`504fc40`](https://github.com/Genocs/genocs-library/commit/504fc40ee05a1ed6bc838a5b08195cb285feb8c1)
- Merge issues [`cc6c097`](https://github.com/Genocs/genocs-library/commit/cc6c097d28854b584d3df34f9dc3ea6c4be78db9)

## [v5.0.0-preview.4.0](https://github.com/Genocs/genocs-library/compare/v5.0.0-preview.3.0...v5.0.0-preview.4.0) - 2023-07-15
#### [v5.0.0-preview.4.0](https://github.com/Genocs/genocs-library/compare/v5.0.0-preview.3.0...v5.0.0-preview.4.0)

### Merged
> 15 July 2023

- April 2023 [`#17`](https://github.com/Genocs/genocs-library/pull/17)
- Create ml.yml [`#14`](https://github.com/Genocs/genocs-library/pull/14)
- April 2023 [`#12`](https://github.com/Genocs/genocs-library/pull/12)
- April 2023 [`#11`](https://github.com/Genocs/genocs-library/pull/11)

### Commits

- Preview 4.x [`d619840`](https://github.com/Genocs/genocs-library/commit/d619840033c146a60bdb5fe6f37ea7e6e7ae5de7)
- Start removing legacy MongoDB legacy database [`f4ca960`](https://github.com/Genocs/genocs-library/commit/f4ca9609ef11ad550c789e05dbfd6c0984fa312b)
- Refactory to remove legacy Mongodb [`7accdcb`](https://github.com/Genocs/genocs-library/commit/7accdcba26edb9e38ebf0583966348f80a2d31b1)

## v5.0.0-preview.3.0 - 2023-05-13
#### v5.0.0-preview.3.0

### Merged
> 13 May 2023

- March 2023 [`#9`](https://github.com/Genocs/genocs-library/pull/9)
- Create docker-image.yml [`#6`](https://github.com/Genocs/genocs-library/pull/6)
- Create nuget-deploy.yml [`#5`](https://github.com/Genocs/genocs-library/pull/5)
- Added explicitly build [`#3`](https://github.com/Genocs/genocs-library/pull/3)
- Develop [`#2`](https://github.com/Genocs/genocs-library/pull/2)
- Bump Microsoft.AspNetCore.Authentication.JwtBearer from 5.0.6 to 5.0.9 in /src/Genocs.Core.Demo.WebApi [`#1`](https://github.com/Genocs/genocs-library/pull/1)

### Commits

- Added SignalR service [`8a6faee`](https://github.com/Genocs/genocs-library/commit/8a6faeef4c6c2dec473abb1e86fe55a9e24f87c5)
- Added template [`98884b0`](https://github.com/Genocs/genocs-library/commit/98884b034910bc8d4c912344fe2ce0f54b4e7aaa)
- Upated to net7 [`2cbc3f8`](https://github.com/Genocs/genocs-library/commit/2cbc3f8b6cefb5cfe153b3aba8a28d5f425804dc)
12 changes: 10 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)dotnet.ruleset</CodeAnalysisRuleSet>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<LangVersion>10.0</LangVersion>
<Company>Genocs</Company>
<Copyright>Genocs 2024</Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/Genocs/genocs-library</PackageProjectUrl>
<RepositoryUrl>https://github.com/Genocs/genocs-library.git</RepositoryUrl>
<PackageIcon>icon.png</PackageIcon>
<RepositoryType>git</RepositoryType>
<EnableNETAnalyzers>True</EnableNETAnalyzers>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.12.4">
<PackageReference Include="Roslynator.Analyzers" Version="4.12.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
25 changes: 15 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ docker compose -f ./infrastructure-security.yml --env-file ./.env --project-name
# Use this file only in case you want to setup sqlserver database (no need if you use postgres)
docker compose -f ./infrastructure-sqlserver.yml --env-file ./.env --project-name genocs up -d

# Use this file only in case you want to setup mySql database (no need if you use postgres)
docker compose -f ./infrastructure-mysql.yml --env-file ./.env --project-name genocs up -d

# Use this file only in case you want to setup oracle database (no need if you use postgres)
docker compose -f ./infrastructure-oracle.yml --env-file ./.env --project-name genocs up -d

# Use this file only in case you want to setup elk stack
docker compose -f ./infrastructure-elk.yml --env-file ./.env --project-name genocs up -d

Expand Down Expand Up @@ -233,13 +239,15 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
"tags": {}
},
"jaeger": {
"enabled": false,
"serviceName": "users",
"udpHost": "localhost",
"udpPort": 6831,
"maxPacketSize": 65000,
"sampler": "const",
"excludePaths": [ "/", "/ping", "/metrics" ]
"enabled": true,
"serviceName": "orders",
"endpoint": "http://localhost:4317",
"protocol": "Grpc",
"processorType": "Batch",
"maxQueueSize": 2048,
"scheduledDelayMilliseconds": 5000,
"exporterTimeoutMilliseconds": 30000,
"maxExportBatchSize": 512
},
"jwt": {
"certificate": {
Expand Down Expand Up @@ -547,6 +555,3 @@ Become a financial contributor and help me sustain the project. [Support the Pro
## Acknowledgements
- [devmentors](https://github.com/devmentors)
- [abp](https://github.com/abpframework)


- simple changes
1 change: 1 addition & 0 deletions containers/infrastructure-monitoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ services:
- 9411:9411
- 14268:14268
- 16686:16686
- 4317:4317
# network_mode: host
networks:
- genocs
Expand Down
23 changes: 23 additions & 0 deletions containers/infrastructure-mysql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
services:
mysqldb:
image: mysql
hostname: mysqldb
container_name: mysqldb
ports:
- 3306:3306

environment:
MYSQL_ROOT_PASSWORD: MySect3tPassw!
volumes:
- mysqlsystem:/var/lib/mysql
networks:
- genocs

networks:
genocs:
name: genocs-network
external: true

volumes:
mysqlsystem:
driver: local
35 changes: 35 additions & 0 deletions containers/infrastructure-oracle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
services:
oracledb:
image: container-registry.oracle.com/database/express:21.3.0-xe
hostname: oracledb
container_name: oracledb
ports:
- 1521:1521
- 5500:5500

environment:
ORACLE_PWD: MySect3tPassw!
ORACLE_CHARACTERSET: AL32UTF8
ENABLE_ARCHIVELOG: true
ENABLE_FORCE_LOGGING: true

volumes:
- oracle_data:/opt/oracle/oradata
- oracle_startup:/opt/oracle/scripts/startup
- oracle_setup:/opt/oracle/scripts/setup

networks:
- genocs

networks:
genocs:
name: genocs-network
external: true

volumes:
oracle_data:
driver: local
oracle_startup:
driver: local
oracle_setup:
driver: local
4 changes: 2 additions & 2 deletions src/Genocs.Auth/Configurations/JwtOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ public class JwtOptions
public string? ValidIssuer { get; set; }
public IEnumerable<string>? ValidIssuers { get; set; }
public bool ValidateActor { get; set; }
public bool ValidateAudience { get; set; } = true;
public bool ValidateIssuer { get; set; } = true;
public bool ValidateAudience { get; set; }
public bool ValidateIssuer { get; set; }
public bool ValidateLifetime { get; set; } = true;
public bool ValidateTokenReplay { get; set; }
public bool ValidateIssuerSigningKey { get; set; }
Expand Down
14 changes: 3 additions & 11 deletions src/Genocs.Auth/Genocs.Auth.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@
<AssemblyName>Genocs.Auth</AssemblyName>
<Title>The authorization library useful to build .NET Core projects.</Title>
<Description>The authorization library useful to build .NET Core projects.</Description>
<LangVersion>10.0</LangVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>6.0.0</Version>
<Version>6.1.0</Version>
<MinClientVersion>5.0.0</MinClientVersion>
<Authors>Nocco Giovanni Emanuele</Authors>
<Company>Genocs</Company>
<Copyright>Genocs 2024</Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/Genocs/genocs-library</PackageProjectUrl>
<RepositoryUrl>https://github.com/Genocs/genocs-library.git</RepositoryUrl>
<PackageIcon>icon.png</PackageIcon>
<RepositoryType>git</RepositoryType>
<PackageTags>aggregate architecture boilerplate ddd ddd-architecture design-patterns domain-driven-design dotnet dotnetcore dotnet-core microservice microservices solid solid-principles</PackageTags>
<PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
<PackageReleaseNotes>Aligned to the ecosystem</PackageReleaseNotes>
Expand Down Expand Up @@ -48,8 +40,8 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="Genocs.Core" Version="6.0.*" />
<PackageReference Include="Genocs.Security" Version="6.0.*" />
<PackageReference Include="Genocs.Core" Version="6.1.*" />
<PackageReference Include="Genocs.Security" Version="6.1.*" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand Down
1 change: 0 additions & 1 deletion src/Genocs.Common/Configurations/AppOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class AppOptions
/// </summary>
public bool Enabled { get; set; }


/// <summary>
/// Application name.
/// </summary>
Expand Down
10 changes: 1 addition & 9 deletions src/Genocs.Common/Genocs.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,10 @@
<AssemblyName>Genocs.Common</AssemblyName>
<Title>The Genocs Library - Common components.</Title>
<Description>The common components to build .NET Core projects along with Genocs Library.</Description>
<LangVersion>10.0</LangVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>6.0.0</Version>
<Version>6.1.0</Version>
<MinClientVersion>5.0.0</MinClientVersion>
<Authors>Nocco Giovanni Emanuele</Authors>
<Company>Genocs</Company>
<Copyright>Genocs 2024</Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/Genocs/genocs-library</PackageProjectUrl>
<RepositoryUrl>https://github.com/Genocs/genocs-library.git</RepositoryUrl>
<PackageIcon>icon.png</PackageIcon>
<RepositoryType>git</RepositoryType>
<PackageTags>aggregate architecture boilerplate ddd ddd-architecture design-patterns domain-driven-design dotnet dotnetcore dotnet-core microservice microservices solid solid-principles</PackageTags>
<PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
<PackageReleaseNotes>Aligned to the ecosystem</PackageReleaseNotes>
Expand Down
Loading