Skip to content

Commit 1cded21

Browse files
Merge pull request #85 from rabbitmq/rabbitmq-dotnet-client-57
Improve SQL CLR compatibility
2 parents 46476ba + e04909a commit 1cded21

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

projects/client/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@
264264
<Reference Include="System.Xml" />
265265
<Reference Include="System.Xml.Linq" />
266266
<Reference Include="System.Configuration" />
267-
<Reference Include="System.ServiceModel" />
268267
</ItemGroup>
269268
<!-- Mono compatibility workarounds -->
270269
<PropertyGroup Condition=" '$(PropUsingMono)' == 'true'">

projects/client/RabbitMQ.Client/src/client/api/ConnectionFactory.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
using System.Threading.Tasks;
4747

4848
#if !NETFX_CORE
49+
4950
using System.Net.Security;
51+
5052
#endif
5153

5254
namespace RabbitMQ.Client
@@ -141,7 +143,7 @@ public class ConnectionFactory : ConnectionFactoryBase, IConnectionFactory
141143
/// <summary>
142144
/// Default SASL auth mechanisms to use.
143145
/// </summary>
144-
public static AuthMechanismFactory[] DefaultAuthMechanisms = { new PlainMechanismFactory() };
146+
public static readonly AuthMechanismFactory[] DefaultAuthMechanisms = { new PlainMechanismFactory() };
145147

146148
/// <summary>
147149
/// SASL auth mechanisms to use.
@@ -400,4 +402,4 @@ private string UriDecode(string uri)
400402
return System.Uri.UnescapeDataString(uri.Replace("+", "%2B"));
401403
}
402404
}
403-
}
405+
}

0 commit comments

Comments
 (0)