CSHARP-5591: Configure MongoDB.Driver.Encryption.Tests to run on net472 target (#1692)

Author: sanych-sun

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)
  {

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;

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

tests/AstrolabeWorkloadExecutor/AstrolabeWorkloadExecutor.csproj

@@ -17,10 +17,6 @@
  <Description>Astrolabe workload executor.</Description>
  </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
- </ItemGroup>
-
  <ItemGroup>
  <ProjectReference Include="../MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj" />
  </ItemGroup>

tests/AtlasConnectivity.Tests/AtlasConnectivity.Tests.csproj

@@ -11,10 +11,6 @@
  <Description>Atlas connectivity tests.</Description>
  </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
- </ItemGroup>
-
  <PropertyGroup>
  <NoWarn>
  1701;1702; <!--https://github.com/dotnet/roslyn/issues/19640-->

tests/BuildProps/Tests.Build.props

@@ -43,6 +43,7 @@
  <ItemGroup>
  <PackageReference Include="FluentAssertions" Version="4.12.0" />
  <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2" />
+ <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
  <PackageReference Include="Moq" Version="4.9.0" />
  <PackageReference Include="xunit" Version="2.4.2" />
  <PackageReference Include="JunitXml.TestLogger" Version="2.1.81" />

tests/MongoDB.Bson.TestHelpers/MongoDB.Bson.TestHelpers.csproj

@@ -11,10 +11,6 @@
  <Description>Helper classes applicable to test projects that reference MongoDB.Bson.</Description>
  </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
- </ItemGroup>
-
  <ItemGroup>
  <ProjectReference Include="..\..\src\MongoDB.Bson\MongoDB.Bson.csproj" />
  <ProjectReference Include="..\MongoDB.TestHelpers\MongoDB.TestHelpers.csproj" />

tests/MongoDB.Bson.Tests/MongoDB.Bson.Tests.csproj

@@ -11,10 +11,6 @@
  <Description>MongoDB.Bson tests.</Description>
  </PropertyGroup>
 
- <ItemGroup>
- <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
- </ItemGroup>
-
  <PropertyGroup>
  <NoWarn>
  1701;1702; <!--https://github.com/dotnet/roslyn/issues/19640-->
@@ -31,10 +27,10 @@
  </NoWarn>
  </PropertyGroup>
 
- <ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
  <Reference Include="Microsoft.CSharp" />
  </ItemGroup>
- 
+
  <ItemGroup>
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />

tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj

@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\BuildProps\Tests.Build.props" />
+ <Import Project="..\BuildProps\Tests.Build.props" />
 
  <PropertyGroup>
- <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
- <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp3.1;net6.0</TargetFrameworks>
-
- <Platforms>AnyCPU</Platforms>
  <IsPackable>false</IsPackable>
  <SignAssembly>true</SignAssembly>
  <AssemblyOriginatorKeyFile>..\..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
@@ -21,8 +17,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <None Include="$(CMakeCurrentSourceDir)/xunit.runner.json">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ <None Update="xunit.runner.json">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  </None>
  </ItemGroup>
 

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
 }