Skip to content

Commit f5cfede

Browse files
committed
Merge branch 'release/v2.1'
2 parents ff9fd86 + d13f6fa commit f5cfede

40 files changed

+102
-336
lines changed

WeatherControl/Wissance.WeatherControl.Data/Wissance.WeatherControl.Data.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
<PropertyGroup>
44
<Nullable>disable</Nullable>
5-
<TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
5+
<TargetFrameworks>net6.0</TargetFrameworks>
66
</PropertyGroup>
7-
<ItemGroup>
8-
<PackageReference Include="Wissance.WebApiToolkit" Version="1.6.0" />
7+
8+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
9+
<PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.0.0" />
910
</ItemGroup>
1011

1112
</Project>

WeatherControl/Wissance.WeatherControl.EdgeDb.Data/Wissance.WeatherControl.EdgeDb.Data.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<PackageReference Include="EdgeDB.Net.Driver" Version="1.2.3" />
9-
<PackageReference Include="Wissance.WebApiToolkit" Version="1.6.0" />
109
</ItemGroup>
1110

1211
<ItemGroup>

WeatherControl/Wissance.WeatherControl.Ef.Data/Entity/MeasureUnitEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Wissance.WeatherControl.Data.Entity
55
{
66
public class MeasureUnitEntity : IMeasureUnit
77
{
8-
public Guid Id { get; }
8+
public Guid Id { get; set; }
99
public string Name { get; set; }
1010
public string Description { get; set; }
1111
public string Abbreviation { get; set; }

WeatherControl/Wissance.WeatherControl.Ef.Data/Entity/MeasurementEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace Wissance.WeatherControl.Data.Entity
55
{
66
public class MeasurementEntity : IMeasurement
77
{
8-
public Guid Id { get; }
8+
public Guid Id { get; set; }
99
public DateTimeOffset SampleDate { get; set; }
1010
public decimal Value { get; set; }
1111
public Guid SensorId { get; set; }

WeatherControl/Wissance.WeatherControl.Ef.Data/Entity/SensorEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Wissance.WeatherControl.Data.Entity
66
{
77
public class SensorEntity : ISensor<MeasureUnitEntity, MeasurementEntity>
88
{
9-
public Guid Id { get; }
9+
public Guid Id { get; set; }
1010
public string Name { get; set; }
1111
public string Description { get; set; }
1212
public string Latitude { get; set; }

WeatherControl/Wissance.WeatherControl.Ef.Data/Entity/StationEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Wissance.WeatherControl.Data.Entity
66
{
77
public class StationEntity : IStation<SensorEntity, MeasureUnitEntity, MeasurementEntity>
88
{
9-
public Guid Id { get; }
9+
public Guid Id { get; set; }
1010
public string Name { get; set; }
1111
public string Description { get; set; }
1212
public string Longitude { get; set; }

WeatherControl/Wissance.WeatherControl.Ef.Data/Tools/MigrationsDbContextFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Microsoft.EntityFrameworkCore;
55
using Microsoft.EntityFrameworkCore.Design;
66
using Microsoft.Extensions.Options;
7-
using Wissance.WebApiToolkit.Data.Tools;
7+
using Wissance.WebApiToolkit.Data.Ef.Tools;
88

99
namespace Wissance.WeatherControl.Data.Tools
1010
{

WeatherControl/Wissance.WeatherControl.Ef.Data/Wissance.WeatherControl.Ef.Data.csproj

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<RootNamespace>Wissance.WeatherControl.Data</RootNamespace>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.2" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.2" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.2" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2" />
14-
<PackageReference Include="Wissance.WebApiToolkit" Version="1.6.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.20">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.20" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.20">
17+
<PrivateAssets>all</PrivateAssets>
18+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
19+
</PackageReference>
20+
<PackageReference Include="Wissance.WebApiToolkit.Data.Ef" Version="5.0.0" />
1521
</ItemGroup>
1622

1723
<ItemGroup>

WeatherControl/Wissance.WeatherControl.WebApi.V2/Controllers/MeasureUnitController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using EdgeDB;
3-
using Wissance.WebApiToolkit.Controllers;
43
using Wissance.WeatherControl.Dto;
54
using Wissance.WeatherControl.EdgeDb.Data;
65
using Wissance.WeatherControl.EdgeDb.Data.Entity;
76
using Wissance.WeatherControl.WebApi.V2.Factories;
87
using Wissance.WeatherControl.WebApi.V2.Filters;
98
using Wissance.WeatherControl.WebApi.V2.Managers;
9+
using Wissance.WebApiToolkit.Core.Controllers;
1010

1111
namespace Wissance.WeatherControl.WebApi.V2.Controllers
1212
{

WeatherControl/Wissance.WeatherControl.WebApi.V2/Controllers/MeasurementController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Wissance.WeatherControl.WebApi.V2.Factories;
77
using Wissance.WeatherControl.WebApi.V2.Filters;
88
using Wissance.WeatherControl.WebApi.V2.Managers;
9-
using Wissance.WebApiToolkit.Controllers;
9+
using Wissance.WebApiToolkit.Core.Controllers;
1010

1111
namespace Wissance.WeatherControl.WebApi.V2.Controllers
1212
{

0 commit comments

Comments
 (0)