Skip to content

Commit a7b364b

Browse files
committed
Upgrade packages
1 parent 71ac786 commit a7b364b

6 files changed

Lines changed: 64 additions & 51 deletions

File tree

Directory.Packages.props

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@
77
<PackageVersion Include="AsyncFixer" Version="1.6.0" />
88
<PackageVersion Include="AwesomeAssertions.Analyzers" Version="9.0.0" />
99
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
10-
<PackageVersion Include="coverlet.collector" Version="3.2.0">
10+
<PackageVersion Include="coverlet.collector" Version="6.0.4">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageVersion>
1414
<PackageVersion Include="coverlet.msbuild" Version="3.2.0">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageVersion>
18-
<PackageVersion Include="Dapper" Version="2.0.123" />
19-
<PackageVersion Include="dbup-sqlite" Version="5.0.8" />
18+
<PackageVersion Include="Dapper" Version="2.1.66" />
19+
<PackageVersion Include="dbup-sqlite" Version="6.0.1" />
2020
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
2121
<PackageVersion Include="ExifLibNet" Version="2.1.4" />
2222
<PackageVersion Include="Extend" Version="1.2.1" />
2323
<PackageVersion Include="AwesomeAssertions" Version="9.0.0" />
24-
<PackageVersion Include="FluentValidation" Version="11.5.2" />
25-
<PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
24+
<PackageVersion Include="FluentValidation" Version="12.0.0" />
25+
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
2626
<PackageVersion Include="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" />
27-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.5" />
28-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
31-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
27+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.6" />
28+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
30+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
31+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
3232
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
33-
<PackageVersion Include="nunit" Version="3.13.3" />
34-
<PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
35-
<PackageVersion Include="Sentry" Version="3.30.0" />
36-
<PackageVersion Include="Sentry.Serilog" Version="3.30.0" />
37-
<PackageVersion Include="Serilog" Version="2.12.0" />
33+
<PackageVersion Include="nunit" Version="4.3.2" />
34+
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
35+
<PackageVersion Include="Sentry" Version="5.11.2" />
36+
<PackageVersion Include="Sentry.Serilog" Version="5.11.2" />
37+
<PackageVersion Include="Serilog" Version="4.3.0" />
3838
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
39-
<PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
40-
<PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
39+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
40+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
4141
<PackageVersion Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
4242
<PackageVersion Include="ShellProgressBar" Version="5.2.0" />
4343
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.10" />
4444
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.12.0.118525">
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageVersion>
48-
<PackageVersion Include="TimeZoneConverter" Version="6.1.0" />
49-
<PackageVersion Include="WorkflowCore" Version="3.8.2" />
48+
<PackageVersion Include="TimeZoneConverter" Version="7.0.0" />
49+
<PackageVersion Include="WorkflowCore" Version="3.14.0" />
5050
<PackageVersion Include="WorkflowCore.Testing" Version="3.8.2" />
5151
</ItemGroup>
5252
</Project>

Sanchez.Processing/Services/Database/DatabaseMigrator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public void Migrate(string connectionString)
1818
{
1919
var upgrader =
2020
DeployChanges.To
21-
.SQLiteDatabase(connectionString)
21+
.SqliteDatabase(connectionString)
2222
.WithScriptsEmbeddedInAssembly(Assembly.GetExecutingAssembly())
23-
.LogToAutodetectedLog()
23+
.LogToConsole()
2424
.Build();
2525

2626
var result = upgrader.PerformUpgrade();

Tests/Sanchez.Processing.Test/Filesystem/FilenameParsers/AbstractFilenameParserTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
namespace Sanchez.Processing.Test.Filesystem.FilenameParsers;
77

8+
#nullable enable
9+
810
public abstract class AbstractFilenameParserTests : AbstractTests
911
{
1012
protected static SatelliteDefinition NewDefinition(FilenameParserType filenameParserType, string? prefix = null, string? suffix = null)

Tests/Sanchez.Processing.Test/Services/OptionsParserTests.cs

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Sanchez.Models.CommandLine;
1+
using AwesomeAssertions.Execution;
2+
using Sanchez.Models.CommandLine;
23
using Sanchez.Processing.Models;
34
using Sanchez.Processing.Models.Configuration;
45
using Sanchez.Processing.Models.Options;
@@ -26,16 +27,20 @@ public void PopulateGeostationary()
2627
};
2728

2829
var renderOptions = OptionsParser.Populate(options);
29-
Assert.NotNull(renderOptions.GeostationaryRender);
3030

31-
renderOptions.GeostationaryRender!.Longitude.Should().Be(Angle.FromDegrees(147).Radians);
32-
renderOptions.GeostationaryRender.AtmosphereAmount.Should().Be(0.5f);
33-
renderOptions.InterpolationType.Should().Be(InterpolationType.NearestNeighbour);
34-
renderOptions.ImageSize.Should().Be(Constants.Satellite.ImageSize.TwoKm);
35-
renderOptions.ImageOffset.Should().Be(Constants.Satellite.Offset.TwoKm);
36-
renderOptions.Force.Should().BeFalse();
37-
renderOptions.Verbose.Should().BeFalse();
38-
renderOptions.Quiet.Should().BeTrue();
31+
using (new AssertionScope())
32+
{
33+
renderOptions.GeostationaryRender.Should().NotBeNull();
34+
35+
renderOptions.GeostationaryRender!.Longitude.Should().Be(Angle.FromDegrees(147).Radians);
36+
renderOptions.GeostationaryRender.AtmosphereAmount.Should().Be(0.5f);
37+
renderOptions.InterpolationType.Should().Be(InterpolationType.NearestNeighbour);
38+
renderOptions.ImageSize.Should().Be(Constants.Satellite.ImageSize.TwoKm);
39+
renderOptions.ImageOffset.Should().Be(Constants.Satellite.Offset.TwoKm);
40+
renderOptions.Force.Should().BeFalse();
41+
renderOptions.Verbose.Should().BeFalse();
42+
renderOptions.Quiet.Should().BeTrue();
43+
}
3944
}
4045

4146
[Test]
@@ -57,28 +62,32 @@ public void PopulateEquirectangular()
5762
};
5863

5964
var renderOptions = OptionsParser.Populate(options);
60-
Assert.NotNull(renderOptions.EquirectangularRender);
6165

62-
renderOptions.EquirectangularRender!.AutoCrop.Should().BeTrue();
66+
using (new AssertionScope())
67+
{
68+
renderOptions.EquirectangularRender.Should().NotBeNull();
69+
70+
renderOptions.EquirectangularRender!.AutoCrop.Should().BeTrue();
6371

64-
Assert.NotNull(renderOptions.EquirectangularRender.LatitudeRange);
65-
Assert.NotNull(renderOptions.EquirectangularRender.LongitudeRange);
72+
renderOptions.EquirectangularRender.LatitudeRange.Should().NotBeNull();
73+
renderOptions.EquirectangularRender.LongitudeRange.Should().NotBeNull();
6674

67-
renderOptions.EquirectangularRender.LatitudeRange!.Value.Start.Should().Be(Angle.FromDegrees(-50).Radians);
68-
renderOptions.EquirectangularRender.LatitudeRange!.Value.End.Should().Be(Angle.FromDegrees(50).Radians);
75+
renderOptions.EquirectangularRender.LatitudeRange!.Value.Start.Should().Be(Angle.FromDegrees(-50).Radians);
76+
renderOptions.EquirectangularRender.LatitudeRange!.Value.End.Should().Be(Angle.FromDegrees(50).Radians);
6977

70-
renderOptions.EquirectangularRender.LongitudeRange!.Value.Start.Should().Be(Angle.FromDegrees(-180).Radians);
71-
renderOptions.EquirectangularRender.LongitudeRange!.Value.End.Should().Be(Angle.FromDegrees(180).Radians);
78+
renderOptions.EquirectangularRender.LongitudeRange!.Value.Start.Should().Be(Angle.FromDegrees(-180).Radians);
79+
renderOptions.EquirectangularRender.LongitudeRange!.Value.End.Should().Be(Angle.FromDegrees(180).Radians);
7280

73-
renderOptions.SpatialResolution.Should().Be(Constants.Satellite.SpatialResolution.FourKm);
74-
renderOptions.Tint.Should().Be(Color.FromRgb(255, 0, 0));
75-
renderOptions.InterpolationType.Should().Be(InterpolationType.Bilinear);
76-
renderOptions.ImageSize.Should().Be(Constants.Satellite.ImageSize.FourKm);
77-
renderOptions.ImageOffset.Should().Be(Constants.Satellite.Offset.FourKm);
78-
renderOptions.Interval.Should().Be(TimeSpan.FromMinutes(30));
79-
renderOptions.Brightness.Should().Be(1.2f);
80-
renderOptions.Saturation.Should().Be(0.5f);
81-
renderOptions.Force.Should().BeTrue();
82-
renderOptions.Verbose.Should().BeTrue();
81+
renderOptions.SpatialResolution.Should().Be(Constants.Satellite.SpatialResolution.FourKm);
82+
renderOptions.Tint.Should().Be(Color.FromRgb(255, 0, 0));
83+
renderOptions.InterpolationType.Should().Be(InterpolationType.Bilinear);
84+
renderOptions.ImageSize.Should().Be(Constants.Satellite.ImageSize.FourKm);
85+
renderOptions.ImageOffset.Should().Be(Constants.Satellite.Offset.FourKm);
86+
renderOptions.Interval.Should().Be(TimeSpan.FromMinutes(30));
87+
renderOptions.Brightness.Should().Be(1.2f);
88+
renderOptions.Saturation.Should().Be(0.5f);
89+
renderOptions.Force.Should().BeTrue();
90+
renderOptions.Verbose.Should().BeTrue();
91+
}
8392
}
8493
}

Tests/Sanchez.Processing.Test/Services/SatelliteRegistryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ namespace Sanchez.Processing.Test.Services;
77
public class SatelliteRegistryTests : AbstractTests
88
{
99
[Test]
10-
[Timeout(2000)]
11-
public void PerformanceTest()
10+
[CancelAfter(2000)]
11+
public void PerformanceTest(CancellationToken ct)
1212
{
1313
for (var i = 0; i < 10000; i++)
1414
{

Tests/Sanchez.Processing.Test/Validators/AbstractValidatorTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace Sanchez.Processing.Test.Validators;
66

7+
#nullable enable
8+
79
public abstract class AbstractValidatorTests<T, TOptions> : AbstractTests
810
where T : CommandLineOptionsValidator<TOptions>, new()
911
where TOptions : CommandLineOptions

0 commit comments

Comments
 (0)