Merge pull request #284 from cnblogs/upgrade-to-8.0.10

ikesnowy · web-flow · commit 0b87705358ab · 2024-10-23T12:40:49.000+08:00
chore: upgrade packages
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Mapster" Version="7.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.Abstractions\Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj" />
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Analyzer" Version="1.4.0" PrivateAssets="None"/>
+    <PackageReference Include="MongoDB.Analyzer" Version="1.5.0" PrivateAssets="None" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoPageableQueryHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoPageableQueryHandler.cs
@@ -1,6 +1,5 @@
 ﻿using Cnblogs.Architecture.Ddd.Cqrs.Abstractions;
 
-using MongoDB.Driver;
 using MongoDB.Driver.Linq;
 
 namespace Cnblogs.Architecture.Ddd.Cqrs.MongoDb;
@@ -18,12 +17,12 @@ public abstract class MongoPageableQueryHandler<TQuery, TEntity, TView>
     /// <inheritdoc />
     protected override Task<int> CountAsync(TQuery query, IQueryable<TEntity> queryable)
     {
-        return queryable.AsMongoQueryable().CountAsync();
+        return queryable.CountAsync();
     }
 
     /// <inheritdoc />
     protected override Task<List<TView>> ToListAsync(TQuery query, IQueryable<TView> queryable)
     {
-        return queryable.AsMongoQueryable().ToListAsync();
+        return queryable.ToListAsync();
     }
-}
+}
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoQueryableExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoQueryableExtensions.cs
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser"/>
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore\CqrsHeaderNames.cs">
diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MediatR" Version="12.4.0" />
+    <PackageReference Include="MediatR" Version="12.4.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="MongoDB.Driver" Version="2.28.0" />
+      <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs
@@ -1,5 +1,4 @@
 ﻿using MongoDB.Driver;
-using MongoDB.Driver.Linq;
 
 namespace Cnblogs.Architecture.Ddd.Infrastructure.MongoDb;
 
@@ -41,7 +40,6 @@ protected MongoContextOptions(string connectionString, string databaseName)
     {
         _databaseName = databaseName;
         _settings = MongoClientSettings.FromConnectionString(connectionString);
-        _settings.LinqProvider = LinqProvider.V3;
     }
 
     /// <inheritdoc />
@@ -62,4 +60,4 @@ private IMongoClient GetClient()
         _mongoClient ??= new MongoClient(_settings);
         return _mongoClient;
     }
-}
+}
diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj
@@ -26,7 +26,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.InMemory" Version="0.11.0" />
     <PackageReference Include="Serilog.Sinks.InMemory.Assertions" Version="0.11.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using Cnblogs.Architecture.Ddd.Cqrs.Abstractions;`
`2`	`2`
`3`		`-using MongoDB.Driver;`
`4`	`3`	`using MongoDB.Driver.Linq;`
`5`	`4`
`6`	`5`	`namespace Cnblogs.Architecture.Ddd.Cqrs.MongoDb;`
`@@ -18,12 +17,12 @@ public abstract class MongoPageableQueryHandler<TQuery, TEntity, TView>`
`18`	`17`	`/// <inheritdoc />`
`19`	`18`	`protected override Task<int> CountAsync(TQuery query, IQueryable<TEntity> queryable)`
`20`	`19`	`{`
`21`		`- return queryable.AsMongoQueryable().CountAsync();`
	`20`	`+ return queryable.CountAsync();`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`/// <inheritdoc />`
`25`	`24`	`protected override Task<List<TView>> ToListAsync(TQuery query, IQueryable<TView> queryable)`
`26`	`25`	`{`
`27`		`- return queryable.AsMongoQueryable().ToListAsync();`
	`26`	`+ return queryable.ToListAsync();`
`28`	`27`	`}`
`29`		`-}`
	`28`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using MongoDB.Driver;`
`2`		`-using MongoDB.Driver.Linq;`
`3`	`2`
`4`	`3`	`namespace Cnblogs.Architecture.Ddd.Infrastructure.MongoDb;`
`5`	`4`
`@@ -41,7 +40,6 @@ protected MongoContextOptions(string connectionString, string databaseName)`
`41`	`40`	`{`
`42`	`41`	`_databaseName = databaseName;`
`43`	`42`	`_settings = MongoClientSettings.FromConnectionString(connectionString);`
`44`		`- _settings.LinqProvider = LinqProvider.V3;`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`/// <inheritdoc />`
`@@ -62,4 +60,4 @@ private IMongoClient GetClient()`
`62`	`60`	`_mongoClient ??= new MongoClient(_settings);`
`63`	`61`	`return _mongoClient;`
`64`	`62`	`}`
`65`		`-}`
	`63`	`+}`