Task/prep 8.1.3 (#1724)

* prep rc * add changelog * attempt fix lfs * fix bundling * bump to rc2 * update sftp downloaded * use correct version * update xml version * final tidy up * update shared assemblies * revert to rc3 * update client xml * Update CHANGELOG.md
HicServices · Jan 15, 2024 · bc12fd7 · bc12fd7
1 parent f4523b9
commit bc12fd7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -200,7 +200,7 @@ jobs:
           (cd PublishLinux ; echo 7z a -mx=0 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.zip . | cmd)
           mv PublishLinux rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux
           echo 7z a dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.tar rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux | cmd
-          (cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-client.zip ResearchDataManagementPlatform.exe *.nupkg rdmpplugins.txt | cmd)
+          (cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-client.zip . | cmd)
 
 
       - name: Install Perl dependencies

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.1.3] - 2024-01-15
+
+### Changed
+
+- Fixed Upgrade path issue for RDMP version 8.0.X
+- Fix excessive selection on local file storage settings
+- Fix to SMTP Data Load module crashing
+
 ## [8.1.2] - 2024-01-09
 
 ### Changed

diff --git a/Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs b/Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading;
+using FluentFTP;
 using Rdmp.Core.Curation;
 using Rdmp.Core.Curation.Data;
 using Rdmp.Core.ReusableLibraryCode.Progress;
@@ -33,6 +34,11 @@ public SFTPDownloader(Lazy<SftpClient> connection)
         _connection = new Lazy<SftpClient>(SetupSftp,LazyThreadSafetyMode.ExecutionAndPublication);
     }
 
+    public SFTPDownloader()
+    {
+        _connection = new Lazy<SftpClient>(SetupSftp, LazyThreadSafetyMode.ExecutionAndPublication);
+    }
+
     private SftpClient SetupSftp()
     {
         var host = FTPServer?.Server ?? throw new NullReferenceException("FTP server not set");

diff --git a/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.cs b/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.cs
@@ -209,7 +209,7 @@ private void btnSaveAndClose_Click(object sender, EventArgs e)
         if (SaveConnectionStrings())
         {
             //integrity checks passed
-            UserSettings.UseLocalFileSystem = true;
+            UserSettings.UseLocalFileSystem = false;
             RestartApplication();
         }
     }

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -10,6 +10,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("8.1.2")]
-[assembly: AssemblyFileVersion("8.1.2")]
-[assembly: AssemblyInformationalVersion("8.1.2")]
+[assembly: AssemblyVersion("8.1.3")]
+[assembly: AssemblyFileVersion("8.1.3")]
+[assembly: AssemblyInformationalVersion("8.1.3")]
diff --git a/rdmp-client.xml b/rdmp-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-    <version>8.1.2.0</version>
-    <url>https://github.com/HicServices/RDMP/releases/download/v8.1.2/rdmp-8.1.2-client.zip</url>
+    <version>8.1.3.0</version>
+    <url>https://github.com/HicServices/RDMP/releases/download/v8.1.3/rdmp-8.1.3-client.zip</url>
     <changelog>https://github.com/HicServices/RDMP/blob/main/CHANGELOG.md#7</changelog>
     <mandatory>true</mandatory>
 </item>