CSHARP-1561, CSHARP-1562, CSHARP-1563: Renamed preprocessor symbol NETCORE to NETSTANDARD16.

Author: rstam

src/MongoDB.Bson.NetCore/project.json

@@ -15,7 +15,7 @@
         "compile": {
           "include": [ "../MongoDB.Bson/**/*.cs", "../MongoDB.Shared/Hasher.cs" ]
         },
-        "define": [ "DEBUG", "TRACE", "NETCORE" ]
+        "define": [ "DEBUG", "TRACE", "NETSTANDARD16" ]
       }
     }
   }

src/MongoDB.Bson/IO/BsonReader.cs

@@ -276,10 +276,10 @@ public virtual IByteBuffer ReadRawBsonArray()
                 bsonWriter.WriteEndDocument();
 
                 byte[] memoryStreamBuffer;
-#if NET45
-                memoryStreamBuffer = memoryStream.GetBuffer();
-#else
+#if NETSTANDARD16
                 memoryStreamBuffer = memoryStream.ToArray();
+#else
+                memoryStreamBuffer = memoryStream.GetBuffer();
 #endif
                 var buffer = new ByteArrayBuffer(memoryStreamBuffer, (int)memoryStream.Length, isReadOnly: true);
                 return new ByteBufferSlice(buffer, (int)startPosition, (int)(endPosition - startPosition));

src/MongoDB.Bson/IO/BsonStreamAdapter.cs

@@ -296,10 +296,10 @@ public override ArraySegment<byte> ReadCStringBytes()
                 if (b == 0)
                 {
                     byte[] memoryStreamBuffer;
-#if NET45
-                    memoryStreamBuffer = memoryStream.GetBuffer();
-#else
+#if NETSTANDARD16
                     memoryStreamBuffer = memoryStream.ToArray();
+#else
+                    memoryStreamBuffer = memoryStream.GetBuffer();
 #endif
                     return new ArraySegment<byte>(memoryStreamBuffer, 0, (int)memoryStream.Length);
                 }

src/MongoDB.Bson/ObjectModel/ObjectId.cs

@@ -377,10 +377,10 @@ public static void Unpack(byte[] bytes, out int timestamp, out int machine, out
         // private static methods
         private static int GetAppDomainId()
         {
-#if NET45
-            return AppDomain.CurrentDomain.Id;
-#else
+#if NETSTANDARD16
             return 1;
+#else
+            return AppDomain.CurrentDomain.Id;
 #endif
         }
 
@@ -392,10 +392,10 @@ private static int GetAppDomainId()
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static int GetCurrentProcessId()
         {
-#if NET45
-            return Process.GetCurrentProcess().Id;
-#else
+#if NETSTANDARD16
             return 1;
+#else
+            return Process.GetCurrentProcess().Id;
 #endif
         }
 
@@ -408,10 +408,10 @@ private static int GetMachineHash()
 
         private static string GetMachineName()
         {
-#if NET45
-            return Environment.MachineName;
-#else
+#if NETSTANDARD16
             return Environment.GetEnvironmentVariable("COMPUTERNAME") ?? "";
+#else
+            return Environment.MachineName;
 #endif
         }
 

src/MongoDB.Bson/Serialization/AttributedSerializationProvider.cs

@@ -39,10 +39,10 @@ public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry
                 throw new ArgumentException(message, "type");
             }
 
-#if NET45
-            var serializerAttributes = typeInfo.GetCustomAttributes(typeof(BsonSerializerAttribute), false); // don't inherit
-#else
+#if NETSTANDARD16
             var serializerAttributes = typeInfo.GetCustomAttributes(typeof(BsonSerializerAttribute), false).ToArray(); // don't inherit
+#else
+            var serializerAttributes = typeInfo.GetCustomAttributes(typeof(BsonSerializerAttribute), false); // don't inherit
 #endif
             if (serializerAttributes.Length == 1)
             {

src/MongoDB.Bson/Serialization/BsonClassMap.cs

@@ -1268,13 +1268,13 @@ private Func<object> GetCreator()
                 }
                 else
                 {
-#if NET45
+#if NETSTANDARD16
+                    var message = $"Type '{_classType.GetType().Name}' does not have a default constructor.";
+                    throw new BsonSerializationException(message);
+#else
                     // lambdaExpression = () => FormatterServices.GetUninitializedObject(classType)
                     var getUnitializedObjectMethodInfo = typeof(FormatterServices).GetMethod("GetUninitializedObject", BindingFlags.Public | BindingFlags.Static);
                     body = Expression.Call(getUnitializedObjectMethodInfo, Expression.Constant(_classType));
-#else
-                    var message = $"Type '{_classType.GetType().Name}' does not have a default constructor.";
-                    throw new BsonSerializationException(message);
 #endif
                 }
                 var lambdaExpression = Expression.Lambda<Func<object>>(body);
@@ -1537,9 +1537,7 @@ public void UnmapProperty<TMember>(Expression<Func<TClass, TMember>> propertyLam
         // private static methods
         private static MethodInfo[] GetPropertyAccessors(PropertyInfo propertyInfo)
         {
-#if NET45
-            return propertyInfo.GetAccessors(true);
-#else
+#if NETSTANDARD16
             var accessors = new List<MethodInfo>();
             if (propertyInfo.GetMethod != null)
             {
@@ -1550,6 +1548,8 @@ private static MethodInfo[] GetPropertyAccessors(PropertyInfo propertyInfo)
                 accessors.Add(propertyInfo.SetMethod);
             }
             return accessors.ToArray();
+#else
+            return propertyInfo.GetAccessors(true);
 #endif
         }
 
@@ -1593,7 +1593,7 @@ private static PropertyInfo FindPropertyImplementation(PropertyInfo interfacePro
         {
             var interfaceType = interfacePropertyInfo.DeclaringType;
 
-#if NETCORE
+#if NETSTANDARD16
             var actualTypeInfo = actualType.GetTypeInfo();
             var bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public;
             var actualTypePropertyInfos = actualTypeInfo.GetMembers(bindingFlags).OfType<PropertyInfo>();

src/MongoDB.Bson/Serialization/BsonSerializer.cs

@@ -691,10 +691,10 @@ internal static void EnsureKnownTypesAreRegistered(Type nominalType)
                 if (!__typesWithRegisteredKnownTypes.Contains(nominalType))
                 {
                     // only call LookupClassMap for classes with a BsonKnownTypesAttribute
-#if NET45
-                    var knownTypesAttribute = nominalType.GetTypeInfo().GetCustomAttributes(typeof(BsonKnownTypesAttribute), false);
-#else
+#if NETSTANDARD16
                     var knownTypesAttribute = nominalType.GetTypeInfo().GetCustomAttributes(typeof(BsonKnownTypesAttribute), false).ToArray();
+#else
+                    var knownTypesAttribute = nominalType.GetTypeInfo().GetCustomAttributes(typeof(BsonKnownTypesAttribute), false);
 #endif
                     if (knownTypesAttribute != null && knownTypesAttribute.Length > 0)
                     {

src/MongoDB.Bson/Serialization/IdGenerators/AscendingGuidGenerator.cs

@@ -141,10 +141,10 @@ public bool IsEmpty(object id)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static int GetCurrentProcessId()
         {
-#if NET45
-            return Process.GetCurrentProcess().Id;
-#else
+#if NETSTANDARD16
             return 1;
+#else
+            return Process.GetCurrentProcess().Id;
 #endif
         }
 
@@ -158,10 +158,10 @@ private static byte[] GetMachineHash()
 
         private static string GetMachineName()
         {
-#if NET45
-            return Environment.MachineName;
-#else
+#if NETSTANDARD16
             return Environment.GetEnvironmentVariable("COMPUTERNAME") ?? "";
+#else
+            return Environment.MachineName;
 #endif
         }
     }

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

@@ -73,14 +73,14 @@ protected override CultureInfo DeserializeValue(BsonDeserializationContext conte
                             case Flags.UseUserOverride: useUserOverride = _booleanSerializer.Deserialize(context); break;
                         }
                     });
-#if NET45
-                    return new CultureInfo(name, useUserOverride);
-#else
+#if NETSTANDARD16
                     if (!useUserOverride)
                     {
                         throw new FormatException("CultureInfo does not support useUserOverride on this version of the .NET Framework.");
                     }
                     return new CultureInfo(name);
+#else
+                    return new CultureInfo(name, useUserOverride);
 #endif
 
                 case BsonType.String:
@@ -101,10 +101,10 @@ protected override void SerializeValue(BsonSerializationContext context, BsonSer
         {
             var bsonWriter = context.Writer;
 
-#if NET45
-            var useUserOverride = value.UseUserOverride;
-#else
+#if NETSTANDARD16
             var useUserOverride = true;
+#else
+            var useUserOverride = value.UseUserOverride;
 #endif
 
             if (useUserOverride)

src/MongoDB.Driver.Core.NetCore/project.json

@@ -19,7 +19,7 @@
         "compile": {
           "include": [ "../MongoDB.Driver.Core/**/*.cs", "../MongoDB.Shared/Hasher.cs" ]
         },
-        "define": [ "DEBUG", "TRACE", "NETCORE" ]
+        "define": [ "DEBUG", "TRACE", "NETSTANDARD16" ]
       }
     }
   }