Skip to content

Commit 229a273

Browse files
committed
CSHARP-3121: Remove references to NETSTANDARD1_6.
1 parent a53af6e commit 229a273

File tree

12 files changed

+15
-15
lines changed

12 files changed

+15
-15
lines changed

src/MongoDB.Bson/IO/BsonReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public virtual IByteBuffer ReadRawBsonArray()
297297
bsonWriter.WriteEndDocument();
298298

299299
byte[] memoryStreamBuffer;
300-
#if NETSTANDARD1_5 || NETSTANDARD1_6
300+
#if NETSTANDARD1_5
301301
memoryStreamBuffer = memoryStream.ToArray();
302302
#else
303303
memoryStreamBuffer = memoryStream.GetBuffer();

src/MongoDB.Bson/IO/BsonStreamAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public override ArraySegment<byte> ReadCStringBytes()
297297
if (b == 0)
298298
{
299299
byte[] memoryStreamBuffer;
300-
#if NETSTANDARD1_5 || NETSTANDARD1_6
300+
#if NETSTANDARD1_5
301301
memoryStreamBuffer = memoryStream.ToArray();
302302
#else
303303
memoryStreamBuffer = memoryStream.GetBuffer();

src/MongoDB.Bson/Serialization/BsonClassMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1602,7 +1602,7 @@ private static PropertyInfo FindPropertyImplementation(PropertyInfo interfacePro
16021602
{
16031603
var interfaceType = interfacePropertyInfo.DeclaringType;
16041604

1605-
#if NETSTANDARD1_5 || NETSTANDARD1_6
1605+
#if NETSTANDARD1_5
16061606
var actualTypeInfo = actualType.GetTypeInfo();
16071607
var bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
16081608
var actualTypePropertyInfos = actualTypeInfo.GetMembers(bindingFlags).OfType<PropertyInfo>();

src/MongoDB.Bson/Serialization/Serializers/CultureInfoSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected override CultureInfo DeserializeValue(BsonDeserializationContext conte
7373
case Flags.UseUserOverride: useUserOverride = _booleanSerializer.Deserialize(context); break;
7474
}
7575
});
76-
#if NETSTANDARD1_5 || NETSTANDARD1_6
76+
#if NETSTANDARD1_5
7777
if (!useUserOverride)
7878
{
7979
throw new FormatException("CultureInfo does not support useUserOverride on this version of the .NET Framework.");
@@ -101,7 +101,7 @@ protected override void SerializeValue(BsonSerializationContext context, BsonSer
101101
{
102102
var bsonWriter = context.Writer;
103103

104-
#if NETSTANDARD1_5 || NETSTANDARD1_6
104+
#if NETSTANDARD1_5
105105
var useUserOverride = true;
106106
#else
107107
var useUserOverride = value.UseUserOverride;

src/MongoDB.Driver.Core/Core/Authentication/GssapiAuthenticator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public ISaslStep Initialize(IConnection connection, SaslConversation conversatio
218218

219219
if (_canonicalizeHostName)
220220
{
221-
#if NETSTANDARD1_5 || NETSTANDARD1_6
221+
#if NETSTANDARD1_5
222222
var entry = Dns.GetHostEntryAsync(hostName).GetAwaiter().GetResult();
223223
#else
224224
var entry = Dns.GetHostEntry(hostName);

src/MongoDB.Driver.Core/Core/Connections/SslStreamFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToke
4747
var sslStream = CreateSslStream(stream);
4848
var targetHost = GetTargetHost(endPoint);
4949
var clientCertificates = new X509CertificateCollection(_settings.ClientCertificates.ToArray());
50-
#if NETSTANDARD1_5 || NETSTANDARD1_6
50+
#if NETSTANDARD1_5
5151
sslStream.AuthenticateAsClientAsync(targetHost, clientCertificates, _settings.EnabledSslProtocols, _settings.CheckCertificateRevocation).GetAwaiter().GetResult();
5252
#else
5353
sslStream.AuthenticateAsClient(targetHost, clientCertificates, _settings.EnabledSslProtocols, _settings.CheckCertificateRevocation);

src/MongoDB.Driver.Core/Core/Connections/TcpStreamFactory.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public TcpStreamFactory(TcpStreamSettings settings)
4848
// methods
4949
public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToken)
5050
{
51-
#if NETSTANDARD1_5 || NETSTANDARD1_6
51+
#if NETSTANDARD1_5
5252
// ugh... I know... but there isn't a non-async version of dns resolution
5353
// in .NET Core
5454
var resolved = ResolveEndPointsAsync(endPoint).GetAwaiter().GetResult();
@@ -82,7 +82,7 @@ public Stream CreateStream(EndPoint endPoint, CancellationToken cancellationToke
8282

8383
public async Task<Stream> CreateStreamAsync(EndPoint endPoint, CancellationToken cancellationToken)
8484
{
85-
#if NETSTANDARD1_5 || NETSTANDARD1_6
85+
#if NETSTANDARD1_5
8686
var resolved = await ResolveEndPointsAsync(endPoint).ConfigureAwait(false);
8787
for (int i = 0; i < resolved.Length; i++)
8888
{
@@ -181,7 +181,7 @@ private async Task ConnectAsync(Socket socket, EndPoint endPoint, CancellationTo
181181
try
182182
{
183183
var dnsEndPoint = endPoint as DnsEndPoint;
184-
#if NETSTANDARD1_5 || NETSTANDARD1_6
184+
#if NETSTANDARD1_5
185185
await socket.ConnectAsync(endPoint).ConfigureAwait(false);
186186
#else
187187
if (dnsEndPoint != null)

src/MongoDB.Driver.GridFS/GridFSDownloadStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal GridFSDownloadStream()
4141
public abstract GridFSFileInfo<TFileId> FileInfo { get; }
4242

4343
// public methods
44-
#if NETSTANDARD1_5 || NETSTANDARD1_6
44+
#if NETSTANDARD1_5
4545
/// <summary>
4646
/// Closes the GridFS stream.
4747
/// </summary>

src/MongoDB.Driver.GridFS/GridFSUploadStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ internal GridFSUploadStream()
6161
/// <returns>A Task.</returns>
6262
public abstract Task AbortAsync(CancellationToken cancellationToken = default(CancellationToken));
6363

64-
#if NETSTANDARD1_5 || NETSTANDARD1_6
64+
#if NETSTANDARD1_5
6565
/// <summary>
6666
/// Closes the GridFS stream.
6767
/// </summary>

src/MongoDB.Driver.GridFS/GridFSUploadStreamCompat.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public ObjectId Id
7777
return _wrappedStream.AbortAsync(cancellationToken);
7878
}
7979

80-
#if NETSTANDARD1_5 || NETSTANDARD1_6
80+
#if NETSTANDARD1_5
8181
/// <summary>
8282
/// Closes the GridFS stream.
8383
/// </summary>

0 commit comments

Comments
 (0)