merge 2.23.1

Etherna · Dec 16, 2023 · 8230872 · 8230872
2 parents 834147b + f41c21e
commit 8230872
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/Release Notes/Release Notes v2.23.0.md b/Release Notes/Release Notes v2.23.0.md
@@ -0,0 +1,18 @@
+# .NET Driver Version 2.23.0 Release Notes
+
+This is the general availability release for the 2.23.0 version of the driver.
+
+The main new features in 2.23.0 include:
+
+* General driver bug fixes and improvements
+* Support for bitwise operators in aggregation pipeline - [CSHARP-4486](https://jira.mongodb.org/browse/CSHARP-4486)
+* Support for $out to Time-series collections - [CSHARP-4706](https://jira.mongodb.org/browse/CSHARP-4706)
+* [ChangeStreamSplitLargeEvent](https://www.mongodb.com/docs/manual/reference/operator/aggregation/changeStreamSplitLargeEvent/) aggregation stage added - [CSHARP-4633](https://jira.mongodb.org/browse/CSHARP-4633)
+* LINQ3 bug fixes and improvements
+* Additional logging messages
+
+An online version of these release notes is available [here](https://github.com/mongodb/mongo-csharp-driver/blob/master/Release%20Notes/Release%20Notes%20v2.23.0.md).
+
+The full list of issues resolved in this release is available at [CSHARP JIRA project](https://jira.mongodb.org/issues/?jql=project%20%3D%20CSHARP%20AND%20fixVersion%20%3D%202.23.0%20ORDER%20BY%20key%20ASC).
+
+Documentation on the .NET driver can be found [here](https://www.mongodb.com/docs/drivers/csharp/v2.23.0/).
diff --git a/apidocs/docfx.json b/apidocs/docfx.json
@@ -19,7 +19,7 @@
             "disableDefaultFilter": false,
             "noRestore": false,
             "namespaceLayout": "flattened",
-            "memberLayout": "samePage",
+            "memberLayout": "separatePages",
             "EnumSortOrder": "declaringOrder",
             "allowCompilationErrors": false
         },
@@ -43,7 +43,7 @@
             "disableDefaultFilter": false,
             "noRestore": false,
             "namespaceLayout": "flattened",
-            "memberLayout": "samePage",
+            "memberLayout": "separatePages",
             "EnumSortOrder": "declaringOrder",
             "allowCompilationErrors": false
         },
@@ -66,7 +66,7 @@
             "disableDefaultFilter": false,
             "noRestore": false,
             "namespaceLayout": "flattened",
-            "memberLayout": "samePage",
+            "memberLayout": "separatePages",
             "EnumSortOrder": "declaringOrder",
             "allowCompilationErrors": false
         },
@@ -89,7 +89,7 @@
             "disableDefaultFilter": false,
             "noRestore": false,
             "namespaceLayout": "flattened",
-            "memberLayout": "samePage",
+            "memberLayout": "separatePages",
             "EnumSortOrder": "declaringOrder",
             "allowCompilationErrors": false
         }

diff --git a/src/MongoDB.Driver.Core/Core/Clusters/ClusterFactory.cs b/src/MongoDB.Driver.Core/Core/Clusters/ClusterFactory.cs
@@ -110,6 +110,11 @@ private LoadBalancedCluster CreateLoadBalancedCluster(ClusterSettings setting)
 
         private void ProcessClusterEnvironment(ClusterSettings settings)
         {
+            if (_loggerFactory == null)
+            {
+                return;
+            }
+
             foreach (var (host, _) in  settings.EndPoints.Select(EndPointHelper.GetHostAndPort))
             {
                 if (LogIfCosmosDB(host) || LogIfDocumentDB(host))
@@ -129,7 +134,7 @@ bool LogIfExternalEnvironment(string host, string environment, string documentat
                 if (suffixes.Any(s => host.EndsWith(s, StringComparison.InvariantCultureIgnoreCase)))
                 {
                     var logger = _loggerFactory.CreateLogger<LogCategories.Client>();
-                    logger.LogInformation("You appear to be connected to a {environment} cluster. For more information regarding feature compatibility and support please visit {url}", environment, documentationUrl);
+                    logger?.LogInformation("You appear to be connected to a {environment} cluster. For more information regarding feature compatibility and support please visit {url}", environment, documentationUrl);
 
                     return true;
                 }