Small improvements and fix

Author: papafe

evergreen/evergreen.yml

@@ -1169,15 +1169,6 @@ tasks:
           vars:
             FRAMEWORK: net60
 
-#//TODO need to do the same with the other platforms
-    - name: test-socks5-proxy-net60
-      commands:
-        - func: bootstrap-mongo-orchestration
-        - func: setup-socks5-proxy
-        - func: run-socks5-proxy-tests
-          vars:
-            FRAMEWORK: net60
-
     - name: test-csfle-with-mocked-kms-tls-net472
       commands:
         - func: setup-csfle-secrets
@@ -1254,6 +1245,30 @@ tasks:
           vars:
             FRAMEWORK: net60
 
+    - name: test-socks5-proxy-net472
+      commands:
+        - func: bootstrap-mongo-orchestration
+        - func: setup-socks5-proxy
+        - func: run-socks5-proxy-tests
+          vars:
+            FRAMEWORK: net472
+
+    - name: test-socks5-proxy-netstandard21
+      commands:
+        - func: bootstrap-mongo-orchestration
+        - func: setup-socks5-proxy
+        - func: run-socks5-proxy-tests
+          vars:
+            FRAMEWORK: netstandard21
+
+    - name: test-socks5-proxy-net60
+      commands:
+        - func: bootstrap-mongo-orchestration
+        - func: setup-socks5-proxy
+        - func: run-socks5-proxy-tests
+          vars:
+            FRAMEWORK: net60
+
     - name: plain-auth-tests
       commands:
         - func: run-plain-auth-tests
@@ -2594,13 +2609,27 @@ buildvariants:
     - name: atlas-search-index-helpers-task-group
 
 # Socks5 Proxy tests
-# //TODO I don't think we need to do this tests with more than one version, right?
-# //TODO Do we need to run it also on other OSes? Java does only linux
 
-- matrix_name: "socks5-proxy-tests"
+- matrix_name: "socks5-proxy-tests-linux"
   matrix_spec: { os: "ubuntu-2004", ssl: ["nossl", "ssl"], version: ["latest"], topology: ["replicaset"] }
   display_name: "Socks5 Proxy ${version} ${os} ${ssl}"
   tasks:
+    - name: test-socks5-proxy-netstandard21
+    - name: test-socks5-proxy-net60
+
+- matrix_name: "socks5-proxy-tests-windows"
+  matrix_spec: { os: "windows-64", ssl: ["nossl", "ssl"], version: ["latest"], topology: ["replicaset"] }
+  display_name: "Socks5 Proxy ${version} ${os} ${ssl}"
+  tasks:
+    - name: test-socks5-proxy-net472
+    - name: test-socks5-proxy-netstandard21
+    - name: test-socks5-proxy-net60
+
+- matrix_name: "socks5-proxy-tests-macos"
+  matrix_spec: { os: "macos-14", ssl: ["nossl", "ssl"], version: ["latest"], topology: ["replicaset"] }
+  display_name: "Socks5 Proxy ${version} ${os} ${ssl}"
+  tasks:
+    - name: test-socks5-proxy-netstandard21
     - name: test-socks5-proxy-net60
 
 # CSFLE tests

tests/MongoDB.Driver.Tests/ClusterRegistryTests.cs

@@ -142,6 +142,7 @@ public void GetOrCreateCluster_should_return_a_cluster_with_the_correct_settings
                 serverMonitoringMode: ServerMonitoringMode.Stream,
                 serverSelectionTimeout: TimeSpan.FromSeconds(11),
                 socketTimeout: TimeSpan.FromSeconds(12),
+                socks5ProxySettings: null,
                 srvMaxHosts: 0,
                 srvServiceName: "mongodb",
                 sslSettings: sslSettings,