Merge pull request #120 from Genocs/ver_700

Ver 700

Author: giovanninocco

.github/workflows/build_and_test.yml

@@ -2,9 +2,9 @@ name: Build test and pack
 
 on:
   push:
-    branches: [main, develop]
+    branches: [master, develop]
   pull_request:
-    branches: [main, develop]
+    branches: [master, develop]
 
 jobs:
   build:
@@ -18,7 +18,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore dependencies
         run: dotnet restore

.github/workflows/dockerhub-publish.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore dependencies
         run: dotnet restore

.github/workflows/nuget-publish.yml

@@ -13,7 +13,7 @@ on:
         description: "Packages Version"
 
         # Default value if no value is explicitly provided
-        default: "6.2.0"
+        default: "7.0.0"
 
         # Input has to be provided for the workflow to run
         required: true
@@ -30,7 +30,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       - name: Restore dependencies
         run: dotnet restore

.gitignore

@@ -10,11 +10,6 @@
 *.userosscache
 *.sln.docstates
 
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
 
 # Build results
 [Dd]ebug/
@@ -255,8 +250,6 @@ orleans.codegen.cs
 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
 #bower_components/
 
-# RIA/Silverlight projects
-Generated_Code/
 
 # Backup & report files from converting an old project file
 # to a newer Visual Studio version. Backup files are not needed,
@@ -301,13 +294,6 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
 
 # Paket dependency manager
 .paket/paket.exe
@@ -316,15 +302,6 @@ paket-files/
 # FAKE - F# Make
 .fake/
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# CodeRush personal settings
-.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
@@ -337,14 +314,9 @@ __pycache__/
 # Tabs Studio
 *.tss
 
-# Telerik's JustMock configuration file
-*.jmconfig
 
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
+
+
 
 # OpenCover UI analysis results
 OpenCover/
@@ -358,8 +330,6 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
 
 logs/
 
@@ -466,3 +436,5 @@ $RECYCLE.BIN/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+## *.env

Directory.Build.props

@@ -14,7 +14,7 @@
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
         <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
         <Version>6.3.0</Version>        
-        <LangVersion>10.0</LangVersion>
+        <LangVersion>13.0</LangVersion>
         <Company>Genocs</Company>
         <Copyright>Genocs 2024</Copyright>
         <PackageLicenseFile>LICENSE</PackageLicenseFile>

README.md

@@ -45,7 +45,7 @@
 
 # Genocs .NET library
 
-This repo contains a set of libraries to build LOB (Line Of Business) applications. The library is open source and built to be PRODUCTION READY. The library is built on top of .NET8, it is designed and maintained by Genocs. 
+This repo contains a set of libraries to build LOB (Line Of Business) applications. The library is open source and built to be PRODUCTION READY. The library is built on top of .NET9, it is designed and maintained by Genocs. 
 
 Packages are available on [NuGet Genocs](https://www.nuget.org/profiles/gioema_nocco).
 
@@ -74,9 +74,18 @@ You can use **Docker compose** to setup the infrastructure components just by ru
 ``` bash
 cd ./containers
 # Setup the infrastructure
-docker compose -f ./infrastructure-bare.yml --env-file ./.env --project-name genocs up -d
+docker compose -f ./infrastructure.yml --env-file ./.env --project-name genocs up -d
+
+# Use this file only in case you want to setup Redis and Postgres db (no need if you use mongo)
+docker compose -f ./infrastructure-db.yml --env-file ./.env --project-name genocs up -d
+
+# Use this file only in case you want to setup monitoring infrastructure components (Prometheus, Grafana, InfluxDB, Jaeger, Seq)
 docker compose -f ./infrastructure-monitoring.yml --env-file ./.env --project-name genocs up -d
+
+# Use this file only in case you want to setup scaling infrastructure components (Fabio, Consul)
 docker compose -f ./infrastructure-scaling.yml --env-file ./.env --project-name genocs up -d
+
+# Use this file only in case you want to setup security infrastructure components (Vault)
 docker compose -f ./infrastructure-security.yml --env-file ./.env --project-name genocs up -d
 
 # Use this file only in case you want to setup sqlserver database (no need if you use postgres)

containers/.env

@@ -0,0 +1,39 @@
+services:
+
+  redis:
+    image: redis
+    hostname: redis
+    container_name: redis
+    ports:
+      - 6379:6379
+    networks:
+      - genocs
+    # network_mode: host
+    volumes:
+      - redis:/data
+
+  postgres:
+    image: postgres
+    hostname: postgres
+    container_name: postgres
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+    ports:
+      - 5432:5432
+    networks:
+      - genocs
+    # network_mode: host
+    volumes:
+      - postgres:/var/lib/postgresql/data
+
+networks:
+  genocs:
+    name: genocs-network
+    driver: bridge
+    external: true
+
+volumes:
+  redis:
+    driver: local
+  postgres:
+    driver: local

containers/infrastructure-db.yml

@@ -25,32 +25,6 @@ services:
     volumes:
       - mongodb:/data/db
 
-  redis:
-    image: redis
-    hostname: redis
-    container_name: redis
-    ports:
-      - 6379:6379
-    networks:
-      - genocs
-    # network_mode: host
-    volumes:
-      - redis:/data
-
-  postgres:
-    image: postgres
-    hostname: postgres
-    container_name: postgres
-    environment:
-      - POSTGRES_PASSWORD=mysecretpassword
-    ports:
-      - 5432:5432
-    networks:
-      - genocs
-    # network_mode: host
-    volumes:
-      - postgres:/var/lib/postgresql/data
-
 networks:
   genocs:
     name: genocs-network
@@ -61,7 +35,3 @@ volumes:
     driver: local
   rabbitmq:
     driver: local
-  redis:
-    driver: local
-  postgres:
-    driver: local

containers/infrastructure-bare.yml renamed to containers/infrastructure.yml

@@ -0,0 +1,2 @@
+# This file is a template for the .env file that is used by the docker-compose.yml file.
+POSTGRES_PASSWORD=<<POSTGRES_PASSWORD>>