Skip to content

Commit cded8ed

Browse files
tomkerkhovetomkerkhove
authored
fix: Use reasonable dependency ranges to unblock v1.0.0-preview-1 (#203)
1 parent 121e5b6 commit cded8ed

File tree

15 files changed

+79
-82
lines changed

15 files changed

+79
-82
lines changed

‎src/Arcus.Messaging.Abstractions/Arcus.Messaging.Abstractions.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Arcus.Observability.Correlation" Version="[0.2.1,1.0.0)" />
25-
<PackageReference Include="Guard.NET" Version="1.2.0" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.0" />
29-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
30-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
24+
<PackageReference Include="Arcus.Observability.Correlation" Version="[2.0.0,3.0.0)" />
25+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[3.1.8,5.0.0)" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.8,5.0.0)" />
28+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[3.1.8,5.0.0)" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.8,5.0.0)" />
30+
<PackageReference Include="Newtonsoft.Json" Version="[12.0.0,13.0.0)" />
3131
</ItemGroup>
3232

3333
</Project>

‎src/Arcus.Messaging.Health/Arcus.Messaging.Health.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Guard.NET" Version="1.2.0" />
23-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.0" />
24-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
22+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
23+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[3.1.8,5.0.0)" />
24+
<PackageReference Include="Newtonsoft.Json" Version="[12.0.0,13.0.0)" />
2525
</ItemGroup>
2626

2727
</Project>

‎src/Arcus.Messaging.Pumps.Abstractions/Arcus.Messaging.Pumps.Abstractions.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Enrichers" Version="[0.2.1,1.0.0)" />
24-
<PackageReference Include="Guard.NET" Version="1.2.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
26-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
27-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
29-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
30-
<PackageReference Include="Serilog" Version="2.9.0" />
23+
<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Enrichers" Version="[2.0.0,3.0.0)" />
24+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[3.1.8,5.0.0)" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.8,5.0.0)" />
27+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[3.1.8,5.0.0)" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.8,5.0.0)" />
29+
<PackageReference Include="Newtonsoft.Json" Version="[12.0.0,13.0.0)" />
30+
<PackageReference Include="Serilog" Version="[2.9.0,3.0.0)" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/Arcus.Messaging.Pumps.ServiceBus/Arcus.Messaging.Pumps.ServiceBus.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="[1.3.0,2.0.0)" />
25-
<PackageReference Include="Azure.Identity" Version="1.0.0" />
26-
<PackageReference Include="Guard.NET" Version="1.2.0" />
27-
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.0" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.0" />
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
31-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="3.1.0" />
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
24+
<PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="[1.4.0,2.0.0)" />
25+
<PackageReference Include="Azure.Identity" Version="[1.2.3,2.0.0)" />
26+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
27+
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="[2.1.0,3.0.0)" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[3.1.8,5.0.0)" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[3.1.8,5.0.0)" />
30+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[3.1.8,5.0.0)" />
31+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="[3.1.8,5.0.0)" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[3.1.8,5.0.0)" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/Arcus.Messaging.ServiceBus.Core/Arcus.Messaging.ServiceBus.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Azure.Messaging.ServiceBus" Version="7.0.0" />
24-
<PackageReference Include="Guard.NET" Version="1.2.0" />
23+
<PackageReference Include="Azure.Messaging.ServiceBus" Version="[7.0.0,8.0.0)" />
24+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎src/Arcus.Messaging.Tests.Contracts/Arcus.Messaging.Tests.Contracts.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="Arcus.EventGrid" Version="3.0.0-preview-1" />
99
<PackageReference Include="Guard.NET" Version="1.2.0" />
10-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
10+
<PackageReference Include="Newtonsoft.Json" Version="[12.0.0,13.0.0)" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/Arcus.Messaging.Tests.Core/Arcus.Messaging.Tests.Core.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Arcus.EventGrid" Version="3.0.0" />
11-
<PackageReference Include="Arcus.Testing.Logging" Version="0.1.0" />
10+
<PackageReference Include="Arcus.EventGrid" Version="3.1.0" />
11+
<PackageReference Include="Arcus.Testing.Logging" Version="0.2.0" />
1212
<PackageReference Include="Bogus" Version="29.0.2" />
13-
<PackageReference Include="Guard.NET" Version="1.2.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
13+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.8,5.0.0)" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
16-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
16+
<PackageReference Include="Newtonsoft.Json" Version="[12.0.0,13.0.0)" />
17+
<PackageReference Include="Polly" Version="7.2.2" />
1718
<PackageReference Include="xunit" Version="2.3.1" />
1819
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
1920
</ItemGroup>

‎src/Arcus.Messaging.Tests.Integration/Arcus.Messaging.Tests.Integration.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Arcus.EventGrid.Publishing" Version="3.0.0" />
20-
<PackageReference Include="Arcus.EventGrid.Testing" Version="3.0.0" />
21-
<PackageReference Include="Arcus.Observability.Telemetry.Core" Version="0.4.0" />
22-
<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="0.4.0" />
23-
<PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.3.0" />
19+
<PackageReference Include="Arcus.EventGrid.Publishing" Version="3.1.0" />
20+
<PackageReference Include="Arcus.EventGrid.Testing" Version="3.1.0" />
21+
<PackageReference Include="Arcus.Observability.Telemetry.Core" Version="[2.0.0,3.0.0)" />
22+
<PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="[2.0.0,3.0.0)" />
23+
<PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.4.0" />
2424
<PackageReference Include="Arcus.Testing.Logging" Version="0.2.0" />
25-
<PackageReference Include="Guard.Net" Version="1.2.0" />
25+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
2626
<PackageReference Include="Microsoft.Azure.ApplicationInsights.Query" Version="1.0.0" />
2727
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" />
31-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
32-
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="3.1.8" />
33-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
34-
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.4.2" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="[3.1.8,5.0.0)" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="[3.1.8,5.0.0)" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[3.1.8,5.0.0)" />
31+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[3.1.8,5.0.0)" />
32+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[3.1.8,5.0.0)" />
33+
<PackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.8,5.0.0)" />
34+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.0" />
3535
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
36-
<PackageReference Include="Serilog" Version="2.10.0" />
36+
<PackageReference Include="Serilog" Version="[2.9.0,3.0.0)" />
3737
<PackageReference Include="Serilog.Extensions.Hosting" Version="3.1.0" />
3838
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
3939
<PackageReference Include="xunit" Version="2.3.1" />

‎src/Arcus.Messaging.Tests.Integration/MessagePump/TestMessagePumpService.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,8 @@ public async Task AssertDeadLetterMessageAsync(string connectionString)
159159
await using (var client = new ServiceBusClient(connectionString))
160160
await using (var receiver = client.CreateReceiver(properties.EntityPath, options))
161161
{
162-
RetryPolicy<ServiceBusReceivedMessage> retryPolicy =
163-
Policy.HandleResult<ServiceBusReceivedMessage>(result => result is null)
164-
.WaitAndRetryForeverAsync(index => TimeSpan.FromSeconds(1));
162+
var retryPolicy = Policy.HandleResult<ServiceBusReceivedMessage>(result => result is null)
163+
.WaitAndRetryForeverAsync(index => TimeSpan.FromSeconds(1));
165164

166165
await Policy.TimeoutAsync(TimeSpan.FromMinutes(2))
167166
.WrapAsync(retryPolicy)

‎src/Arcus.Messaging.Tests.Unit/Arcus.Messaging.Tests.Unit.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Arcus.EventGrid.Testing" Version="3.0.0" />
10+
<PackageReference Include="Arcus.EventGrid.Testing" Version="3.1.0" />
1111
<PackageReference Include="Bogus" Version="29.0.2" />
12-
<PackageReference Include="Guard.Net" Version="1.2.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
15-
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.4.2" />
12+
<PackageReference Include="Guard.NET" Version="[1.2.0,2.0.0)" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="[3.1.8,5.0.0)" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="[3.1.8,5.0.0)" />
15+
<PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.0" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
1717
<PackageReference Include="Moq" Version="4.13.1" />
1818
<PackageReference Include="xunit" Version="2.3.1" />

0 commit comments

Comments
 (0)