Skip to content

Commit 412bc52

Browse files
phongnguyendphongnguyend
committed
(#301) Upgrade .Net 10
1 parent 45ec27e commit 412bc52

File tree

53 files changed

+201
-333
lines changed

Some content is hidden

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

53 files changed

+201
-333
lines changed

‎src/Microservices/AspireAppHost/ClassifiedAds.AspireAppHost.csproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<Sdk Name="Aspire.AppHost.Sdk" Version="9.5.2" />
1+
<Project Sdk="Aspire.AppHost.Sdk/13.0.0">
42

53
<PropertyGroup>
64
<OutputType>Exe</OutputType>
7-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
86
<ImplicitUsings>enable</ImplicitUsings>
97
<Nullable>enable</Nullable>
108
</PropertyGroup>
119

12-
<ItemGroup>
13-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.2" />
14-
</ItemGroup>
15-
1610
<ItemGroup>
1711
<ProjectReference Include="..\Gateways.GraphQL\ClassifiedAds.Gateways.GraphQL\ClassifiedAds.Gateways.GraphQL.csproj" />
1812
<ProjectReference Include="..\Gateways.WebAPI\ClassifiedAds.Gateways.WebAPI\ClassifiedAds.Gateways.WebAPI.csproj" />

‎src/Microservices/Common/ClassifiedAds.Application/ClassifiedAds.Application.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1" />
8+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
99
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Microservices/Common/ClassifiedAds.CrossCuttingConcerns/ClassifiedAds.CrossCuttingConcerns.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<AnalysisMode>Recommended</AnalysisMode>
66
<AnalysisModeSecurity>All</AnalysisModeSecurity>
77
</PropertyGroup>

‎src/Microservices/Common/ClassifiedAds.Domain/ClassifiedAds.Domain.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
8+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
1010
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Microservices/Common/ClassifiedAds.Domain/Repositories/IRepository.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ public interface IRepository<TEntity, TKey> : IConcurrencyHandler<TEntity>
2929

3030
Task<List<T>> ToListAsync<T>(IQueryable<T> query);
3131

32-
Task BulkInsertAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken = default);
32+
Task BulkInsertAsync(IReadOnlyCollection<TEntity> entities, CancellationToken cancellationToken = default);
3333

34-
Task BulkInsertAsync(IEnumerable<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default);
34+
Task BulkInsertAsync(IReadOnlyCollection<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default);
3535

36-
Task BulkUpdateAsync(IEnumerable<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default);
36+
Task BulkUpdateAsync(IReadOnlyCollection<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default);
3737

38-
Task BulkMergeAsync(IEnumerable<TEntity> entities, Expression<Func<TEntity, object>> idSelector, Expression<Func<TEntity, object>> updateColumnNamesSelector, Expression<Func<TEntity, object>> insertColumnNamesSelector, CancellationToken cancellationToken = default);
38+
Task BulkMergeAsync(IReadOnlyCollection<TEntity> entities, Expression<Func<TEntity, object>> idSelector, Expression<Func<TEntity, object>> updateColumnNamesSelector, Expression<Func<TEntity, object>> insertColumnNamesSelector, CancellationToken cancellationToken = default);
3939

40-
Task BulkDeleteAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken = default);
40+
Task BulkDeleteAsync(IReadOnlyCollection<TEntity> entities, CancellationToken cancellationToken = default);
4141
}

‎src/Microservices/Common/ClassifiedAds.Infrastructure/ClassifiedAds.Infrastructure.csproj‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<RootNamespace>ClassifiedAds.Infrastructure</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<FrameworkReference Include="Microsoft.AspNetCore.App" />
10-
<PackageReference Include="AWS.Logger.SeriLog" Version="3.4.3" />
11-
<PackageReference Include="AWSSDK.S3" Version="3.7.412.1" />
12-
<PackageReference Include="Azure.Communication.Sms" Version="1.0.1" />
13-
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.5.0" />
14-
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" />
15-
<PackageReference Include="Azure.Identity" Version="1.13.2" />
16-
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
17-
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
18-
<PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
19-
<PackageReference Include="Castle.Core" Version="5.1.1" />
20-
<PackageReference Include="Confluent.Kafka" Version="2.8.0" />
10+
<PackageReference Include="AWS.Logger.SeriLog" Version="4.0.2" />
11+
<PackageReference Include="AWSSDK.S3" Version="4.0.11.2" />
12+
<PackageReference Include="Azure.Communication.Sms" Version="1.0.2" />
13+
<PackageReference Include="Azure.Data.AppConfiguration" Version="1.7.0" />
14+
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
15+
<PackageReference Include="Azure.Identity" Version="1.17.0" />
16+
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
17+
<PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
18+
<PackageReference Include="Azure.Storage.Blobs" Version="12.26.0" />
19+
<PackageReference Include="Castle.Core" Version="5.2.1" />
20+
<PackageReference Include="Confluent.Kafka" Version="2.12.0" />
2121
<PackageReference Include="CryptographyHelper" Version="3.1.0" />
22-
<PackageReference Include="CsvHelper" Version="33.0.1" />
23-
<PackageReference Include="Dapper.StrongName" Version="2.1.35" />
22+
<PackageReference Include="CsvHelper" Version="33.1.0" />
23+
<PackageReference Include="Dapper.StrongName" Version="2.1.66" />
2424
<PackageReference Include="DinkToPdf" Version="1.0.8" />
25-
<PackageReference Include="Google.Protobuf" Version="3.29.3" />
26-
<PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
25+
<PackageReference Include="Google.Protobuf" Version="3.33.0" />
26+
<PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
2727
<PackageReference Include="IdentityModel" Version="7.0.0" />
28-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
29-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
31-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="9.0.1" />
32-
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.1" />
35-
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="9.4.0" />
28+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.23.0" />
29+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.0" />
30+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.0" />
31+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="10.0.0" />
32+
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.4.0" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Caching.Hybrid" Version="10.0.0" />
3636
<PackageReference Include="Microsoft.Extensions.Caching.Redis" Version="2.3.0" />
37-
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="9.0.1" />
38-
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="9.0.1" />
39-
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="9.0.1" />
40-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.0" />
41-
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.11.0" />
42-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.0" />
43-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
37+
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="10.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="10.0.0" />
39+
<PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="10.0.0" />
40+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
41+
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.14.0" />
42+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
43+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
4444
<PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.10.0-beta.1" />
45-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
45+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
4646
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="1.10.0-beta.1" />
47-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
48-
<PackageReference Include="PuppeteerSharp" Version="20.0.5" />
49-
<PackageReference Include="Quartz" Version="3.13.1" />
50-
<PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
47+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
48+
<PackageReference Include="PuppeteerSharp" Version="20.2.4" />
49+
<PackageReference Include="Quartz" Version="3.15.1" />
50+
<PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
5151
<PackageReference Include="RazorLight" Version="2.3.1" />
5252
<PackageReference Include="SendGrid" Version="9.29.3" />
53-
<PackageReference Include="Serilog" Version="4.2.0" />
53+
<PackageReference Include="Serilog" Version="4.3.0" />
5454
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
5555
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
5656
<PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
5757
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
5858
<PrivateAssets>all</PrivateAssets>
5959
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6060
</PackageReference>
61-
<PackageReference Include="Twilio" Version="7.8.2" />
61+
<PackageReference Include="Twilio" Version="7.13.6" />
6262
<PackageReference Include="VaultSharp" Version="1.17.5.1" />
6363
</ItemGroup>
6464

‎src/Microservices/Common/ClassifiedAds.Persistence.MySQL/ClassifiedAds.Persistence.MySQL.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="EntityFrameworkCore.MySql.SimpleBulks" Version="8.0.0-preview.12" />
11-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.1" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
10+
<PackageReference Include="EntityFrameworkCore.MySql.SimpleBulks" Version="8.0.0-preview.17" />
11+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
1313
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Microservices/Common/ClassifiedAds.Persistence.PostgreSQL/ClassifiedAds.Persistence.PostgreSQL.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="EntityFrameworkCore.PostgreSQL.SimpleBulks" Version="8.0.0-preview.15" />
11-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.1" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
10+
<PackageReference Include="EntityFrameworkCore.PostgreSQL.SimpleBulks" Version="8.0.0-preview.20" />
11+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
1313
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Microservices/Common/ClassifiedAds.Persistence.SqlServer/ClassifiedAds.Persistence.SqlServer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="EntityFrameworkCore.SqlServer.SimpleBulks" Version="8.10.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="9.0.1" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
10+
<PackageReference Include="EntityFrameworkCore.SqlServer.SimpleBulks" Version="8.15.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
1313
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎src/Microservices/Common/ClassifiedAds.Persistence.SqlServer/DbContextRepository.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,27 +82,27 @@ public Task<List<T1>> ToListAsync<T1>(IQueryable<T1> query)
8282
return query.ToListAsync();
8383
}
8484

85-
public async Task BulkInsertAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken = default)
85+
public async Task BulkInsertAsync(IReadOnlyCollection<TEntity> entities, CancellationToken cancellationToken = default)
8686
{
8787
await _dbContext.BulkInsertAsync(entities, cancellationToken: cancellationToken);
8888
}
8989

90-
public async Task BulkInsertAsync(IEnumerable<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default)
90+
public async Task BulkInsertAsync(IReadOnlyCollection<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default)
9191
{
9292
await _dbContext.BulkInsertAsync(entities, columnNamesSelector, cancellationToken: cancellationToken);
9393
}
9494

95-
public async Task BulkUpdateAsync(IEnumerable<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default)
95+
public async Task BulkUpdateAsync(IReadOnlyCollection<TEntity> entities, Expression<Func<TEntity, object>> columnNamesSelector, CancellationToken cancellationToken = default)
9696
{
9797
await _dbContext.BulkUpdateAsync(entities, columnNamesSelector, cancellationToken: cancellationToken);
9898
}
9999

100-
public async Task BulkDeleteAsync(IEnumerable<TEntity> entities, CancellationToken cancellationToken = default)
100+
public async Task BulkDeleteAsync(IReadOnlyCollection<TEntity> entities, CancellationToken cancellationToken = default)
101101
{
102102
await _dbContext.BulkDeleteAsync(entities, cancellationToken: cancellationToken);
103103
}
104104

105-
public async Task BulkMergeAsync(IEnumerable<TEntity> entities, Expression<Func<TEntity, object>> idSelector, Expression<Func<TEntity, object>> updateColumnNamesSelector, Expression<Func<TEntity, object>> insertColumnNamesSelector, CancellationToken cancellationToken = default)
105+
public async Task BulkMergeAsync(IReadOnlyCollection<TEntity> entities, Expression<Func<TEntity, object>> idSelector, Expression<Func<TEntity, object>> updateColumnNamesSelector, Expression<Func<TEntity, object>> insertColumnNamesSelector, CancellationToken cancellationToken = default)
106106
{
107107
await _dbContext.BulkMergeAsync(entities, idSelector, updateColumnNamesSelector, insertColumnNamesSelector, cancellationToken: cancellationToken);
108108
}

0 commit comments

Comments
 (0)