Merge pull request #154 from mcrossley/master

v3.20.0
cumulusmx · Aug 18, 2022 · 1d275ee · 1d275ee
2 parents e6aa6f9 + aee8234
commit 1d275ee
Show file tree

Hide file tree

Showing 30 changed files with 2,645 additions and 1,328 deletions.
diff --git a/CumulusMX/Alarm.cs b/CumulusMX/Alarm.cs
diff --git a/CumulusMX/AlarmSettings.cs b/CumulusMX/AlarmSettings.cs
diff --git a/CumulusMX/Api.cs b/CumulusMX/Api.cs
diff --git a/CumulusMX/App.config b/CumulusMX/App.config
@@ -4,7 +4,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
   <runtime>
-	<GCConserveMemory enabled="6"/>
+	<GCConserveMemory enabled="6" />
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 		<dependentAssembly>
 			<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/CumulusMX/Cumulus.cs b/CumulusMX/Cumulus.cs
diff --git a/CumulusMX/CumulusMX.csproj b/CumulusMX/CumulusMX.csproj
@@ -110,17 +110,17 @@
     <Reference Include="MimeKit, Version=3.3.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
       <HintPath>..\packages\MimeKit.3.3.0\lib\net48\MimeKit.dll</HintPath>
     </Reference>
-    <Reference Include="MQTTnet, Version=4.0.1.184, Culture=neutral, PublicKeyToken=fdb7629f2e364a63, processorArchitecture=MSIL">
-      <HintPath>..\packages\MQTTnet.4.0.1.184\lib\net461\MQTTnet.dll</HintPath>
+    <Reference Include="MQTTnet, Version=4.0.2.221, Culture=neutral, PublicKeyToken=fdb7629f2e364a63, processorArchitecture=MSIL">
+      <HintPath>..\packages\MQTTnet.4.0.2.221\lib\net461\MQTTnet.dll</HintPath>
     </Reference>
     <Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySqlConnector.2.1.10\lib\net471\MySqlConnector.dll</HintPath>
+      <HintPath>..\packages\MySqlConnector.2.1.11\lib\net471\MySqlConnector.dll</HintPath>
     </Reference>
     <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
       <HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=6.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.Text.6.1.0\lib\net472\ServiceStack.Text.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Text.6.2.0\lib\net472\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="Swan.Lite, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30c707c872729fff, processorArchitecture=MSIL">
       <HintPath>..\packages\Unosquare.Swan.Lite.3.0.0\lib\net461\Swan.Lite.dll</HintPath>
@@ -219,6 +219,7 @@
     <Compile Include="MoonriseMoonset.cs" />
     <Compile Include="MqttPublisher.cs" />
     <Compile Include="MysqlSettings.cs" />
+    <Compile Include="MySQLTable.cs" />
     <Compile Include="NOAA.cs" />
     <Compile Include="NOAAReports.cs" />
     <Compile Include="AlarmSettings.cs" />