Skip to content

Commit

Permalink
Updates to .NET 8, updates nuget libraries, Fixes Sewage Cases by cha…
Browse files Browse the repository at this point in the history
…nging flow type from int to float
  • Loading branch information
MihaMarkic committed Aug 23, 2024
1 parent 4c32804 commit aa26546
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 16 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ In case of failures a notification is set to slack channel #alert through Data A

## Changelog

## 1.23

* Updates .NET to 8.0
* Updates all NuGet libraries
* Fixes Sewage Cases by changing flow type from int to float

## 1.22

* Use NIJZ OPSI deaths for Deceased card in `api/summary` endpoint
Expand Down
2 changes: 1 addition & 1 deletion appbuild.cake
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Task("IncreaseVersion")

Task("Default")
.Does(() => {
Information("KzsParser build process targets");
Information("Sledilnik Data API build process targets");
foreach (string target in new string[]{"Default", "BuildImage", "GetVersion", "SetVersion", "IncreaseVersion"})
{
Information($"\t{target}");
Expand Down
4 changes: 2 additions & 2 deletions sources/SloCovidServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
WORKDIR /src
COPY ["SloCovidServer/SloCovidServer.csproj", "SloCovidServer/"]
RUN dotnet restore "SloCovidServer/SloCovidServer.csproj"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public ImmutableArray<SewageWeeklyCases> GetSewageWeeklyCasesFromRaw(string raw)
var item = new SewageWeeklyCases(
date.Year, date.Month, date.Day,
fields[stationIndex],
GetInt(fields[flowIndex]),
GetFloat(fields[flowIndex]),
n3,
GetInt(fields[codIndex]),
cases,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace SloCovidServer.Models;

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

public record SewageN3(float? Raw, float? Norm);
Expand Down
6 changes: 3 additions & 3 deletions sources/SloCovidServer/SloCovidServer/SloCovidServer.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Polly" Version="7.2.3" />
<PackageReference Include="Polly" Version="8.4.1" />
<PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="7.0.0" />
<PackageReference Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageReference Include="Righthand.Immutable" Version="1.0.2" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="AutoFixture" Version="4.18.0" />
<PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
<PackageReference Include="NUnit" Version="4.2.0" />
<PackageReference Include="AutoFixture" Version="4.18.1" />
<PackageReference Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="NSubstitute" Version="5.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion version.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<version>1.22</version>
<version>1.23</version>

0 comments on commit aa26546

Please sign in to comment.