Skip to content

Commit

Permalink
(#153) Upgrade .Net 7
Browse files Browse the repository at this point in the history
  • Loading branch information
phongnguyend committed Dec 17, 2022
1 parent 7c3476a commit 50b761b
Show file tree
Hide file tree
Showing 124 changed files with 506 additions and 589 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/.net-build-microservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 7.0.101

- name: Build
run: dotnet build --configuration Release
Expand Down Expand Up @@ -61,58 +61,58 @@ jobs:
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.AuditLog.Api
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/bin/Release/net6.0/publish
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.AuditLog.Grpc
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.AuditLog.Grpc
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/bin/Release/net6.0/publish
path: src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Identity.Api
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Identity.Api
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/bin/Release/net6.0/publish
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Identity.Grpc
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Identity.Grpc
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/bin/Release/net6.0/publish
path: src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Notification.Api
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Notification.Api
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/bin/Release/net6.0/publish
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Notification.Background
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Notification.Background
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/bin/Release/net6.0/publish
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Notification.Grpc
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Notification.Grpc
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/bin/Release/net6.0/publish
path: src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Product.Api
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Product.Api
path: src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/bin/Release/net6.0/publish
path: src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Services.Storage.Api
uses: actions/[email protected]
with:
name: ClassifiedAds.Services.Storage.Api
path: src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/bin/Release/net6.0/publish
path: src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Gateways.WebAPI
uses: actions/[email protected]
with:
name: ClassifiedAds.Gateways.WebAPI
path: src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/bin/Release/net6.0/publish
path: src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/bin/Release/net7.0/publish
8 changes: 4 additions & 4 deletions .github/workflows/.net-build-modularmonolith.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 7.0.101

- name: Build
run: dotnet build --configuration Release
Expand All @@ -40,16 +40,16 @@ jobs:
uses: actions/[email protected]
with:
name: ClassifiedAds.BackgroundServer
path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net6.0/publish
path: src/ModularMonolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Migrator
uses: actions/[email protected]
with:
name: ClassifiedAds.Migrator
path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net6.0/publish
path: src/ModularMonolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.WebAPI
uses: actions/[email protected]
with:
name: ClassifiedAds.WebAPI
path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net6.0/publish
path: src/ModularMonolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish
16 changes: 8 additions & 8 deletions .github/workflows/.net-build-monolith.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 7.0.101

- name: Build
run: dotnet build --configuration Release
Expand Down Expand Up @@ -52,40 +52,40 @@ jobs:
uses: actions/[email protected]
with:
name: ClassifiedAds.BackgroundServer
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.BackgroundServer/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.GraphQL
uses: actions/[email protected]
with:
name: ClassifiedAds.GraphQL
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.GraphQL/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.Migrator
uses: actions/[email protected]
with:
name: ClassifiedAds.Migrator
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.Migrator/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.WebAPI
uses: actions/[email protected]
with:
name: ClassifiedAds.WebAPI
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.WebAPI/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.WebMVC
uses: actions/[email protected]
with:
name: ClassifiedAds.WebMVC
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.WebMVC/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.BlazorServerSide
uses: actions/[email protected]
with:
name: ClassifiedAds.BlazorServerSide
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.BlazorServerSide/bin/Release/net7.0/publish

- name: Upload ClassifiedAds.BlazorWebAssembly
uses: actions/[email protected]
with:
name: ClassifiedAds.BlazorWebAssembly
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net6.0/publish
path: src/Monolith/ClassifiedAds.BlazorWebAssembly/bin/Release/net7.0/publish
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
"MiniProfiler": {
"IsEnabled": true,
"SqlServerStorage": {
"ConectionString": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true",
"ConectionString": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False",
"ProfilersTable": "MiniProfilers",
"TimingsTable": "MiniProfilerTimings",
"ClientTimingsTable": "MiniProfilerClientTimings"
Expand Down Expand Up @@ -546,7 +546,7 @@
"MiniProfiler": {
"IsEnabled": true,
"SqlServerStorage": {
"ConectionString": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true",
"ConectionString": "Server=127.0.0.1;Database=ClassifiedAds;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False",
"ProfilersTable": "MiniProfilers",
"TimingsTable": "MiniProfilerTimings",
"ClientTimingsTable": "MiniProfilerClientTimings"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: {{ .Release.Name}}-auditlog
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: {{ .Release.Name}}-configuration
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Configuration;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Configuration;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
name: {{ .Release.Name}}-identity
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Identity;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Identity;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
MessageBroker__Provider: "RabbitMQ"
MessageBroker__RabbitMQ__HostName: "{{ .Release.Name}}-rabbitmq"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
data:
ASPNETCORE_ENVIRONMENT: "Development"
DOTNET_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
MessageBroker__Provider: "RabbitMQ"
MessageBroker__RabbitMQ__HostName: "{{ .Release.Name}}-rabbitmq"
Notification__Email__Provider: "SmtpClient"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: {{ .Release.Name}}-product
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: {{ .Release.Name}}-storage
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server={{ .Release.Name}}-db;Database=ClassifiedAds.Microservices.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
Storage__Provider: "Fake"
Storage__Local__Path: "/files"
Storage__Azure__ConnectionString: "DefaultEndpointsProtocol=https;AccountName=xxx;AccountKey=xxx;EndpointSuffix=core.windows.net"
Expand Down
2 changes: 1 addition & 1 deletion src/Microservices/.k8s/auditlog.configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: auditlog
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.AuditLog;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
2 changes: 1 addition & 1 deletion src/Microservices/.k8s/configuration.configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: configuration
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Configuration;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Configuration;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
2 changes: 1 addition & 1 deletion src/Microservices/.k8s/identity.configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
name: identity
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Identity;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Identity;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
MessageBroker__Provider: "RabbitMQ"
MessageBroker__RabbitMQ__HostName: "rabbitmq"
2 changes: 1 addition & 1 deletion src/Microservices/.k8s/notification.configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
data:
ASPNETCORE_ENVIRONMENT: "Development"
DOTNET_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Notification;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
MessageBroker__Provider: "RabbitMQ"
MessageBroker__RabbitMQ__HostName: "rabbitmq"
Notification__Email__Provider: "SmtpClient"
Expand Down
2 changes: 1 addition & 1 deletion src/Microservices/.k8s/product.configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: product
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Product;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
2 changes: 1 addition & 1 deletion src/Microservices/.k8s/storage.configmap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: storage
data:
ASPNETCORE_ENVIRONMENT: "Development"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true"
ConnectionStrings__ClassifiedAds: "Server=db;Database=ClassifiedAds.Microservices.Storage;User Id=sa;Password=sqladmin123!@#;MultipleActiveResultSets=true;Encrypt=False"
Storage__Provider: "Fake"
Storage__Local__Path: "/files"
Storage__Azure__ConnectionString: "DefaultEndpointsProtocol=https;AccountName=xxx;AccountKey=xxx;EndpointSuffix=core.windows.net"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>ClassifiedAds.CrossCuttingConcerns</RootNamespace>
</PropertyGroup>

Expand All @@ -10,7 +10,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="7.0.1" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="7.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 50b761b

Please sign in to comment.