CSHARP-4904: Add .NET 6 target framework (#1445)

Author: BorisDog

evergreen/evergreen.yml

@@ -1156,6 +1156,13 @@ tasks:
           vars:
             FRAMEWORK: netstandard21
 
+    - name: test-net60
+      commands:
+        - func: bootstrap-mongo-orchestration
+        - func: run-tests
+          vars:
+            FRAMEWORK: net60
+
     - name: test-csfle-with-mongocryptd-net472
       commands:
         - func: bootstrap-mongo-orchestration
@@ -1170,6 +1177,13 @@ tasks:
           vars:
             FRAMEWORK: netstandard21
 
+    - name: test-csfle-with-mongocryptd-net60
+      commands:
+        - func: bootstrap-mongo-orchestration
+        - func: run-csfle-with-mongocryptd-tests
+          vars:
+            FRAMEWORK: net60
+
     - name: test-csfle-with-mocked-kms-tls-net472
       commands:
         - func: start-kms-mock-servers
@@ -1192,6 +1206,17 @@ tasks:
           vars:
             FRAMEWORK: netstandard21
 
+    - name: test-csfle-with-mocked-kms-tls-net60
+      commands:
+        - func: start-kms-mock-servers
+        - func: start-kms-mock-kmip-server
+        - func: start-kms-mock-gcp-server
+        - func: start-kms-mock-azure-imds-server
+        - func: bootstrap-mongo-orchestration
+        - func: run-csfle-with-mocked-kms-tests
+          vars:
+            FRAMEWORK: net60
+
     - name: test-load-balancer-netstandard21
       commands:
         - func: bootstrap-mongo-orchestration
@@ -1203,6 +1228,17 @@ tasks:
             FRAMEWORK: netstandard21
         - func: stop-load-balancer
 
+    - name: test-load-balancer-net60
+      commands:
+        - func: bootstrap-mongo-orchestration
+          vars:
+            LOAD_BALANCER: 'true'
+        - func: run-load-balancer
+        - func: run-load-balancer-tests
+          vars:
+            FRAMEWORK: net60
+        - func: stop-load-balancer
+
     - name: atlas-connectivity-tests
       commands:
         - func: assume-ec2-role
@@ -1224,6 +1260,12 @@ tasks:
           vars:
             FRAMEWORK: netstandard21
 
+    - name: test-gssapi-net60
+      commands:
+        - func: run-gssapi-auth-tests
+          vars:
+            FRAMEWORK: net60
+
     - name: plain-auth-tests
       commands:
         - func: run-plain-auth-tests
@@ -1266,6 +1308,16 @@ tasks:
             FRAMEWORK: netstandard21
             REQUIRE_API_VERSION: true
 
+    - name: stable-api-tests-net60
+      commands:
+        - func: bootstrap-mongo-orchestration
+          vars:
+            REQUIRE_API_VERSION: true
+        - func: run-tests
+          vars:
+            FRAMEWORK: net60
+            REQUIRE_API_VERSION: true
+
     - name: atlas-data-lake-test
       commands:
         - func: bootstrap-mongohoused
@@ -2028,6 +2080,10 @@ axes:
         display_name: netstandard21
         variables:
           FRAMEWORK: netstandard21
+      - id: "net60"
+        display_name: net60
+        variables:
+          FRAMEWORK: net60
 
   - id: serverless
     display_name: Serverless
@@ -2321,6 +2377,7 @@ buildvariants:
   tasks:
     - name: stable-api-tests-net472
     - name: stable-api-tests-netstandard21
+    - name: stable-api-tests-net60
 
 # Secure tests
 - matrix_name: "secure-tests-windows"
@@ -2330,27 +2387,31 @@ buildvariants:
   tasks:
     - name: test-net472
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "secure-tests-macOS"
   matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-14", "macos-14-arm64"] }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "secure-tests-linux-1804"
   matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "secure-tests-linux-2004"
   matrix_spec: { version: ["7.0", "8.0", "rapid", "latest"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-2004" }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60    
 
 # Unsecure tests
 - matrix_name: "unsecure-tests-windows"
@@ -2360,27 +2421,31 @@ buildvariants:
   tasks:
     - name: test-net472
     - name: test-netstandard21
+    - name: test-net60    
 
 - matrix_name: "unsecure-tests-macOS"
   matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-14", "macos-14-arm64"] }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "unsecure-tests-linux-1804"
   matrix_spec: { version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-1804" }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "unsecure-tests-linux-2004"
   matrix_spec: { version: ["7.0", "8.0", "rapid", "latest"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-2004" }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 # Compression tests
 - matrix_name: "tests-compression-windows"
@@ -2390,27 +2455,31 @@ buildvariants:
   tasks:
     - name: test-net472
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "tests-compression-macOS"
   matrix_spec: { compressor : ["snappy", "zstandard"], auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: "standalone", os: ["macos-14", "macos-14-arm64"] }
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "tests-compression-linux-1804"
   matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["4.0", "4.2", "4.4", "5.0", "6.0"], topology: "standalone", os: "ubuntu-1804" }
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 - matrix_name: "tests-compression-linux-2004"
   matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["7.0", "8.0", "rapid", "latest"], topology: "standalone", os: "ubuntu-2004" }
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
   tags: ["tests-variant"]
   tasks:
     - name: test-netstandard21
+    - name: test-net60
 
 # Auth tests
 - matrix_name: plain-auth-tests
@@ -2474,37 +2543,41 @@ buildvariants:
   tasks:
     - name: test-gssapi-net472
     - name: test-gssapi-netstandard21
+    - name: test-gssapi-net60
 
 - name: gssapi-auth-tests-linux
   run_on:
     - ubuntu1804-test
   display_name: "GSSAPI (Kerberos) Auth tests - Linux"
   tasks:
     - name: test-gssapi-netstandard21
+    - name: test-gssapi-net60
 
 # Load balancer tests
 - matrix_name: load-balancer-tests
   matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], auth: "noauth", ssl: "nossl", topology: "sharded-cluster", os: "ubuntu-2004" }
   display_name: "Load Balancer ${version} ${auth} ${ssl} ${os}"
   tasks:
     - name: "test-load-balancer-netstandard21"
+    - name: "test-load-balancer-net60"
 
 - matrix_name: load-balancer-tests-secure
   matrix_spec: { version: ["5.0", "6.0", "7.0", "8.0", "rapid", "latest"], auth: "auth", ssl: "ssl", topology: "sharded-cluster", os: "ubuntu-2004" }
   display_name: "Load Balancer ${version} ${auth} ${ssl} ${os}"
   tasks:
     - name: "test-load-balancer-netstandard21"
+    - name: "test-load-balancer-net60"
 
 # Serverless tests
 - matrix_name: serverless-tests-windows
-  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: ["net472", "netstandard21"], serverless: "*" }
+  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: ["net472", "netstandard21", "net60"], serverless: "*" }
   display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
   batchtime: 10080  # 7 days
   tasks:
     - name: serverless-task-group
 
 - matrix_name: serverless-tests-ubuntu
-  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-2004", target_framework: ["netstandard21"], serverless: "*" }
+  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-2004", target_framework: ["netstandard21", "net60"], serverless: "*" }
   display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
   batchtime: 10080  # 7 days
   tasks:
@@ -2562,29 +2635,37 @@ buildvariants:
   tasks:
     - name: test-csfle-with-mocked-kms-tls-net472
     - name: test-csfle-with-mocked-kms-tls-netstandard21
+    - name: test-csfle-with-mocked-kms-tls-net60
     - name: test-csfle-with-mongocryptd-net472
     - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-net60
 
 - matrix_name: "csfle-with-mocked-kms-tests-linux-1804"
   matrix_spec: { os: "ubuntu-1804", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0"], topology: ["replicaset"] }
   display_name: "CSFLE Mocked KMS ${version} ${os}"
   tasks:
     - name: test-csfle-with-mocked-kms-tls-netstandard21
+    - name: test-csfle-with-mocked-kms-tls-net60
     - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-net60
 
 - matrix_name: "csfle-with-mocked-kms-tests-linux-2004"
   matrix_spec: { os: "ubuntu-2004", ssl: "nossl", version: ["7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] }
   display_name: "CSFLE Mocked KMS ${version} ${os}"
   tasks:
     - name: test-csfle-with-mocked-kms-tls-netstandard21
+    - name: test-csfle-with-mocked-kms-tls-net60
     - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-net60
 
 - matrix_name: "csfle-with-mocked-kms-tests-macOS"
   matrix_spec: { os: ["macos-14", "macos-14-arm64"], ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] }
   display_name: "CSFLE Mocked KMS ${version} ${os}"
   tasks:
     - name: test-csfle-with-mocked-kms-tls-netstandard21
+    - name: test-csfle-with-mocked-kms-tls-net60
     - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-net60
 
 - matrix_name: "csfle-with-azure-kms-tests-linux"
   matrix_spec: { ssl: "nossl", os: "ubuntu-1804" }
@@ -2593,6 +2674,7 @@ buildvariants:
   tasks:
     - name: testazurekms-task-group
     - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-net60
 
 - matrix_name: "csfle-with-gcp-kms-tests-linux"
   matrix_spec: { ssl: "nossl", os: "ubuntu-1804" }
@@ -2601,6 +2683,7 @@ buildvariants:
   tasks:
     - name: testgcpkms-task-group
     - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-net60
 
 # Smoke tests
 - matrix_name: "smoke-tests-windows"

src/Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net472;net6.0</TargetFrameworks>
     <LangVersion>10.0</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>..\..\MongoDB.ruleset</CodeAnalysisRuleSet>

src/MongoDB.Bson/IO/BsonBinaryReader.cs

@@ -25,7 +25,9 @@ namespace MongoDB.Bson.IO
     public class BsonBinaryReader : BsonReader
     {
         // private fields
+#pragma warning disable CA2213 // Disposable never disposed
         private readonly Stream _baseStream;
+#pragma warning restore CA2213 // Disposable never disposed
         private readonly BsonStream _bsonStream;
         private BsonBinaryReaderContext _context;
 

src/MongoDB.Bson/IO/BsonBinaryWriter.cs

@@ -25,7 +25,9 @@ namespace MongoDB.Bson.IO
     public class BsonBinaryWriter : BsonWriter
     {
         // private fields
+#pragma warning disable CA2213 // Disposable never disposed
         private readonly Stream _baseStream;
+#pragma warning restore CA2213 // Disposable never disposed
         private readonly BsonStream _bsonStream;
         private BsonBinaryWriterContext _context;
 

src/MongoDB.Bson/IO/JsonWriter.cs

@@ -27,7 +27,9 @@ namespace MongoDB.Bson.IO
     public class JsonWriter : BsonWriter
     {
         // private fields
-        private TextWriter _textWriter;
+#pragma warning disable CA2213 // Disposable never disposed
+        private readonly TextWriter _textWriter;
+#pragma warning restore CA2213 // Disposable never disposed
         private JsonWriterContext _context;
 
         // constructors

src/MongoDB.Bson/TargetFramework.cs

@@ -22,6 +22,8 @@ internal static class TargetFramework
             "net472";
 #elif NETSTANDARD2_1
             "netstandard21";
+#elif NET6_0
+            "net60";
 #endif
     }
 }

src/MongoDB.Driver/Authentication/Oidc/FileOidcCallback.cs

@@ -45,7 +45,7 @@ public OidcAccessToken GetOidcAccessToken(OidcCallbackParameters parameters, Can
 
         public async Task<OidcAccessToken> GetOidcAccessTokenAsync(OidcCallbackParameters parameters, CancellationToken cancellationToken)
         {
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
             var accessToken = await File.ReadAllTextAsync(_path, cancellationToken).ConfigureAwait(false);
 #else
             using var streamReader = new StreamReader(_path, System.Text.Encoding.UTF8, detectEncodingFromByteOrderMarks: true);

src/MongoDB.Driver/Authentication/Oidc/HttpRequestOidcCallback.cs

@@ -50,7 +50,9 @@ private HttpWebRequest CreateRequest(OidcCallbackParameters parameters)
         {
             var metadataInfo = GetHttpRequestParams(parameters);
 
+#pragma warning disable SYSLIB0014 // Type or member is obsolete
             var request = WebRequest.CreateHttp(metadataInfo.Uri);
+#pragma warning restore SYSLIB0014 // Type or member is obsolete
             request.Method = "GET";
             foreach (var header in metadataInfo.headers)
             {

src/MongoDB.Driver/Authentication/ScramSha/ScramCache.cs

@@ -15,6 +15,7 @@
 
 using System.Linq;
 using System.Security;
+using MongoDB.Driver.Core.Misc;
 using MongoDB.Shared;
 
 namespace MongoDB.Driver.Authentication.ScramSha

src/MongoDB.Driver/Authentication/ScramSha/ScramSha1Algorithm.cs

@@ -41,7 +41,11 @@ public byte[] Hi(UsernamePasswordCredential credential, byte[] salt, int iterati
 
         public byte[] Hmac(UTF8Encoding encoding, byte[] data, string key)
         {
+#if NET6_0_OR_GREATER
+            using (var hmac = new HMACSHA1(data))
+#else
             using (var hmac = new HMACSHA1(data, useManagedSha1: true))
+#endif
             {
                 return hmac.ComputeHash(encoding.GetBytes(key));
             }