Skip to content

Commit 0cddb4b

Browse files
bobbyangersbobbyangers
committed
Upgraded to use Dapr 1.9.4
* Dapr client 1.9.0 * Serilog.Sinks.Seq 5.2.2 * Duende.IdentityServer 6.2.0 Upgraded to .NET 7 <TargetFramework>net7.0</TargetFramework> ARG NET_IMAGE=7.0-bullseye-slim * Microsoft.* 7.0 Fixed some nullable warnings
1 parent dd60f70 commit 0cddb4b

37 files changed

+135
-124
lines changed

Diff for: ‎.github/workflows/basket-api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
env:
2323
SERVICE: basket-api
2424
IMAGE: basket.api
25-
DOTNET_VERSION: 6.0.x
25+
DOTNET_VERSION: 7.0.x
2626
USE_DOTNET_PREVIEW: true
2727

2828
jobs:

Diff for: ‎.github/workflows/blazor-client.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
env:
2323
SERVICE: blazor-client
2424
IMAGE: blazor.client
25-
DOTNET_VERSION: 6.0.x
25+
DOTNET_VERSION: 7.0.x
2626
USE_DOTNET_PREVIEW: true
2727

2828
jobs:

Diff for: ‎.github/workflows/catalog-api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
env:
2323
SERVICE: catalog-api
2424
IMAGE: catalog.api
25-
DOTNET_VERSION: 6.0.x
25+
DOTNET_VERSION: 7.0.x
2626
USE_DOTNET_PREVIEW: true
2727

2828
jobs:

Diff for: ‎.github/workflows/ordering-api.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
env:
2323
SERVICE: ordering-api
2424
IMAGE: ordering.api
25-
DOTNET_VERSION: 6.0.x
25+
DOTNET_VERSION: 7.0.x
2626
USE_DOTNET_PREVIEW: true
2727

2828
jobs:

Diff for: ‎.github/workflows/webstatus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222
env:
2323
SERVICE: webstatus
2424
IMAGE: webstatus
25-
DOTNET_VERSION: 6.0.x
25+
DOTNET_VERSION: 7.0.x
2626
USE_DOTNET_PREVIEW: true
2727

2828
jobs:

Diff for: ‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -374,4 +374,5 @@ MigrationBackup/
374374
**/tempkey.rsa
375375

376376
# macOS files
377-
.DS_Store
377+
.DS_Store
378+
/src/Services/Identity/Identity.API/keys

Diff for: ‎dapr/components/eshop-email.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
- name: host
1111
value: maildev
1212
- name: port
13-
value: 25
13+
value: 1025
1414
- name: user
1515
secretKeyRef:
1616
name: Smtp.User
1717
key: Smtp.User
18-
- name: password
19-
secretKeyRef:
20-
name: Smtp.Password
21-
key: Smtp.Password
18+
#- name: password
19+
# secretKeyRef:
20+
# name: Smtp.Password
21+
# key: Smtp.Password
2222
- name: skipTLSVerify
2323
value: true
2424
auth:

Diff for: ‎docker-compose.override.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ services:
99

1010
maildev:
1111
ports:
12-
- "5500:80"
12+
- "5500:1080"
13+
- "1025:1025"
1314

1415
rabbitmq:
1516
ports:

Diff for: ‎docker-compose.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.4'
33
services:
44

55
maildev:
6-
image: maildev/maildev
6+
image: maildev/maildev:latest
77

88
rabbitmq:
99
image: rabbitmq:3-management-alpine
@@ -19,7 +19,7 @@ services:
1919
image: mcr.microsoft.com/azure-sql-edge
2020

2121
zipkin:
22-
image: openzipkin/zipkin-slim
22+
image: openzipkin/zipkin-slim:latest
2323

2424
basket-api:
2525
image: ${REGISTRY:-eshopdapr}/basket.api:${TAG:-latest}
@@ -31,7 +31,7 @@ services:
3131
- redis
3232

3333
basket-api-dapr:
34-
image: "daprio/daprd:1.8.4"
34+
image: "daprio/daprd:1.9.4"
3535
network_mode: "service:basket-api"
3636
depends_on:
3737
- basket-api
@@ -51,7 +51,7 @@ services:
5151
- sqldata
5252

5353
catalog-api-dapr:
54-
image: "daprio/daprd:1.8.4"
54+
image: "daprio/daprd:1.9.4"
5555
network_mode: "service:catalog-api"
5656
depends_on:
5757
- catalog-api
@@ -65,7 +65,7 @@ services:
6565
- sqldata
6666

6767
identity-api-dapr:
68-
image: "daprio/daprd:1.8.4"
68+
image: "daprio/daprd:1.9.4"
6969
network_mode: "service:identity-api"
7070
depends_on:
7171
- identity-api
@@ -79,7 +79,7 @@ services:
7979
- sqldata
8080

8181
ordering-api-dapr:
82-
image: "daprio/daprd:1.8.4"
82+
image: "daprio/daprd:1.9.4"
8383
network_mode: "service:ordering-api"
8484
depends_on:
8585
- ordering-api
@@ -91,7 +91,7 @@ services:
9191
dockerfile: src/Services/Payment/Payment.API/Dockerfile
9292

9393
payment-api-dapr:
94-
image: "daprio/daprd:1.8.4"
94+
image: "daprio/daprd:1.9.4"
9595
network_mode: "service:payment-api"
9696
depends_on:
9797
- payment-api
@@ -109,7 +109,7 @@ services:
109109
- sqldata
110110

111111
webshoppingagg-dapr:
112-
image: "daprio/daprd:1.8.4"
112+
image: "daprio/daprd:1.9.4"
113113
network_mode: "service:webshoppingagg"
114114
depends_on:
115115
- webshoppingagg
@@ -121,7 +121,7 @@ services:
121121
dockerfile: src/ApiGateways/Envoy/Dockerfile
122122

123123
webshoppingapigw-dapr:
124-
image: "daprio/daprd:1.8.4"
124+
image: "daprio/daprd:1.9.4"
125125
network_mode: "service:webshoppingapigw"
126126
depends_on:
127127
- webshoppingapigw
@@ -133,4 +133,4 @@ services:
133133
dockerfile: src/Web/WebStatus/Dockerfile
134134

135135
dapr-placement:
136-
image: "daprio/dapr:1.8.4"
136+
image: "daprio/dapr:1.9.4"

Diff for: ‎eShopOnDapr.sln

+11
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Payment.API", "src\Services\Payment\Payment.API\Payment.API.csproj", "{37327280-77E7-48E5-9E6D-C6D1EC86F125}"
4141
EndProject
4242
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{250B824E-6A72-4D6E-8287-CC73F40410E9}"
43+
ProjectSection(ProjectDependencies) = postProject
44+
{1489AC81-8724-4077-9241-D0384BA0CB6C} = {1489AC81-8724-4077-9241-D0384BA0CB6C}
45+
{37327280-77E7-48E5-9E6D-C6D1EC86F125} = {37327280-77E7-48E5-9E6D-C6D1EC86F125}
46+
{4C18A91D-9C0A-4DFF-A2A3-39E8317951FD} = {4C18A91D-9C0A-4DFF-A2A3-39E8317951FD}
47+
{538E9CCC-6E48-4C02-8F58-6E4A5F48EA2D} = {538E9CCC-6E48-4C02-8F58-6E4A5F48EA2D}
48+
{87F81A8D-BC10-4701-BE32-6F6217796E8C} = {87F81A8D-BC10-4701-BE32-6F6217796E8C}
49+
{958F41EE-0444-4893-9997-7595594C37CF} = {958F41EE-0444-4893-9997-7595594C37CF}
50+
{9A7D5C39-97BB-4D84-B439-BE530CCF1502} = {9A7D5C39-97BB-4D84-B439-BE530CCF1502}
51+
{E03A530B-3E53-4BFC-978C-105D86D04B67} = {E03A530B-3E53-4BFC-978C-105D86D04B67}
52+
{E77AF4DD-2373-47EF-BD0E-A796B1099364} = {E77AF4DD-2373-47EF-BD0E-A796B1099364}
53+
EndProjectSection
4354
EndProject
4455
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr", "dapr", "{B52FAD6A-7976-48CD-8791-96E9D3CA5519}"
4556
EndProject

Diff for: ‎src/ApiGateways/Aggregators/Web.Shopping.HttpAggregator/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
2-
ARG NET_IMAGE=6.0-bullseye-slim
2+
ARG NET_IMAGE=7.0-bullseye-slim
33
FROM mcr.microsoft.com/dotnet/aspnet:${NET_IMAGE} AS base
44
WORKDIR /app
55
EXPOSE 80

Diff for: ‎src/ApiGateways/Aggregators/Web.Shopping.HttpAggregator/ProgramExtensions.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static void AddCustomSerilog(this WebApplicationBuilder builder)
1414
Log.Logger = new LoggerConfiguration()
1515
.ReadFrom.Configuration(builder.Configuration)
1616
.WriteTo.Console()
17-
.WriteTo.Seq(seqServerUrl)
17+
.WriteTo.Seq(seqServerUrl!)
1818
.Enrich.WithProperty("ApplicationName", AppName)
1919
.CreateLogger();
2020

@@ -91,9 +91,9 @@ public static void AddCustomHealthChecks(this WebApplicationBuilder builder) =>
9191
builder.Services.AddHealthChecks()
9292
.AddCheck("self", () => HealthCheckResult.Healthy())
9393
.AddDapr()
94-
.AddUrlGroup(new Uri(builder.Configuration["CatalogUrlHC"]), name: "catalogapi-check", tags: new string[] { "catalogapi" })
95-
.AddUrlGroup(new Uri(builder.Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" })
96-
.AddUrlGroup(new Uri(builder.Configuration["BasketUrlHC"]), name: "basketapi-check", tags: new string[] { "basketapi" });
94+
.AddUrlGroup(new Uri(builder.Configuration["CatalogUrlHC"]!), name: "catalogapi-check", tags: new [] { "catalogapi" })
95+
.AddUrlGroup(new Uri(builder.Configuration["IdentityUrlHC"]!), name: "identityapi-check", tags: new [] { "identityapi" })
96+
.AddUrlGroup(new Uri(builder.Configuration["BasketUrlHC"]!), name: "basketapi-check", tags: new [] { "basketapi" });
9797

9898
public static void AddCustomApplicationServices(this WebApplicationBuilder builder)
9999
{

Diff for: ‎src/ApiGateways/Aggregators/Web.Shopping.HttpAggregator/Web.Shopping.HttpAggregator.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -21,14 +21,14 @@
2121
<ItemGroup>
2222
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
2323
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="6.0.3" />
24-
<PackageReference Include="Dapr.AspNetCore" Version="1.8.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" />
24+
<PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
25+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
2626
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
28-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.8" />
29-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.16.1" />
27+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
29+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
3030
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
31-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
31+
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
3232
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
3333
</ItemGroup>
3434

Diff for: ‎src/BuildingBlocks/EventBus/EventBus.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -10,9 +10,9 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Dapr.Client" Version="1.8.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
15-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
13+
<PackageReference Include="Dapr.Client" Version="1.9.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
1616
</ItemGroup>
1717

1818
</Project>

Diff for: ‎src/BuildingBlocks/Healthchecks/Healthchecks.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<RootNamespace>Microsoft.eShopOnDapr.BuildingBlocks.Healthchecks</RootNamespace>
66
<AssemblyName>Microsoft.eShopOnDapr.BuildingBlocks.Healthchecks</AssemblyName>
77
</PropertyGroup>
88
<ItemGroup>
99
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Dapr.Client" Version="1.8.0" />
13-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.8" />
14-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.8" />
12+
<PackageReference Include="Dapr.Client" Version="1.9.0" />
13+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="7.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

Diff for: ‎src/Services/Basket/Basket.API/Basket.API.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
66
<DockerfileContext>..\..\..\..</DockerfileContext>
77
<RootNamespace>Microsoft.eShopOnDapr.Services.Basket.API</RootNamespace>
@@ -11,11 +11,11 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
14-
<PackageReference Include="Dapr.AspNetCore" Version="1.8.0" />
15-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.8" />
14+
<PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
1616
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
17-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
18-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
17+
<PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
18+
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
1919
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
2020
</ItemGroup>
2121

Diff for: ‎src/Services/Basket/Basket.API/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
2-
ARG NET_IMAGE=6.0-bullseye-slim
2+
ARG NET_IMAGE=7.0-bullseye-slim
33
FROM mcr.microsoft.com/dotnet/aspnet:${NET_IMAGE} AS base
44
WORKDIR /app
55
EXPOSE 80

Diff for: ‎src/Services/Basket/Basket.API/ProgramExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static void AddCustomSerilog(this WebApplicationBuilder builder)
1414
Log.Logger = new LoggerConfiguration()
1515
.ReadFrom.Configuration(builder.Configuration)
1616
.WriteTo.Console()
17-
.WriteTo.Seq(seqServerUrl)
17+
.WriteTo.Seq(seqServerUrl!)
1818
.Enrich.WithProperty("ApplicationName", AppName)
1919
.CreateLogger();
2020

Diff for: ‎src/Services/Catalog/Catalog.API/Catalog.API.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -18,17 +18,17 @@
1818
<ItemGroup>
1919
<PackageReference Include="AspNetCore.HealthChecks.SqlServer" Version="6.0.2" />
2020
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="6.0.5" />
21-
<PackageReference Include="Dapr.AspNetCore" Version="1.8.0" />
22-
<PackageReference Include="Dapr.Extensions.Configuration" Version="1.8.0" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
21+
<PackageReference Include="Dapr.AspNetCore" Version="1.9.0" />
22+
<PackageReference Include="Dapr.Extensions.Configuration" Version="1.9.0" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.8" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
2929
<PackageReference Include="Polly" Version="7.2.3" />
3030
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
31-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1" />
31+
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
3232
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
3333
</ItemGroup>
3434

Diff for: ‎src/Services/Catalog/Catalog.API/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
2-
ARG NET_IMAGE=6.0-bullseye-slim
2+
ARG NET_IMAGE=7.0-bullseye-slim
33
FROM mcr.microsoft.com/dotnet/aspnet:${NET_IMAGE} AS base
44
WORKDIR /app
55
EXPOSE 80

0 commit comments

Comments
 (0)