Updated build configuration and a few code cleanup tasks

Author: i8beef

appveyor.yml

@@ -0,0 +1,28 @@
+version: 1.0.0.{build}
+branches:
+  only:
+  - master
+skip_tags: true
+image: Visual Studio 2019
+configuration: Release
+dotnet_csproj:
+  patch: true
+  file: '**\*.csproj'
+  version: '{version}'
+  version_prefix: '{version}'
+  package_version: '{version}'
+  assembly_version: '{version}'
+  file_version: '{version}'
+  informational_version: '{version}'
+build_script:
+- ps: >-
+    dotnet restore src/HomeAutio.Mqtt.Ecobee.sln
+
+    dotnet publish -c Release src/HomeAutio.Mqtt.Ecobee.sln
+artifacts:
+- path: src\HomeAutio.Mqtt.Ecobee\bin\$(configuration)\netcoreapp3.1\publish
+  name: HomeAutio.Mqtt.Ecobee-$(appveyor_build_version)
+deploy:
+- provider: GitHub
+  auth_token: $(GITHUB_API_KEY)
+  artifact: src\HomeAutio.Mqtt.Ecobee\bin\$(configuration)\netcoreapp3.1\HomeAutio.Mqtt.Ecobee-$(appveyor_build_version).zip

src/HomeAutio.Mqtt.Ecobee/EcobeeMqttService.cs

@@ -12,6 +12,7 @@
 using I8Beef.Ecobee.Protocol.Thermostat;
 using Microsoft.Extensions.Logging;
 using MQTTnet;
+using MQTTnet.Extensions.ManagedClient;
 
 namespace HomeAutio.Mqtt.Ecobee
 {
@@ -23,14 +24,13 @@ public class EcobeeMqttService : ServiceBase
         private readonly ILogger<EcobeeMqttService> _log;
 
         private readonly Client _client;
-        private readonly string _ecobeeName;
 
         private readonly IDictionary<string, RevisionStatus> _revisionStatusCache;
         private readonly IDictionary<string, ThermostatStatus> _thermostatStatus;
+        private readonly int _refreshInterval;
 
         private bool _disposed = false;
         private System.Timers.Timer _refresh;
-        private int _refreshInterval;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EcobeeMqttService"/> class.
@@ -53,15 +53,14 @@ public EcobeeMqttService(
             SubscribedTopics.Add(TopicRoot + "/+/+/set");
 
             _client = ecobeeClient;
-            _ecobeeName = ecobeeName;
             _revisionStatusCache = new Dictionary<string, RevisionStatus>();
             _thermostatStatus = new Dictionary<string, ThermostatStatus>();
         }
 
         #region Service implementation
 
         /// <inheritdoc />
-        protected override async Task StartServiceAsync(CancellationToken cancellationToken = default(CancellationToken))
+        protected override async Task StartServiceAsync(CancellationToken cancellationToken = default)
         {
             await GetInitialStatusAsync()
                 .ConfigureAwait(false);
@@ -79,7 +78,7 @@ await GetInitialStatusAsync()
         }
 
         /// <inheritdoc />
-        protected override Task StopServiceAsync(CancellationToken cancellationToken = default(CancellationToken))
+        protected override Task StopServiceAsync(CancellationToken cancellationToken = default)
         {
             return Task.CompletedTask;
         }
@@ -91,9 +90,8 @@ await GetInitialStatusAsync()
         /// <summary>
         /// Handles commands for the Harmony published to MQTT.
         /// </summary>
-        /// <param name="sender">Event sender.</param>
         /// <param name="e">Event args.</param>
-        protected override async void Mqtt_MqttMsgPublishReceived(object sender, MqttApplicationMessageReceivedEventArgs e)
+        protected override async void Mqtt_MqttMsgPublishReceived(MqttApplicationMessageReceivedEventArgs e)
         {
             var message = Encoding.UTF8.GetString(e.ApplicationMessage.Payload);
             _log.LogInformation("MQTT message received for topic " + e.ApplicationMessage.Topic + ": " + message);

src/HomeAutio.Mqtt.Ecobee/HomeAutio.Mqtt.Ecobee.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageProjectUrl>https://github.com/i8beef/HomeAutio.Mqtt.Ecobee</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/i8beef/HomeAutio.Mqtt.Ecobee/blob/master/LICENSE</PackageLicenseUrl>
     <Company></Company>
@@ -15,11 +15,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\netcoreapp2.1\HomeAutio.Mqtt.Ecobee.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\netcoreapp2.1\HomeAutio.Mqtt.Ecobee.xml</DocumentationFile>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,12 +32,12 @@
     <PackageReference Include="I8Beef.CodeAnalysis.RuleSet" Version="1.0.15">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="HomeAutio.Mqtt.Core" Version="3.0.0.51" />
-    <PackageReference Include="I8Beef.Ecobee" Version="2.2.0.66" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.1" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="2.6.1" />
+    <PackageReference Include="HomeAutio.Mqtt.Core" Version="3.0.0.57" />
+    <PackageReference Include="I8Beef.Ecobee" Version="2.2.0.68" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
   </ItemGroup>

src/HomeAutio.Mqtt.Ecobee/Program.cs

@@ -24,18 +24,8 @@ public class Program
         /// <summary>
         /// Main program entry point.
         /// </summary>
-        /// <param name="args">Arguments.</param>
-        public static void Main(string[] args)
-        {
-            MainAsync(args).GetAwaiter().GetResult();
-        }
-
-        /// <summary>
-        /// Main program entry point.
-        /// </summary>
-        /// <param name="args">Arguments.</param>
         /// <returns>Awaitable <see cref="Task" />.</returns>
-        public static async Task MainAsync(string[] args)
+        public static async Task Main()
         {
             var environmentName = Environment.GetEnvironmentVariable("ENVIRONMENT");
             if (string.IsNullOrEmpty(environmentName))
@@ -163,7 +153,7 @@ private static IHostBuilder CreateHostBuilder(IConfiguration config)
         /// <param name="storedAuthToken">Stored auth token.</param>
         /// <param name="cancellationToken">Cancellation token.</param>
         /// <returns>An awaitable <see cref="Task"/>.</returns>
-        private static async Task WriteTokenFileAsync(StoredAuthToken storedAuthToken, CancellationToken cancellationToken = default(CancellationToken))
+        private static async Task WriteTokenFileAsync(StoredAuthToken storedAuthToken, CancellationToken cancellationToken = default)
         {
             // Cache the returned tokens
             _currentAuthToken = storedAuthToken;
@@ -182,7 +172,7 @@ private static IHostBuilder CreateHostBuilder(IConfiguration config)
         /// </summary>
         /// <param name="cancellationToken">Cancellation token.</param>
         /// <returns>The <see cref="StoredAuthToken"/>.</returns>
-        private static async Task<StoredAuthToken> ReadTokenFileAsync(CancellationToken cancellationToken = default(CancellationToken))
+        private static async Task<StoredAuthToken> ReadTokenFileAsync(CancellationToken cancellationToken = default)
         {
             if (_currentAuthToken == null && File.Exists(@"token.txt"))
             {