Skip to content

Fix discovery and running of tests in Visual Studio Test Explorer #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmalovric wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix discovery and running of tests in Visual Studio Test Explorer #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions templates/integrated/Source/MyProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputType>Exe</OutputType>
<NoWarn>CS1591;CA2016;CS7022</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DisableTestingPlatformServerCapability>true</DisableTestingPlatformServerCapability>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.SimpleEmailV2" Version="4.0.14.9"/>
<PackageReference Include="BCrypt.Net-Next" Version="4.2.1"/>
<PackageReference Include="FastEndpoints" Version="8.3.0-rc.1"/>
<PackageReference Include="FastEndpoints.Generator" Version="8.3.0-rc.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
<PackageReference Include="FastEndpoints.Security" Version="8.3.0-rc.1"/>
<PackageReference Include="FastEndpoints.OpenApi" Version="8.3.0-rc.1"/>
<PackageReference Include="LettuceEncrypt" Version="1.3.3"/>
<PackageReference Include="MessagePack" Version="3.1.7"/>
<PackageReference Include="MongoDB.Entities" Version="25.1.0"/>
<PackageReference Include="AWSSDK.SimpleEmailV2" Version="4.0.14.9" />
<PackageReference Include="BCrypt.Net-Next" Version="4.2.1" />
<PackageReference Include="FastEndpoints" Version="8.3.0-rc.1" />
<PackageReference Include="FastEndpoints.Generator" Version="8.3.0-rc.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
<PackageReference Include="FastEndpoints.Security" Version="8.3.0-rc.1" />
<PackageReference Include="FastEndpoints.OpenApi" Version="8.3.0-rc.1" />
<PackageReference Include="LettuceEncrypt" Version="1.3.3" />
<PackageReference Include="MessagePack" Version="3.1.7" />
<PackageReference Include="MongoDB.Entities" Version="25.1.0" />
</ItemGroup>

<!-- exclude test related code from release build -->
<!-- exclude test related code from release build -->
<ItemGroup Condition="'$(Configuration)' != 'Release'">
<PackageReference Include="FakeItEasy" Version="9.0.1"/>
<PackageReference Include="FastEndpoints.Testing" Version="8.3.0-rc.1"/>
<PackageReference Include="Shouldly" Version="4.3.0"/>
<PackageReference Include="xunit.v3" Version="4.0.0"/>
<Content Update="Tests\xunit.runner.json" TargetPath="xunit.runner.json"/>
<PackageReference Include="FakeItEasy" Version="9.0.1" />
<PackageReference Include="FastEndpoints.Testing" Version="8.3.0-rc.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="xunit.v3" Version="4.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<Content Update="Tests\xunit.runner.json" TargetPath="xunit.runner.json" />
</ItemGroup>
<ItemGroup Condition="'$(Configuration)' == 'Release'">
<Compile Remove="**\Tests\**"/>
<Content Remove="**\Tests\**"/>
<Compile Remove="**\Tests\**" />
<Content Remove="**\Tests\**" />
</ItemGroup>
<!-- exclude test related code from release build-->

Expand Down
8 changes: 5 additions & 3 deletions templates/integrated/Source/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
using Amazon.SimpleEmailV2;
using Dom;
using LettuceEncrypt;
using Xunit.MicrosoftTestingPlatform;

if (args.Any(a => a == "dotnettestcli")) // this is a 'dotnet test' run
return await TestPlatformTestFramework.RunAsync(args, SelfRegisteredExtensions.AddSelfRegisteredExtensions);
#if DEBUG
using MyProject.Tests;
if (TestDiscoveryHandler.IsTestRun(args, out var testRunner))
return await testRunner();
#endif

var bld = WebApplication.CreateBuilder(args);
bld.Services
Expand Down
28 changes: 28 additions & 0 deletions templates/integrated/Source/Tests/TestDiscoveryHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using System.Diagnostics.CodeAnalysis;
using Xunit.MicrosoftTestingPlatform;
using Xunit.Runner.InProc.SystemConsole;

namespace MyProject.Tests;

public static class TestDiscoveryHandler
{
public static bool IsTestRun(string[] args, [NotNullWhen(true)] out Func<Task<int>>? testRunner)
{
if (args.Contains("@@")) // this is a 'dotnet test' run from the test explorer
{
testRunner = () =>
ConsoleRunner.Run(args);
return true;
}

if (args.Any(a => a == "dotnettestcli")) // this is a 'dotnet test' run from the CLI
{
testRunner = () =>
TestPlatformTestFramework.RunAsync(args, SelfRegisteredExtensions.AddSelfRegisteredExtensions);
return true;
}

testRunner = null;
return false;
}
}