diff --git a/build.cake b/build.cake index d80fe9bea0d..9c50bb96ffe 100644 --- a/build.cake +++ b/build.cake @@ -117,12 +117,6 @@ Task("Test") items: GetFiles("./**/*.Tests.csproj").Where(name => !name.ToString().Contains("Atlas")), action: (BuildConfig buildConfig, Path testProject) => { - if (Environment.GetEnvironmentVariable("MONGODB_API_VERSION") != null && - testProject.ToString().Contains("Legacy")) - { - return; // Legacy tests are exempt from Version API testing - } - var mongoX509ClientCertificatePath = Environment.GetEnvironmentVariable("MONGO_X509_CLIENT_CERTIFICATE_PATH"); if (mongoX509ClientCertificatePath != null) { diff --git a/build.ps1 b/build.ps1 index c4eb3e1ae7d..cc4a4d4aa80 100644 --- a/build.ps1 +++ b/build.ps1 @@ -89,17 +89,16 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) { New-Item -Path $InstallPath -ItemType Directory -Force | Out-Null; } - # 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 3.1 because .NET 5.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. - # This solution is admittedly hacky as .NET Core 2.1 and 3.1 won't be installed if + # This solution is admittedly hacky as .NET Core 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. if ($IsMacOS -or $IsLinux) { $ScriptPath = Join-Path $InstallPath 'dotnet-install.sh' (New-Object System.Net.WebClient).DownloadFile($DotNetUnixInstallerUri, $ScriptPath); - & bash $ScriptPath --install-dir "$InstallPath" --channel 2.1 --no-path & bash $ScriptPath --install-dir "$InstallPath" --channel 3.1 --no-path & bash $ScriptPath --install-dir "$InstallPath" --channel 5.0 --no-path & bash $ScriptPath --install-dir "$InstallPath" --channel 6.0 --no-path @@ -111,7 +110,6 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) { else { $ScriptPath = Join-Path $InstallPath 'dotnet-install.ps1' (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, $ScriptPath); - & $ScriptPath -Channel 2.1 -InstallDir $InstallPath; & $ScriptPath -Channel 3.1 -InstallDir $InstallPath; & $ScriptPath -Channel 5.0 -InstallDir $InstallPath; & $ScriptPath -Channel 6.0 -InstallDir $InstallPath; diff --git a/build.sh b/build.sh index cba9c4531b4..a3ce5a72b9f 100755 --- a/build.sh +++ b/build.sh @@ -33,18 +33,17 @@ if [ "$DOTNET_VERSION" != "$DOTNET_INSTALLED_VERSION" ]; then mkdir "$SCRIPT_DIR/.dotnet" fi curl -Lfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh - # N.B. We explicitly install .NET Core 2.1 and 3.1 because .NET 6.0 SDK can build those TFMs + # N.B. We explicitly install .NET Core 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 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 + # This solution is admittedly hacky as .NET Core 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. # 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" --channel 5.0 --architecture x64 --install-dir .dotnet --no-path bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --channel 6.0 --install-dir .dotnet --no-path diff --git a/tests/AstrolabeWorkloadExecutor/AstrolabeWorkloadExecutor.csproj b/tests/AstrolabeWorkloadExecutor/AstrolabeWorkloadExecutor.csproj index cd2dfe8d18c..da78dc4945f 100644 --- a/tests/AstrolabeWorkloadExecutor/AstrolabeWorkloadExecutor.csproj +++ b/tests/AstrolabeWorkloadExecutor/AstrolabeWorkloadExecutor.csproj @@ -17,10 +17,6 @@ Astrolabe workload executor. - - - - diff --git a/tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj b/tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj index 46c5d10a98d..f5ef150c64b 100644 --- a/tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj +++ b/tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj @@ -11,10 +11,6 @@ Atlas connectivity tests. - - - - 1701;1702; diff --git a/tests/BuildProps/Tests.Build.props b/tests/BuildProps/Tests.Build.props index a14112ae334..20c57ed0aba 100644 --- a/tests/BuildProps/Tests.Build.props +++ b/tests/BuildProps/Tests.Build.props @@ -43,6 +43,7 @@ + diff --git a/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj b/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj index 94f37f02a4b..00789c4be93 100644 --- a/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj +++ b/tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj @@ -11,10 +11,6 @@ Helper classes applicable to test projects that reference MongoDB.Bson. - - - - diff --git a/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj b/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj index bdf1a1d2d06..ee5cfeb07f8 100644 --- a/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj +++ b/tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj @@ -11,10 +11,6 @@ MongoDB.Bson tests. - - - - 1701;1702; @@ -31,10 +27,10 @@ - + - + diff --git a/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj b/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj index 42e6b24a7a1..2634984884a 100644 --- a/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj +++ b/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj @@ -1,11 +1,7 @@  - + - net472;netcoreapp3.1 - netcoreapp3.1;net6.0 - - AnyCPU false true ..\..\MongoDB.Driver.snk @@ -21,8 +17,8 @@ - - PreserveNewest + + Always diff --git a/tests/MongoDB.Driver.Encryption.Tests/xunit.runner.json b/tests/MongoDB.Driver.Encryption.Tests/xunit.runner.json index 991c5d665a4..df84b2cfa98 100644 --- a/tests/MongoDB.Driver.Encryption.Tests/xunit.runner.json +++ b/tests/MongoDB.Driver.Encryption.Tests/xunit.runner.json @@ -1,6 +1,6 @@ { - "$schema": "https://xunit.github.io/schema/current/xunit.runner.schema.json", - - "appDomain": "denied", - "shadowCopy": false + "longRunningTestSeconds": 10, + "parallelizeAssembly": false, + "parallelizeTestCollections": false, + "shadowCopy": false } diff --git a/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj b/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj index 3efd3ca9de4..c993cf89187 100644 --- a/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj +++ b/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj @@ -11,10 +11,6 @@ MongoDB.Driver examples. - - - - diff --git a/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj b/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj index 491068dd8bd..096fcb8bc0b 100644 --- a/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj +++ b/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj @@ -13,7 +13,6 @@ - diff --git a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj index e7a41e2e09b..316086d21ec 100644 --- a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj +++ b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj @@ -28,10 +28,6 @@ - - - -