Skip to content

Commit d6c8963

Browse files
Evangelinkgfs
andauthored
Use MSTest runner + bump to latest (#492)
* Use MSTest runner + bump to latest * Update versions * Update WebAssembly Dependency * Add coverage reporting to test execution --------- Co-authored-by: Gabe Stocco <[email protected]>
1 parent e149d39 commit d6c8963

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,11 @@
66
<PrivateAssets>all</PrivateAssets>
77
</PackageReference>
88
</ItemGroup>
9+
10+
<PropertyGroup>
11+
<!-- MSTest config -->
12+
<EnableMSTestRunner>true</EnableMSTestRunner>
13+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
14+
<MSTestAnalysisMode>Recommended</MSTestAnalysisMode>
15+
</PropertyGroup>
916
</Project>

Pipelines/ossgadget-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ resources:
1010
- repository: templates
1111
type: git
1212
name: SecurityEngineering/OSS-Tools-Pipeline-Templates
13-
ref: refs/tags/v2.0.0
13+
ref: refs/tags/v2.0.1
1414
- repository: 1esPipelines
1515
type: git
1616
name: 1ESPipelineTemplates/1ESPipelineTemplates
@@ -38,6 +38,7 @@ extends:
3838
poolImage: MSSecurity-1ES-Windows-2022
3939
poolOs: windows
4040
projectPath: 'src/oss-tests/oss-tests.csproj'
41+
dotnetTestArgs: '-- --coverage --report-trx'
4142

4243
- stage: Build
4344
jobs:

src/Shared.CLI/Shared.CLI.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
<PackageReference Include="JmesPath.Net" Version="1.0.330" />
7575
<PackageReference Include="Microsoft.CST.ApplicationInspector.Commands" Version="1.9.36" />
7676
<PackageReference Include="Microsoft.CST.DevSkim" Version="1.0.56" />
77-
<PackageReference Include="PeNet" Version="5.0.0" />
77+
<PackageReference Include="PeNet" Version="5.1.0" />
7878
<PackageReference Include="SharpDisasm" Version="1.1.11" />
79-
<PackageReference Include="WebAssembly" Version="1.2.1" />
80-
<PackageReference Include="AngleSharp" Version="1.2.0" />
79+
<PackageReference Include="WebAssembly" Version="1.3.0" />
80+
<PackageReference Include="AngleSharp" Version="1.3.0" />
8181
<PackageReference Include="CommandLineParser" Version="2.9.1" />
8282
<PackageReference Include="Crayon" Version="2.0.69" />
8383
<PackageReference Include="DiffPlex" Version="1.7.2" />

src/Shared/Shared.Lib.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="AngleSharp" Version="1.2.0" />
32+
<PackageReference Include="AngleSharp" Version="1.3.0" />
3333
<PackageReference Include="CommandLineParser" Version="2.9.1" />
3434
<PackageReference Include="Crayon" Version="2.0.69" />
3535
<PackageReference Include="F23.StringSimilarity" Version="6.0.0" />

src/oss-tests/oss-tests.csproj

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<IsPackable>false</IsPackable>
66
<LangVersion>10.0</LangVersion>
77
<Nullable>enable</Nullable>
8+
<OutputType>Exe</OutputType>
89
</PropertyGroup>
910

1011
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -14,14 +15,10 @@
1415
<ItemGroup>
1516
<PackageReference Include="FluentAssertions" Version="8.2.0" />
1617
<PackageReference Include="JmesPath.Net" Version="1.0.330" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
18-
<PackageReference Include="coverlet.collector" Version="6.0.4">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
</PackageReference>
2218
<PackageReference Include="Moq" Version="[4.18.2]" />
23-
<PackageReference Include="MSTest.TestAdapter" Version="3.8.3" />
24-
<PackageReference Include="MSTest.TestFramework" Version="3.8.3" />
19+
<PackageReference Include="MSTest" Version="3.8.3" />
20+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.6.3" />
21+
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
2522
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2623
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
2724
</ItemGroup>

0 commit comments

Comments
 (0)