Skip to content

Commit 3eae8f9

Browse files
committed
Merge branch 'csharp2042'
2 parents 26d24ce + 4e3d52b commit 3eae8f9

File tree

109 files changed

+1695
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1695
-14
lines changed

src/MongoDB.Driver.Core.Dotnet/MongoDB.Driver.Core.Dotnet.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<PackageReference Include="System.Net.NameResolution" Version="4.0.0" />
2828
<PackageReference Include="System.Net.Security" Version="4.0.0" />
2929
<PackageReference Include="System.Security.SecureString" Version="4.0.0" />
30+
<PackageReference Include="DnsClient" Version="1.0.7" />
3031
</ItemGroup>
3132

3233
</Project>

src/MongoDB.Driver.Core/Core/Configuration/ClusterBuilderExtensions.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2010-2016 MongoDB Inc.
1+
/* Copyright 2010-2017 MongoDB Inc.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ public static ClusterBuilder ConfigureWithConnectionString(this ClusterBuilder b
4646
Ensure.IsNotNullOrEmpty(connectionString, nameof(connectionString));
4747

4848
var parsedConnectionString = new ConnectionString(connectionString);
49+
4950
return ConfigureWithConnectionString(builder, parsedConnectionString);
5051
}
5152

@@ -60,6 +61,8 @@ public static ClusterBuilder ConfigureWithConnectionString(this ClusterBuilder b
6061
Ensure.IsNotNull(builder, nameof(builder));
6162
Ensure.IsNotNull(connectionString, nameof(connectionString));
6263

64+
connectionString = connectionString.Resolve();
65+
6366
// TCP
6467
if (connectionString.ConnectTimeout != null)
6568
{

0 commit comments

Comments
 (0)