Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit dd3f679

Browse files
CSHARP-5742: Do not run netstandard tests on ARM platform (#1781)
1 parent bbd7c43 commit dd3f679

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

‎build.cake‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,7 @@ Setup<BuildConfig>(
393393
};
394394

395395
var lowerTarget = target.ToLowerInvariant();
396-
// Apple M1 (arm64) must run on .NET 6 as the hosting process is arm64 and cannot load the previous netcoreapp2.1/3.1 runtimes.
397-
// While Rosetta 2 can cross-compile x64->arm64 to run x64 code, it requires a completely separate install of the .NET runtimes
398-
// in a different directory with a x64 dotnet host process. This would further complicate our testing for little additional gain.
399-
var framework = targetPlatform == "arm64" ? "net6.0" : lowerTarget switch
396+
var framework = lowerTarget switch
400397
{
401398
string s when s.EndsWith("netstandard21") || s.EndsWith("netcoreapp31") => "netcoreapp3.1",
402399
string s when s.EndsWith("net472") => "net472",

‎evergreen/evergreen.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,6 +2354,11 @@ buildvariants:
23542354
tasks:
23552355
- name: test-netstandard21
23562356
- name: test-net60
2357+
rules:
2358+
- if: { version: "*", topology: "*", auth: "*", ssl: "*", os: "macos-14-arm64" }
2359+
then:
2360+
remove_tasks:
2361+
- test-netstandard21 # Apple M1 (arm64) cannot load runtimes lower then .NET 6.
23572362

23582363
- matrix_name: "secure-tests-linux-1804"
23592364
matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "auth", ssl: "ssl", os: "ubuntu-1804" }
@@ -2389,6 +2394,11 @@ buildvariants:
23892394
tasks:
23902395
- name: test-netstandard21
23912396
- name: test-net60
2397+
rules:
2398+
- if: { version: "*", topology: "*", auth: "*", ssl: "*", os: "macos-14-arm64" }
2399+
then:
2400+
remove_tasks:
2401+
- test-netstandard21 # Apple M1 (arm64) cannot load runtimes lower then .NET 6.
23922402

23932403
- matrix_name: "unsecure-tests-linux-1804"
23942404
matrix_spec: { version: ["4.2", "4.4", "5.0", "6.0"], topology: "*", auth: "noauth", ssl: "nossl", os: "ubuntu-1804" }
@@ -2424,6 +2434,11 @@ buildvariants:
24242434
tasks:
24252435
- name: test-netstandard21
24262436
- name: test-net60
2437+
rules:
2438+
- if: { compressor : "*", auth: "*", ssl: "*", version: "*", topology: "*", os: "macos-14-arm64" }
2439+
then:
2440+
remove_tasks:
2441+
- test-netstandard21 # Apple M1 (arm64) cannot load runtimes lower then .NET 6.
24272442

24282443
- matrix_name: "tests-compression-linux-1804"
24292444
matrix_spec: { compressor: "*", auth: "noauth", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0"], topology: "standalone", os: "ubuntu-1804" }
@@ -2641,6 +2656,13 @@ buildvariants:
26412656
- name: test-csfle-with-mocked-kms-tls-net60
26422657
- name: test-csfle-with-mongocryptd-netstandard21
26432658
- name: test-csfle-with-mongocryptd-net60
2659+
rules:
2660+
- if: { os: "macos-14-arm64", ssl: "*", version: "*", topology: "*" }
2661+
then:
2662+
remove_tasks:
2663+
# Apple M1 (arm64) cannot load runtimes lower then .NET 6.
2664+
- test-csfle-with-mocked-kms-tls-netstandard21
2665+
- test-csfle-with-mongocryptd-netstandard21
26442666

26452667
- matrix_name: "csfle-with-azure-kms-tests-linux"
26462668
matrix_spec: { ssl: "nossl", os: "ubuntu-2004" }

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /