Skip to content

Bring fix for test error markup rendering #10

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

Merged
kzu merged 1 commit into from
Jul 29, 2024
+74 −74
Merged

Bring fix for test error markup rendering #10

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
4 changes: 2 additions & 2 deletions .netconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
weak
[file "src/dotnet-retest/TrxCommand.cs"]
url = https://github.com/devlooped/dotnet-trx/blob/main/src/dotnet-trx/TrxCommand.cs
sha = ea8010ff06abc0cf8b183579a9fcc248afc6b528
etag = 82b154bd7bdc5a83a8f568a1a737ebfbc5af57935a77e2033082b839bde99883
sha = e387f12bd7a3283f08f2ee27c7e3b299bbc0dd1b
etag = 664d3406b679d1054ac0a17d45c32824159f3fb8a3e430e7aafa524744cd253c
weak
[file "src/dotnet-retest/Process.cs"]
url = https://github.com/devlooped/dotnet-trx/blob/main/src/dotnet-trx/Process.cs
Expand Down
46 changes: 23 additions & 23 deletions src/Sample/Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>

<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/dotnet-retest/TrxCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,12 @@ void WriteError(string baseDir, List<Failed> failures, XElement result, StringBu
else
details.AppendLine("csharp");

foreach (var line in lines)
foreach (var line in lines.Select(x => x.EscapeMarkup()))
{
var match = ParseFile().Match(line);
if (!match.Success)
{
cli.AppendLine(line.EscapeMarkup());
cli.AppendLine(line);
details.AppendLineIndented(line, "> ");
continue;
}
Expand Down
94 changes: 47 additions & 47 deletions src/dotnet-retest/dotnet-retest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Devlooped</RootNamespace>
<AssemblyName>retest</AssemblyName>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<PackageId>dotnet-retest</PackageId>
<ToolCommandName>dotnet-retest</ToolCommandName>
<PackAsTool>true</PackAsTool>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<PackageTags>dotnet dotnet-tool</PackageTags>
<BuildDate>$([System.DateTime]::Now.ToString("yyyy-MM-dd"))</BuildDate>
<BuildRef>$(GITHUB_REF_NAME)</BuildRef>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.6" />
<PackageReference Include="Devlooped.Web" Version="1.2.2" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="NuGetizer" Version="1.2.2" />
<PackageReference Include="NuGet.Protocol" Version="6.10.1" />
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
<PackageReference Include="ThisAssembly.Git" Version="1.5.0" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<ProjectProperty Include="ToolCommandName" />
<ProjectProperty Include="BuildDate" />
<ProjectProperty Include="BuildRef" />
<ProjectProperty Include="PackageId" />
<ProjectProperty Include="PackageVersion" />
<ProjectProperty Include="PackageProjectUrl" />
</ItemGroup>
<Target Name="RenderHelp" AfterTargets="Build">
<WriteLinesToFile Lines="```shell" Overwrite="true" File="help.md" />
<Exec Command="dotnet run --no-build -- --help &gt;&gt; help.md" EnvironmentVariables="NO_COLOR=true" ContinueOnError="true" />
<WriteLinesToFile Lines="```" Overwrite="false" File="help.md" />
</Target>
</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Devlooped</RootNamespace>
<AssemblyName>retest</AssemblyName>
<GenerateDocumentationFile>false</GenerateDocumentationFile>

<PackageId>dotnet-retest</PackageId>
<ToolCommandName>dotnet-retest</ToolCommandName>
<PackAsTool>true</PackAsTool>
<PackageReadmeFile>readme.md</PackageReadmeFile>
<PackageTags>dotnet dotnet-tool</PackageTags>

<BuildDate>$([System.DateTime]::Now.ToString("yyyy-MM-dd"))</BuildDate>
<BuildRef>$(GITHUB_REF_NAME)</BuildRef>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.6" />
<PackageReference Include="Devlooped.Web" Version="1.2.2" />
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="NuGetizer" Version="1.2.2" />
<PackageReference Include="NuGet.Protocol" Version="6.10.1" />
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
<PackageReference Include="ThisAssembly.Git" Version="1.5.0" PrivateAssets="all" />
<PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<ProjectProperty Include="ToolCommandName" />
<ProjectProperty Include="BuildDate" />
<ProjectProperty Include="BuildRef" />
<ProjectProperty Include="PackageId" />
<ProjectProperty Include="PackageVersion" />
<ProjectProperty Include="PackageProjectUrl" />
</ItemGroup>

<Target Name="RenderHelp" AfterTargets="Build">
<WriteLinesToFile Lines="```shell" Overwrite="true" File="help.md" />
<Exec Command="dotnet run --no-build -- --help &gt;&gt; help.md" EnvironmentVariables="NO_COLOR=true" ContinueOnError="true" />
<WriteLinesToFile Lines="```" Overwrite="false" File="help.md" />
</Target>

</Project>