EF-73: Add more EF Core metadata to Client Metadata Handshake (#1222)

Author: sanych-sun

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

@@ -63,22 +63,23 @@ internal static BsonDocument CreateClientDocument(string applicationName, BsonDo
         internal static BsonDocument CreateDriverDocument()
         {
             var assembly = typeof(ConnectionInitializer).GetTypeInfo().Assembly;
-            var fileVersionAttribute = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>();
-            var driverVersion = fileVersionAttribute.Version;
+            var driverVersion = GetAssemblyVersion(assembly);
 
             return CreateDriverDocument(driverVersion);
         }
 
         internal static BsonDocument CreateDriverDocument(string driverVersion)
         {
             var driverName = "mongo-csharp-driver";
-            if (TryGetType("MongoDB.Driver.MongoServer, MongoDB.Driver.Legacy"))
+            if (TryGetType("MongoDB.Driver.MongoServer, MongoDB.Driver.Legacy", out _))
             {
                 driverName = $"{driverName}|legacy";
             }
 
-            if (TryGetType("MongoDB.EntityFrameworkCore.Query.MongoQueryContext, MongoDB.EntityFrameworkCore"))
+            if (TryGetType("MongoDB.EntityFrameworkCore.Query.MongoQueryContext, MongoDB.EntityFrameworkCore", out var queryContextType))
             {
+                var efVersion = GetAssemblyVersion(queryContextType.Assembly);
+                driverVersion = $"{driverVersion}|{efVersion}";
                 driverName = $"{driverName}|efcore";
             }
 
@@ -183,7 +184,7 @@ internal static BsonDocument CreateOSDocument()
             string architecture;
             string osVersion;
 
-            if (TryGetType("Mono.Runtime"))
+            if (TryGetType("Mono.Runtime", out _))
             {
                 switch (Environment.OSVersion.Platform)
                 {
@@ -372,19 +373,33 @@ internal static BsonDocument RemoveOptionalFieldsUntilDocumentIsLessThan512Bytes
             return clientDocument;
         }
 
-        private static bool TryGetType(string typeName)
+        private static bool TryGetType(string typeName, out Type type)
         {
             try
             {
-                var type = Type.GetType(typeName);
+                type = Type.GetType(typeName);
                 return type != null;
             }
             catch
             {
                 // ignore any exceptions here.
+                type = null;
                 return false;
             }
         }
+
+        private static string GetAssemblyVersion(Assembly assembly)
+        {
+            var versionAttribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+            var hashIndex = versionAttribute.InformationalVersion.IndexOf('+');
+            if (hashIndex == -1)
+            {
+                return versionAttribute.InformationalVersion;
+            }
+
+            return versionAttribute.InformationalVersion.Substring(0, hashIndex);
+        }
+
         #endregion
     }
 }