Skip to content

Commit aa26546

Browse files
committed
Updates to .NET 8, updates nuget libraries, Fixes Sewage Cases by changing flow type from int to float
1 parent 4c32804 commit aa26546

File tree

8 files changed

+22
-16
lines changed

8 files changed

+22
-16
lines changed

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ In case of failures a notification is set to slack channel #alert through Data A
2929

3030
## Changelog
3131

32+
## 1.23
33+
34+
* Updates .NET to 8.0
35+
* Updates all NuGet libraries
36+
* Fixes Sewage Cases by changing flow type from int to float
37+
3238
## 1.22
3339

3440
* Use NIJZ OPSI deaths for Deceased card in `api/summary` endpoint

appbuild.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Task("IncreaseVersion")
125125

126126
Task("Default")
127127
.Does(() => {
128-
Information("KzsParser build process targets");
128+
Information("Sledilnik Data API build process targets");
129129
foreach (string target in new string[]{"Default", "BuildImage", "GetVersion", "SetVersion", "IncreaseVersion"})
130130
{
131131
Information($"\t{target}");

sources/SloCovidServer/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
22
WORKDIR /app
33

4-
FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
4+
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
55
WORKDIR /src
66
COPY ["SloCovidServer/SloCovidServer.csproj", "SloCovidServer/"]
77
RUN dotnet restore "SloCovidServer/SloCovidServer.csproj"

sources/SloCovidServer/SloCovidServer/Mappers/SewageWeeklyCasesMapper.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public ImmutableArray<SewageWeeklyCases> GetSewageWeeklyCasesFromRaw(string raw)
3838
var item = new SewageWeeklyCases(
3939
date.Year, date.Month, date.Day,
4040
fields[stationIndex],
41-
GetInt(fields[flowIndex]),
41+
GetFloat(fields[flowIndex]),
4242
n3,
4343
GetInt(fields[codIndex]),
4444
cases,

sources/SloCovidServer/SloCovidServer/Models/SewageWeeklyCases.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace SloCovidServer.Models;
22

3-
public record SewageWeeklyCases(int Year, int Month, int Day, string Station, int? Flow, SewageN3 N3,
3+
public record SewageWeeklyCases(int Year, int Month, int Day, string Station, float? Flow, SewageN3 N3,
44
int? Cod, SewageCase Cases, float? Lat, float? Lon, string Region, int? Population, float? CoverageRatio) : IModelDate;
55

66
public record SewageN3(float? Raw, float? Norm);

sources/SloCovidServer/SloCovidServer/SloCovidServer.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -11,9 +11,9 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
14-
<PackageReference Include="Polly" Version="7.2.3" />
14+
<PackageReference Include="Polly" Version="8.4.1" />
1515
<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
16-
<PackageReference Include="prometheus-net.AspNetCore" Version="7.0.0" />
16+
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
1717
<PackageReference Include="Righthand.Immutable" Version="1.0.2" />
1818
</ItemGroup>
1919

sources/SloCovidServer/Test/SloCovidServer.Test/SloCovidServer.Test.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
9-
<PackageReference Include="NUnit" Version="3.13.3" />
10-
<PackageReference Include="AutoFixture" Version="4.18.0" />
11-
<PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
13-
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
9+
<PackageReference Include="NUnit" Version="4.2.0" />
10+
<PackageReference Include="AutoFixture" Version="4.18.1" />
11+
<PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
13+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="NSubstitute" Version="5.0.0" />
17+
<PackageReference Include="NSubstitute" Version="5.1.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

version.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<version>1.22</version>
2+
<version>1.23</version>

0 commit comments

Comments
 (0)