CSHARP-4189: Upgraded build scripts and Cake to support Apple M1 including fixing failing tests. (#873)

Author: JamesKovacs

build.cake

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-CAKE_VERSION=1.3.0
-DOTNET_VERSION=5.0.401
+CAKE_VERSION=2.2.0
+DOTNET_VERSION=6.0.400

build.config

@@ -33,15 +33,19 @@ if [ "$DOTNET_VERSION" != "$DOTNET_INSTALLED_VERSION" ]; then
       mkdir "$SCRIPT_DIR/.dotnet"
     fi
     curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
-    # N.B. We explicitly install .NET Core 2.1 and 3.1 because .NET 5.0 SDK can build those TFMs
+    # N.B. We explicitly install .NET Core 2.1 and 3.1 because .NET 6.0 SDK can build those TFMs
     #      but will silently upgrade to a more recent runtime to execute tests if the desired runtime
     #      isn't available. For example, `dotnet run --framework netcoreapp3.0` will silently run
-    #      on .NET 5.0 if .NET Core 3.0 and 3.1 aren't installed.
+    #      on .NET 6.0 if .NET Core 3.0 and 3.1 aren't installed.
     #      This solution is admittedly hacky as .NET Core 2.1 and 3.1 won't be installed if
     #      $DOTNET_VERSION matches $DOTNET_INSTALLED_VERSION, but it minimizes the changes required
     #      to install required dependencies on Evergreen.
-    bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 2.1 --install-dir .dotnet --no-path
-    bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 3.1 --install-dir .dotnet --no-path
+    #      Since ARM64 support was first added in .NET 6.0, the following commands will install:
+    #      | CPU   | 2.1 | 3.1 | Latest |
+    #      | x64   | x64 | x64 |    x64 |
+    #      | arm64 | x64 | x64 |  arm64 |
+    bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 2.1 --architecture x64 --install-dir .dotnet --no-path
+    bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 3.1 --architecture x64 --install-dir .dotnet --no-path
     bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --install-dir .dotnet --no-path
     export PATH="$SCRIPT_DIR/.dotnet":$PATH
     export DOTNET_ROOT="$SCRIPT_DIR/.dotnet"

build.sh

@@ -13,7 +13,7 @@ stepback: true
 command_type: system
 
 # Protect ourself against rogue test case, or curl gone wild, that runs forever
-# 60 minutes: 20 minutes is a normal test run + up to 10 minutes for test setup + 15 minutes for longer macOS tests + 15 minutes for longer macOS 1015 tests
+# 60 minutes: 20 minutes is a normal test run + up to 10 minutes for test setup + 15 minutes for longer macOS tests + 15 minutes for longer macOS 1100 tests
 exec_timeout_secs: 3600
 
 # What to do when evergreen hits the timeout (`post:` tasks are run automatically)
@@ -930,7 +930,7 @@ tasks:
           vars:
             FRAMEWORK: netstandard20
         - func: stop-load-balancer
-        
+
     - name: test-load-balancer-netstandard21
       commands:
         - func: bootstrap-mongo-orchestration
@@ -1429,11 +1429,16 @@ axes:
         variables:
           OS: "ubuntu-1804"
         run_on: ubuntu1804-test
-      - id: "macos-1015"
-        display_name: "macOS 10.15"
+      - id: "macos-1100"
+        display_name: "macOS 11.00"
+        variables:
+          OS: "macos-1100"
+        run_on: macos-1100
+      - id: "macos-1100-arm64"
+        display_name: "macOS 11.00 M1"
         variables:
-          OS: "macos-1015"
-        run_on: macos-1015
+          OS: "macos-1100-arm64"
+        run_on: macos-1100-arm64
 
   - id: topology
     display_name: Topology
@@ -1505,10 +1510,10 @@ buildvariants:
     - ubuntu1804-test
   tasks:
     - name: compile
-- name: macos1015-compile
-  display_name: "macOS 10.15 compile"
+- name: macos1100-compile
+  display_name: "macOS 11.00 compile"
   run_on:
-    - macos-1015
+    - macos-1100
   tasks:
     - name: compile
 
@@ -1557,7 +1562,7 @@ buildvariants:
      - name: test-netstandard21
 
 - matrix_name: "tests-snappy-compression-macOS"
-  matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: "macos-1015" }
+  matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
   tags: ["tests-variant"]
   tasks:
@@ -1581,7 +1586,7 @@ buildvariants:
      - name: test-netstandard21
 
 - matrix_name: "tests-zstandard-compression-macOS"
-  matrix_spec: { compressor : "zstandard", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: "macos-1015" }
+  matrix_spec: { compressor : "zstandard", auth: "noauth", ssl: "nossl", version: ["5.0", "6.0", "rapid", "latest"], topology: "standalone", os: ["macos-1100", "macos-1100-arm64"] }
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${os} "
   tags: ["tests-variant"]
   tasks:
@@ -1605,14 +1610,14 @@ buildvariants:
      - name: test-netstandard21
 
 - matrix_name: "secure-tests-macOS"
-  matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: "macos-1015" }
+  matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "auth", ssl: "ssl", os: ["macos-1100", "macos-1100-arm64"] }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
      - name: test-netstandard21
 
 - matrix_name: "unsecure-tests-macOS"
-  matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: "macos-1015" }
+  matrix_spec: { version: ["5.0", "6.0", "rapid", "latest"], topology: "replicaset", auth: "noauth", ssl: "nossl", os: ["macos-1100", "macos-1100-arm64"] }
   display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
   tags: ["tests-variant"]
   tasks:
@@ -1733,7 +1738,7 @@ buildvariants:
     - name: test-csfle-with-mocked-kms-tls-netstandard21
 
 - matrix_name: "csfle-with-mocked-kms-tests-macOS"
-  matrix_spec: { os: "macos-1015", ssl: "nossl", version: [ "5.0", "6.0", "rapid", "latest" ], topology: ["standalone"] }
+  matrix_spec: { os: [ "macos-1100", "macos-1100-arm64" ], ssl: "nossl", version: [ "5.0", "6.0", "rapid", "latest" ], topology: ["standalone"] }
   display_name: "CSFLE Mocked KMS ${version} ${os}"
   tasks:
     - name: test-csfle-with-mocked-kms-tls-netstandard21
@@ -1754,7 +1759,8 @@ buildvariants:
     - name: test-csfle-with-mongocryptd-netstandard21
 
 - matrix_name: "csfle-with-mongocryptd-macOS"
-  matrix_spec: { os: "macos-1015", ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "latest" ], topology: ["replicaset"] }
+  matrix_spec: { os: ["macos-1100", "macos-1100-arm64"], ssl: "nossl", version: [ "4.2", "4.4", "5.0", "6.0", "latest" ], topology: ["replicaset"] }
   display_name: "CSFLE with mongocryptd ${version} ${os}"
   tasks:
-    - name: test-csfle-with-mongocryptd-netstandard21
+    - name: test-csfle-with-mongocryptd-netstandard21
+

evergreen/evergreen.yml

@@ -5,8 +5,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsWindows)'!='true'">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IsWindows)'!='true'">netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />

tests/AstrolabeWorkloadExecutor/AstrolabeWorkloadExecutor.csproj

@@ -4,8 +4,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net472</TargetFrameworks>
-    <TargetFrameworks Condition="'$(IsWindows)'!='true'">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0;net472</TargetFrameworks>
+    <TargetFrameworks Condition="'$(IsWindows)'!='true'">netcoreapp2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />

tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj

@@ -31,9 +31,11 @@ public void Serialization_should_work()
             var formatter = new BinaryFormatter();
             using (var stream = new MemoryStream())
             {
+#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete
                 formatter.Serialize(stream, subject);
                 stream.Position = 0;
                 var rehydrated = (BsonException)formatter.Deserialize(stream);
+#pragma warning restore SYSLIB0011 // BinaryFormatter serialization is obsolete
 
                 rehydrated.Message.Should().Be(subject.Message);
                 rehydrated.InnerException.Message.Should().Be(subject.InnerException.Message);

tests/MongoDB.Bson.Tests/Exceptions/BsonExceptionTests.cs

@@ -31,9 +31,11 @@ public void Serialization_should_work()
             var formatter = new BinaryFormatter();
             using (var stream = new MemoryStream())
             {
+#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete
                 formatter.Serialize(stream, subject);
                 stream.Position = 0;
                 var rehydrated = (BsonInternalException)formatter.Deserialize(stream);
+#pragma warning restore SYSLIB0011 // BinaryFormatter serialization is obsolete
 
                 rehydrated.Message.Should().Be(subject.Message);
                 rehydrated.InnerException.Message.Should().Be(subject.InnerException.Message);

tests/MongoDB.Bson.Tests/Exceptions/BsonInternalExceptionTests.cs

@@ -31,9 +31,11 @@ public void Serialization_should_work()
             var formatter = new BinaryFormatter();
             using (var stream = new MemoryStream())
             {
+#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete
                 formatter.Serialize(stream, subject);
                 stream.Position = 0;
                 var rehydrated = (BsonSerializationException)formatter.Deserialize(stream);
+#pragma warning restore SYSLIB0011 // BinaryFormatter serialization is obsolete
 
                 rehydrated.Message.Should().Be(subject.Message);
                 rehydrated.InnerException.Message.Should().Be(subject.InnerException.Message);

tests/MongoDB.Bson.Tests/Exceptions/BsonSerializationExceptionTests.cs

@@ -31,9 +31,11 @@ public void Serialization_should_work()
             var formatter = new BinaryFormatter();
             using (var stream = new MemoryStream())
             {
+#pragma warning disable SYSLIB0011 // BinaryFormatter serialization is obsolete
                 formatter.Serialize(stream, subject);
                 stream.Position = 0;
                 var rehydrated = (DuplicateBsonMemberMapAttributeException)formatter.Deserialize(stream);
+#pragma warning restore SYSLIB0011 // BinaryFormatter serialization is obsolete
 
                 rehydrated.Message.Should().Be(subject.Message);
                 rehydrated.InnerException.Message.Should().Be(subject.InnerException.Message);