ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-13 17:22:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET Core 3.1 and apply Roslyn suggestions

Browse Source
This commit is contained in:
Chris Kaczor
2020-07-18 16:41:01 +00:00
parent e893299224
commit de0d6cdc82
20 changed files with 169 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Power/Service/Data/Database.cs
View File

@@ -38,7 +38,7 @@ namespace ChrisKaczor.HomeMonitor.Power.Service.Data
var databaseExists = (bool?)command.ExecuteScalar();
// Create database if needed
if (!databaseExists.GetValueOrDefault(false))
if (!(databaseExists ?? false))
{
command.CommandText = $"CREATE DATABASE {_configuration["Power:Database:Name"]}";
command.ExecuteNonQuery();

4
Power/Service/PowerReader.cs
View File

@@ -49,8 +49,8 @@ namespace ChrisKaczor.HomeMonitor.Power.Service
var sample = JsonSerializer.Deserialize<PowerSample>(response.Content);
var generation = sample.Channels.FirstOrDefault(c => c.Type == "GENERATION");
var consumption = sample.Channels.FirstOrDefault(c => c.Type == "CONSUMPTION");
var generation = Array.Find(sample.Channels, c => c.Type == "GENERATION");
var consumption = Array.Find(sample.Channels, c => c.Type == "CONSUMPTION");
if (generation == null || consumption == null)
return;

5
Power/Service/Program.cs
View File

@@ -13,10 +13,7 @@ namespace ChrisKaczor.HomeMonitor.Power.Service
private static IWebHostBuilder CreateWebHostBuilder(string[] args)
{
return WebHost.CreateDefaultBuilder(args).ConfigureAppConfiguration((hostingContext, config) =>
{
config.AddEnvironmentVariables();
}).UseStartup<Startup>();
return WebHost.CreateDefaultBuilder(args).ConfigureAppConfiguration((_, config) => config.AddEnvironmentVariables()).UseStartup<Startup>();
}
}
}

4
Power/Service/Service.csproj
View File

@@ -1,10 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
<AssemblyName>ChrisKaczor.HomeMonitor.Power.Service</AssemblyName>
<RootNamespace>ChrisKaczor.HomeMonitor.Power.Service</RootNamespace>
<CodeAnalysisRuleSet>../../ChrisKaczor.ruleset</CodeAnalysisRuleSet>
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
</PropertyGroup>
<ItemGroup>

10
Power/Service/Startup.cs
View File

@@ -17,10 +17,7 @@ namespace ChrisKaczor.HomeMonitor.Power.Service
services.AddHostedService<PowerReader>();
services.Configure<GzipCompressionProviderOptions>(options =>
{
options.Level = CompressionLevel.Optimal;
});
services.Configure<GzipCompressionProviderOptions>(options => options.Level = CompressionLevel.Optimal);
services.AddResponseCompression(options =>
{
@@ -47,10 +44,7 @@ namespace ChrisKaczor.HomeMonitor.Power.Service
applicationBuilder.UseRouting();
applicationBuilder.UseEndpoints(endpoints =>
{
endpoints.MapDefaultControllerRoute();
});
applicationBuilder.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
}
}
}