Skip to content

Commit 1f0cb1c

Browse files
HaikAsatryanHaikAsatryan
committed
updated to .net 9
1 parent 1c2e6d2 commit 1f0cb1c

File tree

102 files changed

+423
-2037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+423
-2037
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,4 +480,5 @@ $RECYCLE.BIN/
480480
# Added by me
481481
.idea
482482
logs
483-
LocalFileStorage
483+
LocalFileStorage
484+
*.db*

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
22
WORKDIR /app
33
COPY ["./publish/", "./"]
44
ENTRYPOINT ["dotnet", "Pandatech.VerticalSlices.dll"]

‎Dockerfile.Local‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
22
USER $APP_UID
33
WORKDIR /app
44
EXPOSE 80
55

6-
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
77
ARG BUILD_CONFIGURATION=Release
88
WORKDIR /build
99
COPY ["Directory.Build.props", "."]

‎docker-compose.yml‎

Lines changed: 137 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
version: '3.8'
2-
31
volumes:
4-
# elasticsearch:
5-
# driver: local
6-
# kibana:
7-
# driver: local
8-
# pgadmin:
9-
# driver: local
102
rabbitmq:
113
driver: local
124
redis:
135
driver: local
14-
redisinsight:
15-
driver: local
166
postgres:
177
driver: local
8+
elasticsearch:
9+
driver: local
10+
kibana:
11+
driver: local
12+
# pgadmin:
13+
# driver: local
14+
# redisinsight:
15+
# driver: local
16+
# oracle_db:
17+
# driver: local
1818

1919

2020
services:
@@ -44,68 +44,76 @@ services:
4444
volumes:
4545
- ~/.aspnet/https:/https:ro
4646

47-
#####################################################################################
48-
49-
# elasticsearch:
50-
# container_name: pandatech_vertical_slices_elasticsearch
51-
# image: docker.elastic.co/elasticsearch/elasticsearch:8.12.2
52-
# restart: always
53-
# ports:
54-
# - 9200:9200
55-
# environment:
56-
# - bootstrap.memory_lock=true
57-
# - discovery.type=single-node
58-
# - xpack.security.enabled=false
59-
# - xpack.security.http.ssl.enabled=false
60-
# - xpack.security.transport.ssl.enabled=false
61-
# ulimits:
62-
# memlock:
63-
# soft: -1
64-
# hard: -1
65-
# volumes:
66-
# - elasticsearch:/usr/share/elasticsearch/data
67-
# healthcheck:
68-
# test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
69-
# interval: 30s
70-
# timeout: 10s
71-
# retries: 5
72-
73-
#################################################################################
74-
75-
# kibana:
76-
# depends_on:
77-
# elasticsearch:
78-
# condition: service_healthy
79-
# container_name: pandatech_vertical_slices_kibana
80-
# image: docker.elastic.co/kibana/kibana:8.12.2
81-
# restart: always
82-
# ports:
83-
# - 5601:5601
84-
# environment:
85-
# - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
86-
# volumes:
87-
# - kibana:/usr/share/kibana/data
88-
89-
################################a###################################################
47+
# ---------------------------------------------------------------------------------
48+
# Elastic search
49+
# ---------------------------------------------------------------------------------
50+
51+
elasticsearch:
52+
container_name: elasticsearch
53+
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1
54+
restart: always
55+
ports:
56+
- 9200:9200
57+
environment:
58+
- bootstrap.memory_lock=true
59+
- discovery.type=single-node
60+
- xpack.security.enabled=false
61+
- xpack.security.http.ssl.enabled=false
62+
- xpack.security.transport.ssl.enabled=false
63+
ulimits:
64+
memlock:
65+
soft: -1
66+
hard: -1
67+
volumes:
68+
- elasticsearch:/usr/share/elasticsearch/data
69+
healthcheck:
70+
test: [ "CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1" ]
71+
interval: 30s
72+
timeout: 10s
73+
retries: 5
74+
75+
# ---------------------------------------------------------------------------------
76+
# Kibana
77+
# ---------------------------------------------------------------------------------
78+
79+
kibana:
80+
depends_on:
81+
elasticsearch:
82+
condition: service_healthy
83+
container_name: kibana
84+
image: docker.elastic.co/kibana/kibana:8.16.1
85+
restart: always
86+
ports:
87+
- 5601:5601
88+
environment:
89+
- ELASTICSEARCH_HOSTS=http://elasticsearch:9200
90+
volumes:
91+
- kibana:/usr/share/kibana/data
9092

93+
# ---------------------------------------------------------------------------------
94+
# PgAdmin
95+
# ---------------------------------------------------------------------------------
96+
9197
# pg-admin:
92-
# container_name: pandatech_vertical_slices_pg_admin
93-
# image: dpage/pgadmin4:8.4
98+
# container_name: pg_admin
99+
# image: dpage/pgadmin4:latest
94100
# restart: always
95101
# ports:
96102
# - "5050:80"
97-
# #in pgAdmin set Host name/address to host.docker.internal
103+
# #in pgAdmin set Host name/address to host.docker.internal or postgres_db in linux
98104
# environment:
99105
# - [email protected]
100106
# - PGADMIN_DEFAULT_PASSWORD=test
101107
# volumes:
102108
# - pgadmin:/var/lib/pgadmin
103-
104-
###################################################################################
105-
109+
110+
# ---------------------------------------------------------------------------------
111+
# RabbitMQ
112+
# ---------------------------------------------------------------------------------
113+
106114
rabbitmq:
107-
container_name: pandatech_vertical_slices_rabbitmq
108-
image: rabbitmq:3.13.0-management-alpine
115+
container_name: rabbitmq
116+
image: rabbitmq:4-management-alpine
109117
restart: always
110118
ports:
111119
- "5672:5672"
@@ -115,34 +123,40 @@ services:
115123
RABBITMQ_DEFAULT_PASS: test
116124
volumes:
117125
- rabbitmq:/var/lib/rabbitmq
118-
119-
###################################################################################
120-
126+
127+
# ---------------------------------------------------------------------------------
128+
# Redis
129+
# ---------------------------------------------------------------------------------
130+
121131
redis:
122-
container_name: pandatech_vertical_slices_redis
123-
image: redis:7.2.4
132+
container_name: redis
133+
image: redis:latest
124134
restart: always
125135
ports:
126136
- "6379:6379"
127137
volumes:
128138
- redis:/data
129-
130-
###################################################################################
131-
132-
redisinsight:
133-
container_name: pandatech_vertical_slices_redisinsight
134-
image: redislabs/redisinsight:1.14.0
135-
restart: always
136-
ports:
137-
- "8001:8001"
138-
volumes:
139-
- redisinsight:/db
140-
141-
###################################################################################
142-
139+
140+
# ---------------------------------------------------------------------------------
141+
# Redis Insight
142+
# ---------------------------------------------------------------------------------
143+
144+
# redisinsight:
145+
# container_name: redisinsight
146+
# image: redis/redisinsight:latest
147+
# restart: always
148+
# ports:
149+
# - "5540:5540"
150+
# volumes:
151+
# - redisinsight:/db
152+
153+
# ---------------------------------------------------------------------------------
154+
# Postgres
155+
# ---------------------------------------------------------------------------------
156+
143157
postgres_db:
144-
container_name: pandatech_vertical_slices_postgres
145-
image: postgres:16.2
158+
container_name: postgres
159+
image: postgres:latest
146160
restart: always
147161
environment:
148162
- POSTGRES_USER=test
@@ -151,70 +165,44 @@ services:
151165
- "5432:5432"
152166
volumes:
153167
- postgres:/var/lib/postgresql/data
154-
155-
#Check optimal configurations with PandaPostgres
156-
command:
157-
- "-c"
158-
- "log_connections=on"
159-
- "-c"
160-
- "log_disconnections=on"
161-
- "-c"
162-
- "log_duration=on"
163-
- "-c"
164-
- "log_line_prefix=%m [%p-%l] %u@%d app=%a "
165-
- "-c"
166-
- "log_lock_waits=on"
167-
- "-c"
168-
- "log_min_duration_statement=1s"
169-
- "-c"
170-
- "log_statement=all"
171-
- "-c"
172-
- "log_timezone=Asia/Yerevan"
173-
- "-c"
174-
- "log_temp_files=0"
175-
- "-c"
176-
- "shared_preload_libraries=pg_stat_statements"
177-
- "-c"
178-
- "track_commit_timestamp=on"
179-
- "-c"
180-
- "track_functions=pl"
181-
- "-c"
182-
- "track_io_timing=on"
183-
- "-c"
184-
- "hot_standby_feedback=on"
185-
- "-c"
186-
- "TimeZone=Asia/Yerevan"
187-
- "-c"
188-
- "effective_io_concurrency=200"
189-
- "-c"
190-
- "cpu_tuple_cost=0.03"
191-
- "-c"
192-
- "random_page_cost=1.1"
193-
- "-c"
194-
- "max_connections=24"
195-
- "-c"
196-
- "idle_in_transaction_session_timeout=5min"
197-
- "-c"
198-
- "max_locks_per_transaction=128"
199-
- "-c"
200-
- "synchronous_commit=off"
201-
- "-c"
202-
- "default_transaction_read_only=off"
203-
- "-c"
204-
- "transaction_read_only=off"
205-
- "-c"
206-
- "archive_mode=on"
207-
- "-c"
208-
- "checkpoint_timeout=15min"
209-
- "-c"
210-
- "checkpoint_completion_target=0.9"
211-
- "-c"
212-
- "max_wal_senders=64"
213-
- "-c"
214-
- "wal_buffers=-1"
215-
- "-c"
216-
- "wal_compression=on"
217-
- "-c"
218-
- "wal_level=logical"
219-
- "-c"
220-
- "wal_log_hints=on"
168+
169+
# ---------------------------------------------------------------------------------
170+
# Oracle
171+
# ---------------------------------------------------------------------------------
172+
173+
# oracle_db:
174+
# container_name: oracle-free
175+
# image: container-registry.oracle.com/database/free:latest
176+
# restart: always
177+
# ports:
178+
# - "1521:1521"
179+
# - "5500:5500"
180+
# environment:
181+
# - ORACLE_PWD=test
182+
# volumes:
183+
# - oracle_db:/opt/oracle/oradata
184+
185+
# ---------------------------------------------------------------------------------
186+
# Some .Net application
187+
# ---------------------------------------------------------------------------------
188+
189+
# pandawebapi:
190+
# build:
191+
# context: .
192+
# dockerfile: Dockerfile.Local
193+
# container_name: dotnet_application
194+
# hostname: pandawebapi
195+
# restart: always
196+
# ports:
197+
# - "80:80" # Change the ports as necessary for your application
198+
# depends_on:
199+
# - postgres_db
200+
# - rabbitmq
201+
# - redis
202+
# - elasticsearch
203+
# environment:
204+
# - ASPNETCORE_ENVIRONMENT=Local
205+
# - PANDAVAULT_URL=https://bevault.pandatech.it
206+
# - PANDAVAULT_SECRET=0c579832-968e-463e-a69e-f9634332d29e
207+
# volumes:
208+
# - ~/.aspnet/https:/https:ro

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.200",
4-
"rollForward": "latestMajor"
3+
"version": "9.0.100",
4+
"rollForward": "latestMinor"
55
}
66
}

‎src/Pandatech.VerticalSlices/AssemblyReference.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
namespace Pandatech.VerticalSlices;
22

3-
public record AssemblyReference();
3+
public record AssemblyReference;

0 commit comments

Comments
 (0)