diff --git a/test/Directory.Build.props b/test/Directory.Build.props index e52ec6b5..21b83c46 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,6 +1,6 @@ - + false latest true @@ -9,13 +9,21 @@ ..\..\Squirrel.snk false enable + + + json,opencover + ..\ + ..\coverage.json + [Squirrel*]* + [Squirrel.*.Tests]* + true - + - + @@ -28,13 +36,4 @@ - - json,opencover - ..\ - ..\coverage.json - [Squirrel*]* - [Squirrel.*.Tests]* - true - - diff --git a/test/Squirrel.CommandLine.Tests/Squirrel.CommandLine.Tests.csproj b/test/Squirrel.CommandLine.Tests/Squirrel.CommandLine.Tests.csproj index 4707983d..ff2367fc 100644 --- a/test/Squirrel.CommandLine.Tests/Squirrel.CommandLine.Tests.csproj +++ b/test/Squirrel.CommandLine.Tests/Squirrel.CommandLine.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net8.0 enable enable diff --git a/test/Squirrel.Packaging.Tests/Squirrel.Packaging.Tests.csproj b/test/Squirrel.Packaging.Tests/Squirrel.Packaging.Tests.csproj index ba2d92a8..7179c405 100644 --- a/test/Squirrel.Packaging.Tests/Squirrel.Packaging.Tests.csproj +++ b/test/Squirrel.Packaging.Tests/Squirrel.Packaging.Tests.csproj @@ -1,7 +1,7 @@  - net6.0 + net6.0;net8.0 diff --git a/test/Squirrel.Tests/Squirrel.Tests.csproj b/test/Squirrel.Tests/Squirrel.Tests.csproj index 3536b956..b0d190e3 100644 --- a/test/Squirrel.Tests/Squirrel.Tests.csproj +++ b/test/Squirrel.Tests/Squirrel.Tests.csproj @@ -2,13 +2,21 @@ - net6.0 + net462;net48;net6.0;net8.0 + + + + + + + + diff --git a/test/Squirrel.Tests/TestHelpers/FakeFixtureRepository.cs b/test/Squirrel.Tests/TestHelpers/FakeFixtureRepository.cs index 6c058290..f9730630 100644 --- a/test/Squirrel.Tests/TestHelpers/FakeFixtureRepository.cs +++ b/test/Squirrel.Tests/TestHelpers/FakeFixtureRepository.cs @@ -19,9 +19,9 @@ namespace Squirrel.Tests.TestHelpers .ToList(); if (mockLatestFullVer) { - var minFullVer = releases.Where(r => !r.IsDelta).MinBy(r => r.Version); - var maxfullVer = releases.Where(r => !r.IsDelta).MaxBy(r => r.Version).Single(); - var maxDeltaVer = releases.Where(r => r.IsDelta).MaxBy(r => r.Version).Single(); + var minFullVer = releases.Where(r => !r.IsDelta).OrderBy(r => r.Version).First(); + var maxfullVer = releases.Where(r => !r.IsDelta).OrderByDescending(r => r.Version).First(); + var maxDeltaVer = releases.Where(r => r.IsDelta).OrderByDescending(r => r.Version).First(); // our fixtures don't have a full package for the latest version, we expect the tests to generate this file if (maxfullVer.Version < maxDeltaVer.Version) {