Skip to content

Commit c69d863

Browse files
lukebakkenlukebakken
authored
Merge branch 'main' into remove-unused-string-extension
2 parents e8531e5 + ec2160b commit c69d863

File tree

9 files changed

+46
-21
lines changed

9 files changed

+46
-21
lines changed

‎.ci/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"erlang": "25.2",
3-
"rabbitmq": "3.11.5"
3+
"rabbitmq": "3.11.6"
44
}

‎projects/Benchmarks/Benchmarks.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
12-
<PackageReference Include="Ductus.FluentDocker" Version="2.10.45" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
12+
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
1616
<ProjectReference Include="..\RabbitMQ.Client\RabbitMQ.Client.csproj" />
17-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
17+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
1818
</ItemGroup>
1919

2020
</Project>

‎projects/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
61-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
60+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0" PrivateAssets="all" />
61+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
6262
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
63-
<PackageReference Include="MinVer" Version="3.1.0" PrivateAssets="All" />
64-
<PackageReference Include="System.Memory" Version="4.5.4" />
65-
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
63+
<PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
64+
<PackageReference Include="System.Memory" Version="4.5.5" />
65+
<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
6666
</ItemGroup>
6767

6868
</Project>

‎projects/Unit/Fixtures.cs

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class IntegrationFixture : IDisposable
5151
internal Encoding _encoding = new UTF8Encoding();
5252

5353
public static TimeSpan RECOVERY_INTERVAL = TimeSpan.FromSeconds(2);
54-
54+
protected readonly TimeSpan _waitSpan;
5555
protected readonly ITestOutputHelper _output;
5656
protected readonly string _testDisplayName;
5757

@@ -64,6 +64,15 @@ public IntegrationFixture(ITestOutputHelper output)
6464
_testDisplayName = test.DisplayName;
6565

6666
SetUp();
67+
68+
if (IsRunningInCI())
69+
{
70+
_waitSpan = TimeSpan.FromSeconds(30);
71+
}
72+
else
73+
{
74+
_waitSpan = TimeSpan.FromSeconds(10);
75+
}
6776
}
6877

6978
protected virtual void SetUp()
@@ -400,7 +409,7 @@ internal void StartRabbitMQ()
400409

401410
internal void Wait(ManualResetEventSlim latch)
402411
{
403-
Assert.True(latch.Wait(TimeSpan.FromSeconds(10)), "waiting on a latch timed out");
412+
Assert.True(latch.Wait(_waitSpan), "waiting on a latch timed out");
404413
}
405414

406415
internal void Wait(ManualResetEventSlim latch, TimeSpan timeSpan)
@@ -416,6 +425,17 @@ public static string CertificatesDirectory()
416425
{
417426
return Environment.GetEnvironmentVariable("SSL_CERTS_DIR");
418427
}
428+
429+
private static bool IsRunningInCI()
430+
{
431+
string concourse = Environment.GetEnvironmentVariable("CONCOURSE_CI_BUILD");
432+
string gha = Environment.GetEnvironmentVariable("GITHUB_ACTIONS");
433+
if (String.IsNullOrWhiteSpace(concourse) && String.IsNullOrWhiteSpace(gha))
434+
{
435+
return false;
436+
}
437+
return true;
438+
}
419439
}
420440

421441
public class TimingFixture

‎projects/Unit/TestAsyncConsumer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public async Task TestBasicRoundtripConcurrent()
102102

103103
var publish1SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
104104
var publish2SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
105-
var maximumWaitTime = TimeSpan.FromSeconds(5);
105+
var maximumWaitTime = TimeSpan.FromSeconds(10);
106106
var tokenSource = new CancellationTokenSource(maximumWaitTime);
107107
tokenSource.Token.Register(() =>
108108
{
@@ -178,7 +178,7 @@ public async Task TestBasicRoundtripConcurrentManyMessages()
178178
{
179179
var publish1SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
180180
var publish2SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
181-
var maximumWaitTime = TimeSpan.FromSeconds(10);
181+
var maximumWaitTime = TimeSpan.FromSeconds(30);
182182
var tokenSource = new CancellationTokenSource(maximumWaitTime);
183183
tokenSource.Token.Register(() =>
184184
{

‎projects/Unit/TestConnectionRecovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace RabbitMQ.Client.Unit
4848
public class TestConnectionRecovery : IntegrationFixture
4949
{
5050
private readonly byte[] _messageBody;
51-
private readonly ushort _totalMessageCount = 1024;
51+
private readonly ushort _totalMessageCount = 8192;
5252
private readonly ushort _closeAtCount = 16;
5353
private string _queueName;
5454

‎projects/Unit/TestConsumer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public async Task TestBasicRoundtripConcurrent()
3131

3232
var publish1SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
3333
var publish2SyncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
34-
var maximumWaitTime = TimeSpan.FromSeconds(5);
34+
var maximumWaitTime = TimeSpan.FromSeconds(10);
3535
var tokenSource = new CancellationTokenSource(maximumWaitTime);
3636
tokenSource.Token.Register(() =>
3737
{

‎projects/Unit/TestPublisherConfirms.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public async Task TestWaitForConfirmsWithEvents()
134134
// to be equal to N because acks can be batched,
135135
// so we primarily care about event handlers being invoked
136136
// in this test
137-
Assert.True(c > 5);
137+
Assert.True(c >= 1);
138138
}
139139
finally
140140
{

‎projects/Unit/Unit.csproj

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,20 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
17-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
<PrivateAssets>all</PrivateAssets>
22+
</PackageReference>
1823
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
19-
<PackageReference Include="xunit" Version="2.4.1" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
24+
<PackageReference Include="xunit" Version="2.4.2" />
25+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2126
<PrivateAssets>all</PrivateAssets>
2227
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2328
</PackageReference>
24-
<PackageReference Include="Verify.Xunit" Version="16.5.4" />
29+
<PackageReference Include="Verify.Xunit" Version="19.9.2" />
2530
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
2631
</ItemGroup>
2732

0 commit comments

Comments
 (0)