Skip to content

Commit 92d8406

Browse files
authored
chore: Use of MSTest metapackage instead of multiple package references related to testing. (#1082)
This commit replaces various testing-related package references with the `MSTest` metapackage, obviating the need for multiple package references for testing. addresses #1076
1 parent 763d34b commit 92d8406

File tree

12 files changed

+20
-44
lines changed

12 files changed

+20
-44
lines changed

src/ActionsTests/ActionsTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -11,14 +11,12 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1514
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1815
<PackageReference Include="coverlet.collector" Version="6.0.2">
1916
<PrivateAssets>all</PrivateAssets>
2017
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2118
</PackageReference>
19+
<PackageReference Include="MSTest" Version="3.7.0" />
2220
</ItemGroup>
2321

2422
<ItemGroup>

src/AutomationTests/AutomationTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -11,14 +11,12 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1514
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1815
<PackageReference Include="coverlet.collector" Version="6.0.2">
1916
<PrivateAssets>all</PrivateAssets>
2017
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2118
</PackageReference>
19+
<PackageReference Include="MSTest" Version="3.7.0" />
2220
</ItemGroup>
2321

2422
<ItemGroup>

src/CLITests/CLITests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -15,10 +15,8 @@
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1918
<PackageReference Include="Moq" Version="4.18.4" />
20-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
21-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
19+
<PackageReference Include="MSTest" Version="3.7.0" />
2220
</ItemGroup>
2321

2422
<ItemGroup>

src/CoreTests/CoreTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -11,14 +11,12 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1514
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1815
<PackageReference Include="coverlet.collector" Version="6.0.2">
1916
<PrivateAssets>all</PrivateAssets>
2017
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2118
</PackageReference>
19+
<PackageReference Include="MSTest" Version="3.7.0" />
2220
</ItemGroup>
2321

2422
<ItemGroup>

src/DesktopTests/DesktopTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -34,14 +34,12 @@
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
3837
<PackageReference Include="Moq" Version="4.18.4" />
39-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
40-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
4138
<PackageReference Include="coverlet.collector" Version="6.0.2">
4239
<PrivateAssets>all</PrivateAssets>
4340
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4441
</PackageReference>
42+
<PackageReference Include="MSTest" Version="3.7.0" />
4543
</ItemGroup>
4644

4745
<ItemGroup>

src/MsiFileTests/MsiFileTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -10,14 +10,12 @@
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1413
<PackageReference Include="Moq" Version="4.18.4" />
15-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
16-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1714
<PackageReference Include="coverlet.collector" Version="6.0.2">
1815
<PrivateAssets>all</PrivateAssets>
1916
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2017
</PackageReference>
18+
<PackageReference Include="MSTest" Version="3.7.0" />
2119
</ItemGroup>
2220

2321
<Import Project="..\..\build\NetStandardTest.targets" />

src/OldFileVersionCompatibilityTests/OldFileVersionCompatibilityTests.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1514
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1815
<PackageReference Include="coverlet.collector" Version="6.0.2">
1916
<PrivateAssets>all</PrivateAssets>
2017
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2118
</PackageReference>
19+
<PackageReference Include="MSTest" Version="3.7.0" />
2220
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2321
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
2422
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />

src/RuleSelectionTests/RuleSelectionTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -11,13 +11,11 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
15-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
16-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1714
<PackageReference Include="coverlet.collector" Version="6.0.2">
1815
<PrivateAssets>all</PrivateAssets>
1916
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2017
</PackageReference>
18+
<PackageReference Include="MSTest" Version="3.7.0" />
2119
</ItemGroup>
2220

2321
<ItemGroup>

src/RulesTest/RulesTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
@@ -11,14 +11,12 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1514
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
1815
<PackageReference Include="coverlet.collector" Version="6.0.2">
1916
<PrivateAssets>all</PrivateAssets>
2017
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2118
</PackageReference>
19+
<PackageReference Include="MSTest" Version="3.7.0" />
2220
</ItemGroup>
2321

2422
<ItemGroup>

src/SystemAbstractionsTests/SystemAbstractionsTests.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1514
<PackageReference Include="Moq" Version="4.18.4" />
16-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.2" />
17-
<PackageReference Include="MSTest.TestFramework" Version="3.6.2" />
15+
<PackageReference Include="MSTest" Version="3.7.0" />
1816
</ItemGroup>
1917

2018
<ItemGroup>

0 commit comments

Comments
 (0)