diff --git a/CumulusMX/CumulusMX.csproj b/CumulusMX/CumulusMX.csproj index 37cd9049..d1ded79f 100644 --- a/CumulusMX/CumulusMX.csproj +++ b/CumulusMX/CumulusMX.csproj @@ -85,8 +85,8 @@ ..\packages\Portable.BouncyCastle.1.8.10\lib\net40\BouncyCastle.Crypto.dll - - ..\packages\FluentFTP.35.0.5\lib\net45\FluentFTP.dll + + ..\packages\FluentFTP.32.3.1\lib\net45\FluentFTP.dll ..\packages\HidSharp.2.1.0\lib\net35\HidSharp.dll diff --git a/CumulusMX/DavisWllStation.cs b/CumulusMX/DavisWllStation.cs index 788b36b2..610556d2 100644 --- a/CumulusMX/DavisWllStation.cs +++ b/CumulusMX/DavisWllStation.cs @@ -2979,7 +2979,8 @@ private void GetAvailableStationIds(bool logToConsole = false) { responseBody = response.Content.ReadAsStringAsync().Result; responseCode = (int)response.StatusCode; - cumulus.LogDebugMessage($"WLLStations: WeatherLink API Response: {responseCode}: {responseBody}"); + var resp = System.Text.RegularExpressions.Regex.Replace(responseBody, "user_email\":\"[^\"]*\"", "user_email\":\"<>\""); + cumulus.LogDebugMessage($"WLLStations: WeatherLink API Response: {responseCode}: {resp}"); } if (responseCode != 200) diff --git a/CumulusMX/Properties/AssemblyInfo.cs b/CumulusMX/Properties/AssemblyInfo.cs index c0a8690d..3832adbd 100644 --- a/CumulusMX/Properties/AssemblyInfo.cs +++ b/CumulusMX/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Cumulus MX")] -[assembly: AssemblyDescription("Version 3.13.5 - Build 3151")] +[assembly: AssemblyDescription("Version 3.13.6 - Build 3152")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Cumulus MX")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.13.5.3151")] -[assembly: AssemblyFileVersion("3.13.5.3151")] +[assembly: AssemblyVersion("3.13.6.3152")] +[assembly: AssemblyFileVersion("3.13.6.3152")] diff --git a/CumulusMX/packages.config b/CumulusMX/packages.config index 790fbca3..1ffe4b0e 100644 --- a/CumulusMX/packages.config +++ b/CumulusMX/packages.config @@ -1,7 +1,7 @@  - + diff --git a/Updates.txt b/Updates.txt index 6d7489a4..0883c860 100644 --- a/Updates.txt +++ b/Updates.txt @@ -1,4 +1,4 @@ -3.13.5 - b3151 +3.13.6 - b3152 —————————————— - Fix: HTTP Ecowitt decode of leaf wetness sensors again - Fix: HTTP Ecowitt/Ambient - Remove soil temperature from extra sensor settings @@ -9,21 +9,22 @@ - New: Program Settings now allows you to over-ride the default date separator string for your locale. This will be useful for those locales that under Mono now use a date separator such as ". " and you want it to use "." - BEWARE, there may be implications with your existing data files rendering unreadable by CMX if you change this value - Note: Unlike most settings the string MUST be contained in double quotes (because it can end with a space) - Note: The over-ride is ignored if you change the overall locale CMX - and the over-ride is reset to the new locales default string - Change: Cumulus will now still parse the dates/times in dayfile.txt and monthly logs even if the locale changes - Change: FO Station will now ignore UV-I values greater than 16 - Updated libraries - FluentFTP MailKit MimeKit MySqlConnector +3.13.5 - b3151 +—————————————— +WITHDRWAN due to issues with FluentFTP and Mono when connecting to FTP servers that allow newer EC encryption algorithms + + 3.13.4 - b3149 —————————————— - Fix: Dayfile editor MySQL update statement failing and knock on effects