Skip to content

Commit 5ad1f71

Browse files
committed
Feature: add nuget metadata and icon, add additional targets to cli
Feature: - add nuget metadata - add nuget icon - add additional targets to cli - fix license double up in core and custom projects
1 parent 9f27b71 commit 5ad1f71

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

assets/nuget_cli.png

7.58 KB
Loading

src/LiquidTestReports.Cli/LiquidTestReports.Cli.csproj

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,51 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
66
<PackAsTool>true</PackAsTool>
77
<ToolCommandName>liquid</ToolCommandName>
88
<PackageOutputPath>./nupkg</PackageOutputPath>
9+
<RepositoryUrl>https://github.com/kurtmkurtm/LiquidTestReports</RepositoryUrl>
10+
<PackageProjectUrl>https://github.com/kurtmkurtm/LiquidTestReports</PackageProjectUrl>
11+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
12+
<PackageIcon>nuget_cli.png</PackageIcon>
913
</PropertyGroup>
10-
1114
<ItemGroup>
1215
<PackageReference Include="Spectre.Console" Version="0.38.0" />
1316
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.20574.7" />
1417
</ItemGroup>
15-
1618
<ItemGroup>
1719
<ProjectReference Include="..\LiquidTestReports.Core\LiquidTestReports.Core.csproj" />
1820
</ItemGroup>
19-
21+
<ItemGroup>
22+
<None Include="..\..\assets\nuget_cli.png">
23+
<Pack>True</Pack>
24+
<PackagePath></PackagePath>
25+
</None>
26+
<None Include="..\..\LICENSE">
27+
<Pack>True</Pack>
28+
<PackagePath></PackagePath>
29+
</None>
30+
</ItemGroup>
2031
<ItemGroup>
2132
<Compile Update="Resources\Templates.Designer.cs">
2233
<DesignTime>True</DesignTime>
2334
<AutoGen>True</AutoGen>
2435
<DependentUpon>Templates.resx</DependentUpon>
2536
</Compile>
2637
</ItemGroup>
27-
2838
<ItemGroup>
2939
<EmbeddedResource Update="Resources\Templates.resx">
3040
<Generator>ResXFileCodeGenerator</Generator>
3141
<LastGenOutput>Templates.Designer.cs</LastGenOutput>
3242
</EmbeddedResource>
3343
</ItemGroup>
34-
44+
<PropertyGroup Label="Configuration">
45+
<RootNamespace>LiquidTestReports.Cli</RootNamespace>
46+
<Authors>Kurt Murrell</Authors>
47+
<PackageId>LiquidTestReports.Cli</PackageId>
48+
<Product>LiquidTestReports.Cli</Product>
49+
<Copyright>2021</Copyright>
50+
<Description>.NET tool to combine and convert TRX tests reports into Markdown with Liquid template support</Description>
51+
</PropertyGroup>
3552
</Project>

src/LiquidTestReports.Cli/Loaders/TrxLoader.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using LiquidTestReports.Cli.adapters;
2-
using LiquidTestReports.Core.Drops;
3-
using Schemas.VisualStudio.TeamTest;
1+
using Schemas.VisualStudio.TeamTest;
42
using System.IO;
5-
using System.Text.Json;
63
using System.Xml.Serialization;
74

85
namespace LiquidTestReports.Cli.Loaders
@@ -12,11 +9,11 @@ internal class TrxLoader
129
internal static TestRunType FromFile(string file)
1310
{
1411
var ser = new XmlSerializer(typeof(TestRunType));
15-
using var reader = new StreamReader(file);
16-
17-
if (ser.Deserialize(reader) is TestRunType results)
18-
return results;
19-
12+
using (var reader = new StreamReader(file))
13+
{
14+
if (ser.Deserialize(reader) is TestRunType results)
15+
return results;
16+
}
2017
throw new InvalidDataException($"Provided file {file} could not be deserialised, check file is valid TRX XML");
2118
}
2219
}

src/LiquidTestReports.Core/LiquidTestReports.Core.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<Pack>True</Pack>
3030
<PackagePath></PackagePath>
3131
</None>
32-
<None Include="..\..\LICENSE">
33-
<Pack>True</Pack>
34-
<PackagePath></PackagePath>
35-
</None>
3632
</ItemGroup>
3733
<PropertyGroup Label="Configuration">
3834
<RootNamespace>LiquidTestReports.Core</RootNamespace>

src/LiquidTestReports.Custom/LiquidTestReports.Custom.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
<Pack>True</Pack>
1818
<PackagePath></PackagePath>
1919
</None>
20-
<None Include="..\..\LICENSE">
21-
<Pack>True</Pack>
22-
<PackagePath></PackagePath>
23-
</None>
2420
</ItemGroup>
2521
<ItemGroup>
2622
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="16.9.1" />

0 commit comments

Comments
 (0)