Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): Bump Microsoft.EntityFrameworkCore.Sqlite from 7.0.11 to 7.0.13 #942

Closed
wants to merge 25 commits into from
Closed

build(deps): Bump Microsoft.EntityFrameworkCore.Sqlite from 7.0.11 to 7.0.13 #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e4f7ed9
build(deps): Bump Microsoft.AspNetCore.Components.WebAssembly
dependabot[bot] Oct 25, 2023
ca99b18
build(deps): Bump Microsoft.AspNetCore.OpenApi from 7.0.12 to 7.0.13
dependabot[bot] Oct 25, 2023
3b7ff05
build(deps): Bump Microsoft.AspNetCore.Mvc.NewtonsoftJson
dependabot[bot] Oct 25, 2023
8bc05b9
build(deps): Bump xunit from 2.5.2 to 2.6.0
dependabot[bot] Nov 1, 2023
9fba487
Merge pull request #935 from pkuehnel/dependabot/nuget/develop/Micros…
pkuehnel Nov 1, 2023
60e36e9
Merge pull request #937 from pkuehnel/dependabot/nuget/develop/Micros…
pkuehnel Nov 1, 2023
9a72a61
Merge pull request #938 from pkuehnel/dependabot/nuget/develop/Micros…
pkuehnel Nov 1, 2023
639936d
Merge pull request #944 from pkuehnel/dependabot/nuget/develop/xunit-…
pkuehnel Nov 1, 2023
df06d65
build(deps): Bump Microsoft.AspNetCore.Components.WebAssembly.Server
dependabot[bot] Nov 1, 2023
0765722
build(deps): Bump Microsoft.AspNetCore.Components.WebAssembly.DevServer
dependabot[bot] Nov 1, 2023
07afb61
Merge pull request #941 from pkuehnel/dependabot/nuget/develop/Micros…
pkuehnel Nov 2, 2023
9b3553c
Merge pull request #940 from pkuehnel/dependabot/nuget/develop/Micros…
pkuehnel Nov 2, 2023
df0c192
build(deps): Bump xunit from 2.6.0 to 2.6.1
dependabot[bot] Nov 3, 2023
1785da1
fix(SolarMqttService): same topic for multiple values could not be ha…
pkuehnel Nov 3, 2023
dcc5782
Merge pull request #949 from pkuehnel/fix/MqttSameTopicForMultipleValues
pkuehnel Nov 3, 2023
83f6efb
feat(TeslaMateMqttService): do not overwrite charger phases with null
pkuehnel Nov 7, 2023
0b92fa0
feat(CICD): use chargerPhases als label instead of alpha
pkuehnel Nov 7, 2023
0c712f9
build(deps): Bump Microsoft.NET.Test.Sdk from 17.7.2 to 17.8.0
dependabot[bot] Nov 9, 2023
a447346
Revert "feat(CICD): use chargerPhases als label instead of alpha"
pkuehnel Nov 9, 2023
889b2ea
build(deps): Bump Serilog.Sinks.Console from 4.1.0 to 5.0.0
dependabot[bot] Nov 10, 2023
47c17a7
Merge pull request #950 from pkuehnel/feat/doNotOverridePhasesWithNull
pkuehnel Nov 10, 2023
8fcc426
Merge pull request #952 from pkuehnel/dependabot/nuget/develop/Serilo…
pkuehnel Nov 10, 2023
ff9e8ae
Merge pull request #948 from pkuehnel/dependabot/nuget/develop/xunit-…
pkuehnel Nov 10, 2023
e5f8686
Merge pull request #951 from pkuehnel/dependabot/nuget/develop/Micros…
pkuehnel Nov 10, 2023
2b1845a
build(deps): Bump Microsoft.EntityFrameworkCore.Sqlite
dependabot[bot] Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Plugins.Modbus/Plugins.Modbus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Plugins.SmaEnergymeter/Plugins.SmaEnergymeter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Quartz" Version="3.7.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Plugins.SolarEdge/Plugins.SolarEdge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions Plugins.Solax/Plugins.Solax.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.13" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion TeslaSolarCharger.Model/TeslaSolarCharger.Model.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
6 changes: 3 additions & 3 deletions TeslaSolarCharger.Tests/TeslaSolarCharger.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

<ItemGroup>
<PackageReference Include="Autofac.Extras.FakeItEasy" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Autofac.Extras.Moq" Version="6.1.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="Moq.EntityFrameworkCore" Version="7.0.0.2" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
<PackageReference Include="xunit" Version="2.5.2" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 2 additions & 2 deletions TeslaSolarCharger/Client/TeslaSolarCharger.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<ItemGroup>
<PackageReference Include="Blazored.Toast" Version="4.1.0" />
<PackageReference Include="Majorsoft.Blazor.Components.Collapse" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.12" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.13" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 3 additions & 7 deletions TeslaSolarCharger/Server/Services/SolarMqttService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public async Task ConnectMqttClient()
_pvValueService.AddOverageValueToInMemoryList((int)_setting.Overage);
}
}
else if (topic == _configurationWrapper.CurrentInverterPowerMqttTopic() && frontendConfiguration.InverterValueSource == SolarValueSource.Mqtt)
if (topic == _configurationWrapper.CurrentInverterPowerMqttTopic() && frontendConfiguration.InverterValueSource == SolarValueSource.Mqtt)
{
var patternType = frontendConfiguration.InverterPowerNodePatternType ?? NodePatternType.Direct;
var jsonPattern = _configurationWrapper.CurrentInverterPowerJsonPattern();
Expand All @@ -92,7 +92,7 @@ public async Task ConnectMqttClient()
_setting.InverterPower = _pvValueService.GetIntegerValueByString(value, jsonPattern, xmlPattern, correctionFactor, patternType,
xmlAttributeHeaderName, xmlAttributeHeaderValue, xmlAttributeValueName);
}
else if (topic == _configurationWrapper.HomeBatterySocMqttTopic() && frontendConfiguration.HomeBatteryValuesSource == SolarValueSource.Mqtt)
if (topic == _configurationWrapper.HomeBatterySocMqttTopic() && frontendConfiguration.HomeBatteryValuesSource == SolarValueSource.Mqtt)
{
var patternType = frontendConfiguration.HomeBatterySocNodePatternType ?? NodePatternType.Direct;
var jsonPattern = _configurationWrapper.HomeBatterySocJsonPattern();
Expand All @@ -104,7 +104,7 @@ public async Task ConnectMqttClient()
_setting.HomeBatterySoc = _pvValueService.GetIntegerValueByString(value, jsonPattern, xmlPattern, correctionFactor, patternType,
xmlAttributeHeaderName, xmlAttributeHeaderValue, xmlAttributeValueName);
}
else if (topic == _configurationWrapper.HomeBatteryPowerMqttTopic() && frontendConfiguration.HomeBatteryValuesSource == SolarValueSource.Mqtt)
if (topic == _configurationWrapper.HomeBatteryPowerMqttTopic() && frontendConfiguration.HomeBatteryValuesSource == SolarValueSource.Mqtt)
{
var patternType = frontendConfiguration.HomeBatteryPowerNodePatternType ?? NodePatternType.Direct;
var jsonPattern = _configurationWrapper.HomeBatteryPowerJsonPattern();
Expand All @@ -116,10 +116,6 @@ public async Task ConnectMqttClient()
_setting.HomeBatteryPower = _pvValueService.GetIntegerValueByString(value, jsonPattern, xmlPattern, correctionFactor, patternType,
xmlAttributeHeaderName, xmlAttributeHeaderValue, xmlAttributeValueName);
}
else
{
_logger.LogWarning("Received value does not match a topic");
}

return Task.CompletedTask;
};
Expand Down
4 changes: 3 additions & 1 deletion TeslaSolarCharger/Server/Services/TeslaMateMqttService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,9 @@ internal void UpdateCar(TeslaMateValue value)
}
else
{
car.CarState.ChargerPhases = null;
//This is needed as TeslaMate sometime sends empty values during charger being connected.
_logger.LogDebug($"{nameof(TopicChargerPhases)} is {value.Value}. Do not overwrite charger phases.");
//car.CarState.ChargerPhases = null;
}
break;
case TopicChargerVoltage:
Expand Down
8 changes: 4 additions & 4 deletions TeslaSolarCharger/Server/TeslaSolarCharger.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@

<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.11">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="MinVer" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -52,7 +52,7 @@
<PackageReference Include="Quartz" Version="3.7.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
Expand Down