Skip to content

Commit c5b3822

Browse files
authored
Merge branch 'main' into newpipeline
2 parents 46ce963 + f3ae7f8 commit c5b3822

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.ci/versions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"erlang": "25.1.1",
3-
"rabbitmq": "3.11.1"
2+
"erlang": "25.2",
3+
"rabbitmq": "3.11.5"
44
}

projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace RabbitMQ.Client
4848
/// "Port" properties are extracted.
4949
/// </para>
5050
/// </remarks>
51-
public class AmqpTcpEndpoint// : ICloneable
51+
public class AmqpTcpEndpoint
5252
{
5353
/// <summary>
5454
/// Default Amqp ssl port.

projects/Unit/TestHeartbeats.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void TestThatHeartbeatWriterWithTLSEnabled()
7979

8080
string hostName = System.Net.Dns.GetHostName();
8181
cf.Ssl.ServerName = hostName;
82-
cf.Ssl.CertPath = $"{sslDir}/client_{hostName}_key.p12";
82+
cf.Ssl.CertPath = $"{sslDir}/client_{hostName}.p12";
8383
cf.Ssl.CertPassphrase = certPassphrase;
8484
cf.Ssl.Enabled = true;
8585

projects/Unit/TestSsl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void TestClientAndServerVerified()
9595
string hostName = System.Net.Dns.GetHostName();
9696
ConnectionFactory cf = new ConnectionFactory { Port = 5671 };
9797
cf.Ssl.ServerName = hostName;
98-
cf.Ssl.CertPath = $"{_sslDir}/client_{hostName}_key.p12";
98+
cf.Ssl.CertPath = $"{_sslDir}/client_{hostName}.p12";
9999
cf.Ssl.CertPassphrase = _certPassphrase;
100100
cf.Ssl.Enabled = true;
101101
SendReceive(cf);

0 commit comments

Comments
 (0)