Skip to content

Commit 47cde21

Browse files
committed
Update package versions and remove obsolete code
This commit updates various package versions across multiple projects to their latest stable releases, including major libraries such as `FlubuCore`, `Dapper`, `Swashbuckle.AspNetCore`, and `OpenTelemetry`. It also removes obsolete code related to SQS permissions in `AmazonPolicyExtensions.cs`. Additionally, testing packages have been updated to ensure compatibility with the latest versions.
1 parent d6fda2f commit 47cde21

File tree

23 files changed

+46
-52
lines changed

23 files changed

+46
-52
lines changed

build/BuildScript.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="FlubuCore" Version="8.0.0" />
20+
<PackageReference Include="FlubuCore" Version="9.0.0" />
2121
</ItemGroup>
2222

2323
</Project>

samples/Sample.ConsoleApp/Sample.ConsoleApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
10-
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.0" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.7" />
10+
<PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="8.2.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

samples/Sample.Kafka.PostgreSql/Sample.Kafka.PostgreSql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Dapper" Version="2.0.138" />
10+
<PackageReference Include="Dapper" Version="2.1.66" />
1111
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
1212
</ItemGroup>
1313
<ItemGroup>

samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Dapper" Version="2.0.138" />
8+
<PackageReference Include="Dapper" Version="2.1.66" />
99
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
1010
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
11+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\..\src\DotNetCore.CAP.Dashboard.K8s\DotNetCore.CAP.Dashboard.K8s.csproj" />

samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Dapper" Version="2.0.138" />
8+
<PackageReference Include="Dapper" Version="2.1.66" />
99
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.11" />
1010
<PackageReference Include="NameGenerator" Version="2.0.4" />
1111
</ItemGroup>

samples/Samples.Redis.SqlServer/Samples.Redis.SqlServer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
11+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
1313
</ItemGroup>
1414
<ItemGroup>
1515
<ProjectReference Include="..\..\src\DotNetCore.CAP.Dashboard\DotNetCore.CAP.Dashboard.csproj" />

src/DotNetCore.CAP.AmazonSQS/AmazonPolicyExtensions.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Collections.Generic;
66
using System.Linq;
77
using Amazon.Auth.AccessControlPolicy;
8-
using Amazon.Auth.AccessControlPolicy.ActionIdentifiers;
98

109
namespace DotNetCore.CAP.AmazonSQS;
1110

@@ -77,9 +76,7 @@ public static bool HasSqsPermission(this Policy policy, string topicArn, string
7776
public static void AddSqsPermissions(this Policy policy, IEnumerable<string> topicArns, string sqsQueueArn)
7877
{
7978
var statement = new Statement(Statement.StatementEffect.Allow);
80-
#pragma warning disable CS0618 // Type or member is obsolete
81-
statement.Actions.Add(SQSActionIdentifiers.SendMessage);
82-
#pragma warning restore CS0618 // Type or member is obsolete
79+
statement.Actions.Add(new ActionIdentifier("sqs:SendMessage"));
8380
statement.Resources.Add(new Resource(sqsQueueArn));
8481
statement.Principals.Add(new Principal("*"));
8582
foreach (var topicArn in topicArns)
@@ -170,10 +167,7 @@ public static void CompactSqsPermissions(this Policy policy, string sqsQueueArn)
170167
{
171168
var statementsToCompact = policy.Statements
172169
.Where(s => s.Effect == Statement.StatementEffect.Allow)
173-
#pragma warning disable CS0618 // Type or member is obsolete
174-
.Where(s => s.Actions.All(a => string.Equals(a.ActionName, SQSActionIdentifiers.SendMessage.ActionName,
175-
StringComparison.OrdinalIgnoreCase)))
176-
#pragma warning restore CS0618 // Type or member is obsolete
170+
.Where(s => s.Actions.All(a => string.Equals(a.ActionName, "sqs:SendMessage", StringComparison.OrdinalIgnoreCase)))
177171
.Where(s => s.Resources.All(r => string.Equals(r.Id, sqsQueueArn, StringComparison.OrdinalIgnoreCase)))
178172
.Where(s => s.Principals.All(r => string.Equals(r.Id, "*", StringComparison.OrdinalIgnoreCase)))
179173
.ToList();

src/DotNetCore.CAP.AmazonSQS/DotNetCore.CAP.AmazonSQS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.400.25" />
16-
<PackageReference Include="AWSSDK.SQS" Version="3.7.400.25" />
15+
<PackageReference Include="AWSSDK.SimpleNotificationService" Version="4.0.0.15" />
16+
<PackageReference Include="AWSSDK.SQS" Version="4.0.0.17" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

src/DotNetCore.CAP.AzureServiceBus/DotNetCore.CAP.AzureServiceBus.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<None Remove="System.Linq.Async" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.1" />
21-
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
20+
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
21+
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
2222
</ItemGroup>
2323
<ItemGroup>
2424
<ProjectReference Include="..\DotNetCore.CAP\DotNetCore.CAP.csproj" />

src/DotNetCore.CAP.Dashboard/DotNetCore.CAP.Dashboard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11-
<PackageReference Include="Consul" Version="1.7.14.4" />
11+
<PackageReference Include="Consul" Version="1.7.14.7" />
1212
<SupportedPlatform Include="browser" />
1313
</ItemGroup>
1414

0 commit comments

Comments
 (0)