Skip to content

Commit 822f34f

Browse files
kzukzu
committed
Bring fix for test error markup rendering
1 parent 7aaa87d commit 822f34f

File tree

4 files changed

+74
-74
lines changed

4 files changed

+74
-74
lines changed

‎.netconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
weak
9696
[file "src/dotnet-retest/TrxCommand.cs"]
9797
url = https://github.com/devlooped/dotnet-trx/blob/main/src/dotnet-trx/TrxCommand.cs
98-
sha = ea8010ff06abc0cf8b183579a9fcc248afc6b528
99-
etag = 82b154bd7bdc5a83a8f568a1a737ebfbc5af57935a77e2033082b839bde99883
98+
sha = e387f12bd7a3283f08f2ee27c7e3b299bbc0dd1b
99+
etag = 664d3406b679d1054ac0a17d45c32824159f3fb8a3e430e7aafa524744cd253c
100100
weak
101101
[file "src/dotnet-retest/Process.cs"]
102102
url = https://github.com/devlooped/dotnet-trx/blob/main/src/dotnet-trx/Process.cs

‎src/Sample/Sample.csproj

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
8-
<IsPackable>false</IsPackable>
9-
<IsTestProject>true</IsTestProject>
10-
</PropertyGroup>
11-
12-
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="6.0.2" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15-
<PackageReference Include="xunit" Version="2.9.0" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<Using Include="Xunit" />
21-
</ItemGroup>
22-
23-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
8+
<IsPackable>false</IsPackable>
9+
<IsTestProject>true</IsTestProject>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="coverlet.collector" Version="6.0.2" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15+
<PackageReference Include="xunit" Version="2.9.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<Using Include="Xunit" />
21+
</ItemGroup>
22+
23+
</Project>

‎src/dotnet-retest/TrxCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,12 @@ void WriteError(string baseDir, List<Failed> failures, XElement result, StringBu
414414
else
415415
details.AppendLine("csharp");
416416

417-
foreach (var line in lines)
417+
foreach (var line in lines.Select(x => x.EscapeMarkup()))
418418
{
419419
var match = ParseFile().Match(line);
420420
if (!match.Success)
421421
{
422-
cli.AppendLine(line.EscapeMarkup());
422+
cli.AppendLine(line);
423423
details.AppendLineIndented(line, "> ");
424424
continue;
425425
}

‎src/dotnet-retest/dotnet-retest.csproj

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<RootNamespace>Devlooped</RootNamespace>
7-
<AssemblyName>retest</AssemblyName>
8-
<GenerateDocumentationFile>false</GenerateDocumentationFile>
9-
10-
<PackageId>dotnet-retest</PackageId>
11-
<ToolCommandName>dotnet-retest</ToolCommandName>
12-
<PackAsTool>true</PackAsTool>
13-
<PackageReadmeFile>readme.md</PackageReadmeFile>
14-
<PackageTags>dotnet dotnet-tool</PackageTags>
15-
16-
<BuildDate>$([System.DateTime]::Now.ToString("yyyy-MM-dd"))</BuildDate>
17-
<BuildRef>$(GITHUB_REF_NAME)</BuildRef>
18-
</PropertyGroup>
19-
20-
<ItemGroup>
21-
<PackageReference Include="CliWrap" Version="3.6.6" />
22-
<PackageReference Include="Devlooped.Web" Version="1.2.2" />
23-
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
24-
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
25-
<PackageReference Include="NuGetizer" Version="1.2.2" />
26-
<PackageReference Include="NuGet.Protocol" Version="6.10.1" />
27-
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
28-
<PackageReference Include="ThisAssembly.Git" Version="1.5.0" PrivateAssets="all" />
29-
<PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<ProjectProperty Include="ToolCommandName" />
34-
<ProjectProperty Include="BuildDate" />
35-
<ProjectProperty Include="BuildRef" />
36-
<ProjectProperty Include="PackageId" />
37-
<ProjectProperty Include="PackageVersion" />
38-
<ProjectProperty Include="PackageProjectUrl" />
39-
</ItemGroup>
40-
41-
<Target Name="RenderHelp" AfterTargets="Build">
42-
<WriteLinesToFile Lines="```shell" Overwrite="true" File="help.md" />
43-
<Exec Command="dotnet run --no-build -- --help &gt;&gt; help.md" EnvironmentVariables="NO_COLOR=true" ContinueOnError="true" />
44-
<WriteLinesToFile Lines="```" Overwrite="false" File="help.md" />
45-
</Target>
46-
47-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<RootNamespace>Devlooped</RootNamespace>
7+
<AssemblyName>retest</AssemblyName>
8+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
9+
10+
<PackageId>dotnet-retest</PackageId>
11+
<ToolCommandName>dotnet-retest</ToolCommandName>
12+
<PackAsTool>true</PackAsTool>
13+
<PackageReadmeFile>readme.md</PackageReadmeFile>
14+
<PackageTags>dotnet dotnet-tool</PackageTags>
15+
16+
<BuildDate>$([System.DateTime]::Now.ToString("yyyy-MM-dd"))</BuildDate>
17+
<BuildRef>$(GITHUB_REF_NAME)</BuildRef>
18+
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<PackageReference Include="CliWrap" Version="3.6.6" />
22+
<PackageReference Include="Devlooped.Web" Version="1.2.2" />
23+
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
24+
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
25+
<PackageReference Include="NuGetizer" Version="1.2.2" />
26+
<PackageReference Include="NuGet.Protocol" Version="6.10.1" />
27+
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
28+
<PackageReference Include="ThisAssembly.Git" Version="1.5.0" PrivateAssets="all" />
29+
<PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<ProjectProperty Include="ToolCommandName" />
34+
<ProjectProperty Include="BuildDate" />
35+
<ProjectProperty Include="BuildRef" />
36+
<ProjectProperty Include="PackageId" />
37+
<ProjectProperty Include="PackageVersion" />
38+
<ProjectProperty Include="PackageProjectUrl" />
39+
</ItemGroup>
40+
41+
<Target Name="RenderHelp" AfterTargets="Build">
42+
<WriteLinesToFile Lines="```shell" Overwrite="true" File="help.md" />
43+
<Exec Command="dotnet run --no-build -- --help &gt;&gt; help.md" EnvironmentVariables="NO_COLOR=true" ContinueOnError="true" />
44+
<WriteLinesToFile Lines="```" Overwrite="false" File="help.md" />
45+
</Target>
46+
47+
</Project>

0 commit comments

Comments
 (0)