Skip to content

Commit 2a62df6

Browse files
committed
CSHARP-1845: Remove framework axis.
1 parent ea9139a commit 2a62df6

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

build.cake

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,23 @@ Task("TestNet45")
7070
XUnit2(testAssemblies);
7171
});
7272

73-
Task("TestNetCore10")
74-
.IsDependentOn("BuildNetStandard15")
73+
Task("TestNetStandard15")
7574
.Does(() =>
7675
{
7776
Console.WriteLine("Run tests on .NET Core 1.0 here");
7877
});
7978

79+
Task("TestWindows")
80+
.IsDependentOn("TestNet45")
81+
.IsDependentOn("TestNetStandard15");
82+
83+
Task("TestLinux")
84+
.IsDependentOn("TestNetStandard15");
85+
86+
Task("Test")
87+
.IsDependentOn("TestWindows");
88+
8089
Task("Default")
81-
.IsDependentOn("Build")
82-
.IsDependentOn("TestNet45");
90+
.IsDependentOn("Build");
8391

8492
RunTarget(target);

evergreen/evergreen.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ functions:
215215
working_dir: mongo-csharp-driver
216216
script: |
217217
${PREPARE_SHELL}
218-
AUTH=${AUTH} SSL=${SSL} MONGODB_URI="${MONGODB_URI}" TOPOLOGY=${TOPOLOGY} JDK="${JDK}" evergreen/run-tests.sh
218+
AUTH=${AUTH} SSL=${SSL} MONGODB_URI="${MONGODB_URI}" TOPOLOGY=${TOPOLOGY} evergreen/run-tests.sh
219219
220220
run-plain-auth-tests:
221221
- command: shell.exec
@@ -224,7 +224,7 @@ functions:
224224
working_dir: mongo-csharp-driver
225225
script: |
226226
${PREPARE_SHELL}
227-
JDK="jdk8" MONGODB_URI="${plain_auth_mongodb_uri}" evergreen/run-plain-auth-tests.sh
227+
MONGODB_URI="${plain_auth_mongodb_uri}" evergreen/run-plain-auth-tests.sh
228228
229229
publish-snapshot:
230230
- command: shell.exec
@@ -415,18 +415,6 @@ axes:
415415
variables:
416416
SSL: "nossl"
417417

418-
- id: framework
419-
display_name: .NET Framework
420-
values:
421-
- id: "net45"
422-
display_name: .NET Framework 4.5
423-
variables:
424-
FRAMEWORK: "net45"
425-
# - id: "netcore10"
426-
# display_name: .NET Core 1.0
427-
# variables:
428-
# FRAMEWORK: "netcore10"
429-
430418
buildvariants:
431419

432420
- name: windows-64-compile
@@ -437,9 +425,9 @@ buildvariants:
437425
- name: compile
438426

439427
- matrix_name: "tests"
440-
matrix_spec: { version: "*", topology: "*", auth: "*", ssl: "*", os: "*", framework: "*" }
441-
exclude_spec: { version: "2.4", topology: "*", auth: "*", ssl: "ssl", os: "*", framework: "*" }
442-
display_name: "${version} ${topology} ${auth} ${ssl} ${os} ${framework}"
428+
matrix_spec: { version: "*", topology: "*", auth: "*", ssl: "*", os: "*" }
429+
exclude_spec: { version: "2.4", topology: "*", auth: "*", ssl: "ssl", os: "*" }
430+
display_name: "${version} ${topology} ${auth} ${ssl} ${os}"
443431
tags: ["tests-variant"]
444432
tasks:
445433
- name: test

0 commit comments

Comments
 (0)