CSHARP-4916: Remove .netstandard 2.0 support (#1443)

Author: BorisDog

build.cake

@@ -140,7 +140,6 @@ Task("Test")
     .DeferOnError();
 
 Task("TestNet472").IsDependentOn("Test");
-Task("TestNetStandard20").IsDependentOn("Test");
 Task("TestNetStandard21").IsDependentOn("Test");
 Task("TestNet60").IsDependentOn("Test");
 
@@ -200,7 +199,6 @@ Task("TestGssapi")
            RunTests(buildConfig, testProject, filter: "Category=\"GssapiMechanism\""));
 
 Task("TestGssapiNet472").IsDependentOn("TestGssapi");
-Task("TestGssapiNetStandard20").IsDependentOn("TestGssapi");
 Task("TestGssapiNetStandard21").IsDependentOn("TestGssapi");
 Task("TestGssapiNet60").IsDependentOn("TestGssapi");
 
@@ -219,7 +217,6 @@ Task("TestServerless")
             RunTests(buildConfig, testProject, filter: "Category=\"Serverless\""));
 
 Task("TestServerlessNet472").IsDependentOn("TestServerless");
-Task("TestServerlessNetStandard20").IsDependentOn("TestServerless");
 Task("TestServerlessNetStandard21").IsDependentOn("TestServerless");
 Task("TestServerlessNet60").IsDependentOn("TestServerless");
 
@@ -230,7 +227,6 @@ Task("TestLoadBalanced")
         action: (BuildConfig buildConfig, Path testProject) =>
             RunTests(buildConfig, testProject, filter: "Category=\"SupportLoadBalancing\""));
 
-Task("TestLoadBalancedNetStandard20").IsDependentOn("TestLoadBalanced");
 Task("TestLoadBalancedNetStandard21").IsDependentOn("TestLoadBalanced");
 Task("TestLoadBalancedNet60").IsDependentOn("TestLoadBalanced");
 
@@ -242,7 +238,6 @@ Task("TestCsfleWithMockedKms")
             RunTests(buildConfig, testProject, filter: "Category=\"CSFLE\""));
 
 Task("TestCsfleWithMockedKmsNet472").IsDependentOn("TestCsfleWithMockedKms");
-Task("TestCsfleWithMockedKmsNetStandard20").IsDependentOn("TestCsfleWithMockedKms");
 Task("TestCsfleWithMockedKmsNetStandard21").IsDependentOn("TestCsfleWithMockedKms");
 Task("TestCsfleWithMockedKmsNet60").IsDependentOn("TestCsfleWithMockedKms");
 
@@ -254,7 +249,6 @@ Task("TestCsfleWithMongocryptd")
             RunTests(buildConfig, testProject, filter: "Category=\"CSFLE\""));
 
 Task("TestCsfleWithMongocryptdNet472").IsDependentOn("TestCsfleWithMongocryptd");
-Task("TestCsfleWithMongocryptdNetStandard20").IsDependentOn("TestCsfleWithMongocryptd");
 Task("TestCsfleWithMongocryptdNetStandard21").IsDependentOn("TestCsfleWithMongocryptd");
 Task("TestCsfleWithMongocryptdNet60").IsDependentOn("TestCsfleWithMongocryptd");
 
@@ -602,7 +596,6 @@ Setup<BuildConfig>(
         var framework = targetPlatform == "arm64" ? "net6.0" : lowerTarget switch
         {
             string s when s.EndsWith("net472") => "net472",
-            string s when s.EndsWith("netstandard20") || s.EndsWith("netcoreapp21") => "netcoreapp2.1",
             string s when s.EndsWith("netstandard21") || s.EndsWith("netcoreapp31") => "netcoreapp3.1",
             string s when s.EndsWith("net472") => "net472",
             string s when s.EndsWith("net50") => "net5.0",

evergreen/evergreen.yml

@@ -1149,13 +1149,6 @@ tasks:
           vars:
             FRAMEWORK: net472
 
-    - name: test-netstandard20
-      commands:
-        - func: bootstrap-mongo-orchestration
-        - func: run-tests
-          vars:
-            FRAMEWORK: netstandard20
-
     - name: test-netstandard21
       commands:
         - func: bootstrap-mongo-orchestration
@@ -1170,13 +1163,6 @@ tasks:
           vars:
             FRAMEWORK: net472
 
-    - name: test-csfle-with-mongocryptd-netstandard20
-      commands:
-        - func: bootstrap-mongo-orchestration
-        - func: run-csfle-with-mongocryptd-tests
-          vars:
-            FRAMEWORK: netstandard20
-
     - name: test-csfle-with-mongocryptd-netstandard21
       commands:
         - func: bootstrap-mongo-orchestration
@@ -1195,17 +1181,6 @@ tasks:
           vars:
             FRAMEWORK: net472
 
-    - name: test-csfle-with-mocked-kms-tls-netstandard20
-      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: netstandard20
-
     - name: test-csfle-with-mocked-kms-tls-netstandard21
       commands:
         - func: start-kms-mock-servers
@@ -1217,17 +1192,6 @@ tasks:
           vars:
             FRAMEWORK: netstandard21
 
-    - name: test-load-balancer-netstandard20
-      commands:
-        - func: bootstrap-mongo-orchestration
-          vars:
-            LOAD_BALANCER: 'true'
-        - func: run-load-balancer
-        - func: run-load-balancer-tests
-          vars:
-            FRAMEWORK: netstandard20
-        - func: stop-load-balancer
-
     - name: test-load-balancer-netstandard21
       commands:
         - func: bootstrap-mongo-orchestration
@@ -1254,12 +1218,6 @@ tasks:
           vars:
             FRAMEWORK: net472
 
-    - name: test-gssapi-netstandard20
-      commands:
-        - func: run-gssapi-auth-tests
-          vars:
-            FRAMEWORK: netstandard20
-
     - name: test-gssapi-netstandard21
       commands:
         - func: run-gssapi-auth-tests
@@ -1298,16 +1256,6 @@ tasks:
             FRAMEWORK: net472
             REQUIRE_API_VERSION: true
 
-    - name: stable-api-tests-netstandard20
-      commands:
-        - func: bootstrap-mongo-orchestration
-          vars:
-            REQUIRE_API_VERSION: true
-        - func: run-tests
-          vars:
-            FRAMEWORK: netstandard20
-            REQUIRE_API_VERSION: true
-
     - name: stable-api-tests-netstandard21
       commands:
         - func: bootstrap-mongo-orchestration
@@ -2083,10 +2031,6 @@ axes:
         display_name: net472
         variables:
           FRAMEWORK: net472
-      - id: "netstandard20"
-        display_name: netstandard20
-        variables:
-          FRAMEWORK: netstandard20
       - id: "netstandard21"
         display_name: netstandard21
         variables:
@@ -2393,7 +2337,6 @@ buildvariants:
   tags: ["tests-variant"]
   tasks:
     - name: test-net472
-    - name: test-netstandard20
     - name: test-netstandard21
 
 - matrix_name: "secure-tests-macOS"
@@ -2408,15 +2351,13 @@ buildvariants:
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
-    - name: test-netstandard20
     - name: test-netstandard21
 
 - 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-netstandard20
     - name: test-netstandard21
 
 # Unsecure tests
@@ -2426,7 +2367,6 @@ buildvariants:
   tags: ["tests-variant"]
   tasks:
     - name: test-net472
-    - name: test-netstandard20
     - name: test-netstandard21
 
 - matrix_name: "unsecure-tests-macOS"
@@ -2441,15 +2381,13 @@ buildvariants:
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
-    - name: test-netstandard20
     - name: test-netstandard21
 
 - 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-netstandard20
     - name: test-netstandard21
 
 # Compression tests
@@ -2459,7 +2397,6 @@ buildvariants:
   tags: ["tests-variant"]
   tasks:
     - name: test-net472
-    - name: test-netstandard20
     - name: test-netstandard21
 
 - matrix_name: "tests-compression-macOS"
@@ -2474,15 +2411,13 @@ buildvariants:
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
   tags: ["tests-variant"]
   tasks:
-    - name: test-netstandard20
     - name: test-netstandard21
 
 - 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-netstandard20
     - name: test-netstandard21
 
 # Auth tests
@@ -2546,42 +2481,38 @@ buildvariants:
   display_name: "GSSAPI (Kerberos) Auth tests - Windows"
   tasks:
     - name: test-gssapi-net472
-    - name: test-gssapi-netstandard20
     - name: test-gssapi-netstandard21
 
 - name: gssapi-auth-tests-linux
   run_on:
     - ubuntu1804-test
   display_name: "GSSAPI (Kerberos) Auth tests - Linux"
   tasks:
-    - name: test-gssapi-netstandard20
     - name: test-gssapi-netstandard21
 
 # 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-netstandard20"
     - name: "test-load-balancer-netstandard21"
 
 - 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-netstandard20"
     - name: "test-load-balancer-netstandard21"
 
 # Serverless tests
 - matrix_name: serverless-tests-windows
-  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: ["net472", "netstandard20", "netstandard21"], serverless: "*" }
+  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: ["net472", "netstandard21"], 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: ["netstandard20", "netstandard21"], serverless: "*" }
+  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-2004", target_framework: ["netstandard21"], serverless: "*" }
   display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
   batchtime: 10080  # 7 days
   tasks:
@@ -2638,28 +2569,22 @@ buildvariants:
   display_name: "CSFLE Mocked KMS ${version} ${os}"
   tasks:
     - name: test-csfle-with-mocked-kms-tls-net472
-    - name: test-csfle-with-mocked-kms-tls-netstandard20
     - name: test-csfle-with-mocked-kms-tls-netstandard21
     - name: test-csfle-with-mongocryptd-net472
-    - name: test-csfle-with-mongocryptd-netstandard20
     - name: test-csfle-with-mongocryptd-netstandard21
 
 - 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-netstandard20
     - name: test-csfle-with-mocked-kms-tls-netstandard21
-    - name: test-csfle-with-mongocryptd-netstandard20
     - name: test-csfle-with-mongocryptd-netstandard21
 
 - 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-netstandard20
     - name: test-csfle-with-mocked-kms-tls-netstandard21
-    - name: test-csfle-with-mongocryptd-netstandard20
     - name: test-csfle-with-mongocryptd-netstandard21
 
 - matrix_name: "csfle-with-mocked-kms-tests-macOS"

evergreen/run-tests.sh

@@ -14,7 +14,7 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #   OCSP_TLS_SHOULD_SUCCEED         Set to test OCSP. Values are true/false/nil
 #   MONGODB_X509_CLIENT_P12_PATH    Absolute path to client certificate in p12 format
 #   MONGO_X509_CLIENT_CERTIFICATE_PASSWORD  password for client certificate
-#   FRAMEWORK                       Set to specify .NET framework to test against. Values: "Net472", "NetStandard20", "NetStandard21",
+#   FRAMEWORK                       Set to specify .NET framework to test against. Values: "Net472", "NetStandard21",
 #   TARGET                          Set to specify a custom test target. Default: "nil"
 #
 # Environment variables produced as output:

src/Directory.Build.props

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

src/MongoDB.Bson/TargetFramework.cs

@@ -20,8 +20,6 @@ internal static class TargetFramework
         public static string Moniker =>
 #if NET472
             "net472";
-#elif NETSTANDARD2_0
-            "netstandard20";
 #elif NETSTANDARD2_1
             "netstandard21";
 #endif

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

@@ -13,13 +13,6 @@
  * limitations under the License.
  */
 
-// Use our vendored version of Rfc2898DeriveBytes for .NET Standard 2.0
-// because this target does not support a version of Rfc2898DeriveBytes that allows to specify the hash algorithm
-#if NETSTANDARD2_0
-using Rfc2898DeriveBytes = MongoDB.Driver.Authentication.Vendored.Rfc2898DeriveBytes;
-#else
-using Rfc2898DeriveBytes = System.Security.Cryptography.Rfc2898DeriveBytes;
-#endif
 using System.Security.Cryptography;
 using System.Text;
 

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

@@ -13,13 +13,6 @@
  * limitations under the License.
  */
 
-// Use our vendored version of Rfc2898DeriveBytes for .NET Standard 2.0
-// because this target does not support a version of Rfc2898DeriveBytes that allows to specify the hash algorithm
-#if NETSTANDARD2_0
-using Rfc2898DeriveBytes = MongoDB.Driver.Authentication.Vendored.Rfc2898DeriveBytes;
-#else
-using Rfc2898DeriveBytes = System.Security.Cryptography.Rfc2898DeriveBytes;
-#endif
 using System;
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;