Skip to content

Commit 23b6bd2

Browse files
BorisDogBorisDog
committed
-Add temporary ADD_NET10_TFM flag
1 parent 8154a51 commit 23b6bd2

File tree

6 files changed

+17
-3
lines changed

6 files changed

+17
-3
lines changed

‎evergreen/evergreen.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,27 +1111,31 @@ tasks:
11111111
- func: configure-framework
11121112
vars:
11131113
FRAMEWORK: net472
1114+
DOTNET_SDK_VERSION: 10.0
11141115
- func: run-unit-tests
11151116

11161117
- name: unit-tests-netstandard21
11171118
commands:
11181119
- func: configure-framework
11191120
vars:
11201121
FRAMEWORK: netstandard2.1
1122+
DOTNET_SDK_VERSION: 10.0
11211123
- func: run-unit-tests
11221124

11231125
- name: unit-tests-net60
11241126
commands:
11251127
- func: configure-framework
11261128
vars:
11271129
FRAMEWORK: net6.0
1130+
DOTNET_SDK_VERSION: 10.0
11281131
- func: run-unit-tests
11291132

11301133
- name: unit-tests-net100
11311134
commands:
11321135
- func: configure-framework
11331136
vars:
11341137
FRAMEWORK: net10.0
1138+
DOTNET_SDK_VERSION: 10.0
11351139
- func: run-unit-tests
11361140

11371141
- name: test-net472
@@ -1661,6 +1665,7 @@ tasks:
16611665
- func: configure-framework
16621666
vars:
16631667
FRAMEWORK: net472
1668+
DOTNET_SDK_VERSION: 10.0
16641669
- func: bootstrap-mongo-orchestration
16651670
- func: run-smoke-tests
16661671

@@ -1672,6 +1677,7 @@ tasks:
16721677
- func: configure-framework
16731678
vars:
16741679
FRAMEWORK: netcoreapp3.1
1680+
DOTNET_SDK_VERSION: 10.0
16751681
- func: bootstrap-mongo-orchestration
16761682
- func: run-smoke-tests
16771683

@@ -1683,6 +1689,7 @@ tasks:
16831689
- func: configure-framework
16841690
vars:
16851691
FRAMEWORK: net5.0
1692+
DOTNET_SDK_VERSION: 10.0
16861693
- func: bootstrap-mongo-orchestration
16871694
- func: run-smoke-tests
16881695

@@ -1694,6 +1701,7 @@ tasks:
16941701
- func: configure-framework
16951702
vars:
16961703
FRAMEWORK: net6.0
1704+
DOTNET_SDK_VERSION: 10.0
16971705
- func: bootstrap-mongo-orchestration
16981706
- func: run-smoke-tests
16991707

@@ -1705,6 +1713,7 @@ tasks:
17051713
- func: configure-framework
17061714
vars:
17071715
FRAMEWORK: net8.0
1716+
DOTNET_SDK_VERSION: 10.0
17081717
- func: bootstrap-mongo-orchestration
17091718
- func: run-smoke-tests
17101719

@@ -1716,6 +1725,7 @@ tasks:
17161725
- func: configure-framework
17171726
vars:
17181727
FRAMEWORK: net10.0
1728+
DOTNET_SDK_VERSION: 10.0
17191729
- func: bootstrap-mongo-orchestration
17201730
- func: run-smoke-tests
17211731

‎evergreen/install-dotnet.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -o errexit # Exit the script with error if any of the commands fail
33

44
DOTNET_ROOT="${DOTNET_ROOT:-./.dotnet}"
5-
DOTNET_SDK_VERSION="${DOTNET_SDK_VERSION:-10.0}"
5+
DOTNET_SDK_VERSION="${DOTNET_SDK_VERSION:-8.0}"
66

77
echo "runtime: $FRAMEWORK"
88

‎evergreen/run-smoke-tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ fi
1010

1111
. ./evergreen/append-myget-package-source.sh
1212

13+
export ADD_NET10_TFM="1" # Remove after cake removal
1314
export DRIVER_PACKAGE_VERSION="${DRIVER_PACKAGE_VERSION}"
1415
./evergreen/compile-sources.sh "$SMOKE_TESTS_PROJECT"
1516

‎evergreen/run-unit-tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ if [ "$FRAMEWORK" = "netstandard2.1" ]; then
77
FRAMEWORK="netcoreapp3.1"
88
fi
99

10+
export ADD_NET10_TFM="1" # Remove after cake removal
1011
./evergreen/compile-sources.sh
1112
dotnet test -c Release --no-build --filter "Category!=Integration" -f "$FRAMEWORK" --results-directory ./build/test-results --logger "junit;verbosity=detailed;LogFileName=TEST-{assembly}.xml;FailureBodyFormat=Verbose" --logger "console;verbosity=detailed"

‎tests/BuildProps/Tests.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<TargetFrameworks>netcoreapp3.1;net6.0;net10.0</TargetFrameworks>
9+
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
1010
<TargetFrameworks Condition="'$(IsWindows)'=='true'">$(TargetFrameworks);net472</TargetFrameworks>
11+
<TargetFrameworks Condition="'$(ADD_NET10_TFM)'=='1'">$(TargetFrameworks);net10.0</TargetFrameworks>
1112
<IsPackable>false</IsPackable>
1213
<SignAssembly>true</SignAssembly>
1314
<AssemblyOriginatorKeyFile>..\..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>

‎tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
</PropertyGroup>
55

66
<PropertyGroup>
7-
<TargetFrameworks>netcoreapp3.1;net472;net5.0;net6.0;net8.0;net10.0</TargetFrameworks>
7+
<TargetFrameworks>netcoreapp3.1;net472;net5.0;net6.0;net8.0</TargetFrameworks>
8+
<TargetFrameworks Condition="'$(ADD_NET10_TFM)'=='1'">$(TargetFrameworks);net10.0</TargetFrameworks>
89
<LangVersion>9</LangVersion>
910
<CodeAnalysisRuleSet>..\..\..\MongoDBTest.ruleset</CodeAnalysisRuleSet>
1011
</PropertyGroup>

0 commit comments

Comments
 (0)