Skip to content

Commit 5794451

Browse files
CharliePooleCharliePoole
authored
Merge pull request #1851 from nunit/issue-1850
Standardize test dependency versions
2 parents ee2718a + 136f9aa commit 5794451

14 files changed

Lines changed: 48 additions & 55 deletions

File tree

‎src/Directory.Build.props‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,21 @@
3131
<NSubstitutePublicKey>0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7</NSubstitutePublicKey>
3232
</PropertyGroup>
3333

34+
<!-- Version of NUnit and NSubstitute used depends on the target framework -->
35+
<PropertyGroup Condition="'$(TargetFramework)'=='net35'
36+
OR '$(TargetFramework)'=='netcoreapp2.1' OR '$(TargetFramework)'=='netcoreapp3.1'
37+
OR '$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net5.0-windows'" >
38+
<NUnitVersion>3.14.0</NUnitVersion>
39+
<NSubstituteVersion>2.0.3</NSubstituteVersion>
40+
</PropertyGroup>
41+
42+
<!-- Default versions for targets not listed above -->
43+
<PropertyGroup>
44+
<NUnitVersion Condition="'$(NUnitVersion)'==''">4.6.1</NUnitVersion>
45+
<NSubstituteVersion Condition="'$(NSubstituteVersion)'==''">5.3.0</NSubstituteVersion>
46+
<NUnitAnalyzersVersion>4.14.0</NUnitAnalyzersVersion>
47+
</PropertyGroup>
48+
3449
<!-- Common package metadata, may be overridden in individual projects -->
3550
<!-- Each project should supply properties for PackageId, Title and Description -->
3651
<PropertyGroup>

‎src/NUnitCommon/nunit.agent.core.tests/nunit.agent.core.tests.csproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@
66
<ExposedInternals>true</ExposedInternals>
77
</PropertyGroup>
88

9-
<ItemGroup Condition="'$(TargetFramework)'=='net462' OR '$(TargetFramework)'=='net6.0' OR '$(TargetFramework)'=='net8.0'">
10-
<PackageReference Include="NUnit" Version="4.3.2" />
11-
<PackageReference Include="NUnitLite" Version="4.3.2" />
12-
</ItemGroup>
13-
14-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
15-
<PackageReference Include="NUnit" Version="3.14.0" />
16-
<PackageReference Include="NUnitLite" Version="3.14.0" />
17-
</ItemGroup>
18-
199
<ItemGroup>
20-
<PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
21-
<PackageReference Include="NSubstitute" Version="4.3.0" />
10+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
11+
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
12+
<PackageReference Include="NUnit.Analyzers" Version="$(NUnitAnalyzersVersion)" />
13+
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
2214
</ItemGroup>
2315

2416
<ItemGroup Condition="'$(TargetFramework)'=='net462'">

‎src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="NSubstitute" Version="4.3.0" />
18-
<PackageReference Include="NUnit" Version="4.3.2" />
19-
<PackageReference Include="NUnitLite" Version="4.3.2" />
20-
<PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
17+
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
18+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
19+
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
20+
<PackageReference Include="NUnit.Analyzers" Version="$(NUnitAnalyzersVersion)" />
2121
<PackageReference Include="XmlUnit.NUnit4.Constraints" Version="2.11.1" />
2222
</ItemGroup>
2323

‎src/NUnitCommon/nunit.extensibility.tests/nunit.extensibility.tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="NSubstitute" Version="4.3.0" />
11-
<PackageReference Include="NUnit" Version="4.3.2" />
12-
<PackageReference Include="NUnitLite" Version="4.3.2" />
13-
<PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
10+
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
11+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
12+
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
13+
<PackageReference Include="NUnit.Analyzers" Version="$(NUnitAnalyzersVersion)" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/NUnitConsole/nunit4-console.tests/nunit4-console.tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="NUnit" Version="4.3.2" />
18-
<PackageReference Include="NUnitLite" Version="4.3.2" />
17+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
18+
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
2020
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
21-
<PackageReference Include="NSubstitute" Version="4.3.0" />
22-
<PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
21+
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
22+
<PackageReference Include="NUnit.Analyzers" Version="$(NUnitAnalyzersVersion)" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="NUnit" Version="4.3.2" />
16-
<PackageReference Include="NUnitLite" Version="4.3.2" />
17-
<PackageReference Include="NSubstitute" Version="4.3.0" />
18-
<PackageReference Include="NUnit.Analyzers" Version="4.5.0" />
15+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
16+
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
17+
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
18+
<PackageReference Include="NUnit.Analyzers" Version="$(NUnitAnalyzersVersion)" />
1919
</ItemGroup>
2020

2121
<ItemGroup Condition="'$(TargetFramework)'=='net462'">

‎src/TestData/AppContextTest/AppContextTest.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@
55
<OutputPath>..\..\..\bin\$(Configuration)\testdata\</OutputPath>
66
</PropertyGroup>
77

8-
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
9-
<PackageReference Include="nunit" Version="3.14.0" />
10-
</ItemGroup>
11-
12-
<ItemGroup Condition="'$(TargetFramework)'!='netcoreapp3.1'">
13-
<PackageReference Include="nunit" Version="4.3.2" />
8+
<ItemGroup>
9+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
1410
</ItemGroup>
1511

1612
</Project>

‎src/TestData/InvalidTestNames/InvalidTestNames.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include = "nunit" Version="4.3.2" />
10+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
1111
</ItemGroup>
1212

1313
</Project>

‎src/TestData/aspnetcore-test/aspnetcore-test.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="NUnit" Version="4.3.2" />
10+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
1111
</ItemGroup>
1212

1313
</Project>

‎src/TestData/mock-assembly-x86/mock-assembly-x86.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616
<Description>Assembly used in testing the engine</Description>
1717
</PropertyGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)'=='net462' OR '$(TargetFramework)'=='net6.0' OR '$(TargetFramework)'=='net7.0' OR '$(TargetFramework)'=='net8.0' OR '$(TargetFramework)'=='net9.0'">
20-
<PackageReference Include="NUnit" Version="4.3.2" />
21-
<PackageReference Include="NUnitLite" Version="4.3.2" />
22-
</ItemGroup>
23-
24-
<ItemGroup Condition="'$(TargetFramework)'=='net35' OR '$(TargetFramework)'=='netcoreapp3.1'">
25-
<PackageReference Include="NUnit" Version="3.14.0" />
26-
<PackageReference Include="NUnitLite" Version="3.14.0" />
19+
<ItemGroup>
20+
<PackageReference Include="NUnit" Version="$(NUnitVersion)" />
21+
<PackageReference Include="NUnitLite" Version="$(NUnitVersion)" />
2722
</ItemGroup>
2823

2924
<ItemGroup>

0 commit comments

Comments
 (0)