Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RDMP-143 Reorder Excel Attacher Processes #1752

Merged
merged 9 commits into from
Mar 1, 2024
Merged

RDMP-143 Reorder Excel Attacher Processes #1752

merged 9 commits into from
Mar 1, 2024

Conversation

JFriel
Copy link
Collaborator

@JFriel JFriel commented Feb 16, 2024

Issue:
If you are attempting to use a dataload with an excel attacher step where the inbound worksheet columns contain duplicated
The override column mechanism is done after checking for duplicate columns.
i.e. a,c,c -> a,b,c will not work but a,d,c -> a,b,c will

Fix: Override the column headers before checking for duplicate columns

Steps to reproduce:

  1. create a dataload that uses an excel attacher.
  2. Upload a worksheet with duplicate columns and an overrride setting to fix the duplicate columnsd
  3. Where previous versions would fail, this update allows the dataload
    @JFriel Can demo if required

@JFriel JFriel requested a review from a team February 16, 2024 15:22
@jas88 jas88 merged commit dc97f94 into develop Mar 1, 2024
6 checks passed
@jas88 jas88 deleted the task/exel-attacker-rename-ordering branch March 1, 2024 23:17
JFriel added a commit that referenced this pull request Apr 8, 2024
@JFriel @dependabot
@jas88 @bpeacock001 @rdteviotdale
Move 8.1.5 to main for autoupdater (#1797)
8460816 
* bump to net8

* add sqlcli

* Bump Autoupdater.NET.Official from 1.8.4 to 1.8.5

Bumps [Autoupdater.NET.Official](https://github.com/ravibpatel/AutoUpdater.NET) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/ravibpatel/AutoUpdater.NET/releases)
- [Commits](ravibpatel/AutoUpdater.NET@v1.8.4...v1.8.5)

---
updated-dependencies:
- dependency-name: Autoupdater.NET.Official
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Delete .nuget/packages.config (#1758)

* Delete .nuget/packages.config

Remove  hopefully obsolete package list confusing dependency tracking

* Remove .nuget folder

---------

Co-authored-by: James A Sutherland <>

* Bump svenstaro/upload-release-action from 2.7.0 to 2.9.0 (#1759)

* Bump shogo82148/actions-setup-perl from 1.28.0 to 1.29.0 (#1751)

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.28.0 to 1.29.0.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](shogo82148/actions-setup-perl@v1.28.0...v1.29.0)

---
updated-dependencies:
- dependency-name: shogo82148/actions-setup-perl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Friel <[email protected]>

* Bump CsvHelper from 30.0.3 to 30.1.0 (#1737)

Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 30.0.3 to 30.1.0.
- [Commits](JoshClose/CsvHelper@30.0.3...30.1.0)

---
updated-dependencies:
- dependency-name: CsvHelper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Friel <[email protected]>

* Bump SSH.NET from 2023.0.1 to 2024.0.0

Bumps [SSH.NET](https://github.com/sshnet/SSH.NET) from 2023.0.1 to 2024.0.0.
- [Release notes](https://github.com/sshnet/SSH.NET/releases)
- [Commits](sshnet/SSH.NET@2023.0.1...2024.0.0)

---
updated-dependencies:
- dependency-name: SSH.NET
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump SixLabors.ImageSharp.Drawing from 2.1.0 to 2.1.1

Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp.Drawing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump MongoDB.Driver from 2.23.1 to 2.24.0

Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases)
- [Commits](mongodb/mongo-csharp-driver@v2.23.1...v2.24.0)

---
updated-dependencies:
- dependency-name: MongoDB.Driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump NUnit from 4.0.1 to 4.1.0

Bumps [NUnit](https://github.com/nunit/nunit) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/master/CHANGES.md)
- [Commits](nunit/nunit@v4.0.1...4.1.0)

---
updated-dependencies:
- dependency-name: NUnit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump FluentFTP from 49.0.1 to 49.0.2

Bumps [FluentFTP](https://github.com/robinrodricks/FluentFTP) from 49.0.1 to 49.0.2.
- [Release notes](https://github.com/robinrodricks/FluentFTP/releases)
- [Changelog](https://github.com/robinrodricks/FluentFTP/blob/master/RELEASES.md)
- [Commits](https://github.com/robinrodricks/FluentFTP/commits)

---
updated-dependencies:
- dependency-name: FluentFTP
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Task/rdmp-140 Update Dependabot yml file (#1756)

* centrally managed dependacies

* add directory.project.props file

* fix typo

* fix build

* fix up test

* Whitespace cleanup

* Avoid searching for and reading all csproj files twice

* remove console log

* update dependabot actions

* remove dependabot lower bounds

---------

Co-authored-by: James A Sutherland <>

* fix merge

* run net8

* Bump YamlDotNet from 15.1.1 to 15.1.2 (#1767)

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 15.1.1 to 15.1.2.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v15.1.1...v15.1.2)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update sqlclient

* add version

* remove obsolete properties from tests

* workaround depricated formatter

* add text fix

* add package listing

* Bump coverlet.collector from 6.0.0 to 6.0.1 (#1757)

Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](coverlet-coverage/coverlet@v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* RDMP-143 Reorder Excel Attacher Processes (#1752)

* update excel attacher processing ordering

* Bump CsvHelper from 30.0.1 to 31.0.0 (#1761)

* Bump SixLabors.ImageSharp from 3.1.2 to 3.1.3 (#1770)

Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/SixLabors/ImageSharp/releases)
- [Commits](SixLabors/ImageSharp@v3.1.2...v3.1.3)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump SixLabors.ImageSharp.Drawing from 2.1.1 to 2.1.2

Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp.Drawing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Resetting Dependabot for central versioning

* Reinstate Dependabot to reset state

* Move ManagePackageVersionsCentrally flag to Directory.Build.props

* Fix casing on Directory.Build.props file

* Task/tidy up net 8 migration (#1775)

* fix packages.md

* Bump coverlet.collector from 6.0.1 to 6.0.2

Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](coverlet-coverage/coverlet@v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump HIC.BadMedicine from 1.1.2 to 1.2.0 (#1776)

* Bump HIC.BadMedicine from 1.1.2 to 1.2.0

Bumps [HIC.BadMedicine](https://github.com/HicServices/BadMedicine) from 1.1.2 to 1.2.0.
- [Release notes](https://github.com/HicServices/BadMedicine/releases)
- [Changelog](https://github.com/HicServices/BadMedicine/blob/develop/CHANGELOG.md)
- [Commits](HicServices/SynthEHR@v1.1.2...v1.2.0)

---
updated-dependencies:
- dependency-name: HIC.BadMedicine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* BadMedicine API update

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James A Sutherland <[email protected]>

* bump fansisql (#1778)

* Bump Terminal.Gui from 1.15.1 to 1.16.0 (#1781)

Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.15.1 to 1.16.0.
- [Release notes](https://github.com/gui-cs/Terminal.Gui/releases)
- [Commits](gui-cs/Terminal.Gui@v1.15.1...v1.16.0)

---
updated-dependencies:
- dependency-name: Terminal.Gui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump NUnit.Analyzers from 4.0.1 to 4.1.0 (#1780)

Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/nunit/nunit.analyzers/releases)
- [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.txt)
- [Commits](nunit/nunit.analyzers@4.0.1...4.1.0)

---
updated-dependencies:
- dependency-name: NUnit.Analyzers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump HIC.BadMedicine from 1.2.0 to 1.2.1

Bumps [HIC.BadMedicine](https://github.com/HicServices/BadMedicine) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/HicServices/BadMedicine/releases)
- [Changelog](https://github.com/HicServices/BadMedicine/blob/develop/CHANGELOG.md)
- [Commits](HicServices/SynthEHR@v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: HIC.BadMedicine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* external database commands saved

* Bigfix: Bring Notification Boxes To Front (#1785)

* bring notification to front

* add top most

* Bump NPOI from 2.6.2 to 2.7.0 (#1787)

Bumps [NPOI](https://github.com/nissl-lab/npoi) from 2.6.2 to 2.7.0.
- [Release notes](https://github.com/nissl-lab/npoi/releases)
- [Commits](https://github.com/nissl-lab/npoi/commits)

---
updated-dependencies:
- dependency-name: NPOI
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix value to string conversion (#1788)

* fix value to string conversion

* Update ExcelDataFlowSource.cs

* Task/RDMP-65 remember last used extraction pipeline (#1768)

* extractions remember pipeline

* update changelog

* reorder testing

* fix test

* revert test

* add order to test

* updates from codeql

* tidy up code

* Update ExecuteExtractionUI.cs

* Task/allow extended timeouts (#1773)

* add 50min timeout

* interim

* add optional timeout

* add changelog

* tidy up from codeql

* update

* Task/rdmp 145 improve bak experience (#1772)

* improve bak file usage

* add documentation stub

* add docs

* tidy up code

* bump sixLabors

* update to ui

* restore files

* improve documentation

* add using statement

* specify server when importing existing cohorts

* Task/RDMP-129 Remove wix toolset (#1789)

* start of msi upgrade

* remove wix

* update build steps

* tidy up

* restore file

* update sln

* Feature/rdmp 117 multiple loads per catalogue (#1754)

* basic db objects

* fix typo

* working db linkage

* working build

* add sql update

* update sql

* update tests

* update sql

* update create sql

* update sql

* update sql

* update class

* fix extra space

* attempt to fix tests

* remove linkage

* fix typo

* add test case

* attempt image fix

* fix up image

* add missing file

* add changelog

* interim

* interim

* tidy up code

* fix build

* icons

* rename icon file (#1755)

* working icon

* update create sql

* update patch

* add patch

* working patches

* add basic tests

* tidy up code

* add go

* attempt to fix patch

* tidy up code

* remove true equal true check

* tidy up from review

* update migration

* remove dupe file (#1774)

* fix build

* interim sql

* update patch

* fix sql patch

* update patch id

* update patch id

* fix bad merge

* tidy up code

* tidy up code

---------

Co-authored-by: James A Sutherland <[email protected]>

* allow for multiple identifiers in an project catalogue (#1791)

* fix logic issue

* update changelog

* only convert core categories

* add release date

* update changelog

* Task/rdmp-156 prep 8.1.5 release (#1793)

* add release date

* update changelog

* attempt to fix nuge tpackaging

* Update build.yml

* Task/rdmp 156 prep 8.1.5 release (#1795)

* disable tag check

* add sgen

* revert bad fix

* nudge deps

* fix duplicate deps

* drop dep

* fix build

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James A Sutherland <[email protected]>
Co-authored-by: Brian <[email protected]>
Co-authored-by: James A Sutherland <>
Co-authored-by: James A Sutherland <[email protected]>
Co-authored-by: rdteviotdale <[email protected]>
JFriel added a commit that referenced this pull request May 27, 2024
@JFriel @dependabot
@jas88 @bpeacock001 @rdteviotdale @JBaird00183
Marge v8.1.6 into main (#1842)
97bf92f 
* bump to net8

* add sqlcli

* Bump Autoupdater.NET.Official from 1.8.4 to 1.8.5

Bumps [Autoupdater.NET.Official](https://github.com/ravibpatel/AutoUpdater.NET) from 1.8.4 to 1.8.5.
- [Release notes](https://github.com/ravibpatel/AutoUpdater.NET/releases)
- [Commits](ravibpatel/AutoUpdater.NET@v1.8.4...v1.8.5)

---
updated-dependencies:
- dependency-name: Autoupdater.NET.Official
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Delete .nuget/packages.config (#1758)

* Delete .nuget/packages.config

Remove  hopefully obsolete package list confusing dependency tracking

* Remove .nuget folder

---------

Co-authored-by: James A Sutherland <>

* Bump svenstaro/upload-release-action from 2.7.0 to 2.9.0 (#1759)

* Bump shogo82148/actions-setup-perl from 1.28.0 to 1.29.0 (#1751)

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.28.0 to 1.29.0.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](shogo82148/actions-setup-perl@v1.28.0...v1.29.0)

---
updated-dependencies:
- dependency-name: shogo82148/actions-setup-perl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Friel <[email protected]>

* Bump CsvHelper from 30.0.3 to 30.1.0 (#1737)

Bumps [CsvHelper](https://github.com/JoshClose/CsvHelper) from 30.0.3 to 30.1.0.
- [Commits](JoshClose/CsvHelper@30.0.3...30.1.0)

---
updated-dependencies:
- dependency-name: CsvHelper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Friel <[email protected]>

* Bump SSH.NET from 2023.0.1 to 2024.0.0

Bumps [SSH.NET](https://github.com/sshnet/SSH.NET) from 2023.0.1 to 2024.0.0.
- [Release notes](https://github.com/sshnet/SSH.NET/releases)
- [Commits](sshnet/SSH.NET@2023.0.1...2024.0.0)

---
updated-dependencies:
- dependency-name: SSH.NET
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump SixLabors.ImageSharp.Drawing from 2.1.0 to 2.1.1

Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.1.0...v2.1.1)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp.Drawing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump MongoDB.Driver from 2.23.1 to 2.24.0

Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 2.23.1 to 2.24.0.
- [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases)
- [Commits](mongodb/mongo-csharp-driver@v2.23.1...v2.24.0)

---
updated-dependencies:
- dependency-name: MongoDB.Driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump NUnit from 4.0.1 to 4.1.0

Bumps [NUnit](https://github.com/nunit/nunit) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/master/CHANGES.md)
- [Commits](nunit/nunit@v4.0.1...4.1.0)

---
updated-dependencies:
- dependency-name: NUnit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump FluentFTP from 49.0.1 to 49.0.2

Bumps [FluentFTP](https://github.com/robinrodricks/FluentFTP) from 49.0.1 to 49.0.2.
- [Release notes](https://github.com/robinrodricks/FluentFTP/releases)
- [Changelog](https://github.com/robinrodricks/FluentFTP/blob/master/RELEASES.md)
- [Commits](https://github.com/robinrodricks/FluentFTP/commits)

---
updated-dependencies:
- dependency-name: FluentFTP
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Task/rdmp-140 Update Dependabot yml file (#1756)

* centrally managed dependacies

* add directory.project.props file

* fix typo

* fix build

* fix up test

* Whitespace cleanup

* Avoid searching for and reading all csproj files twice

* remove console log

* update dependabot actions

* remove dependabot lower bounds

---------

Co-authored-by: James A Sutherland <>

* fix merge

* run net8

* Bump YamlDotNet from 15.1.1 to 15.1.2 (#1767)

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 15.1.1 to 15.1.2.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v15.1.1...v15.1.2)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* update sqlclient

* add version

* remove obsolete properties from tests

* workaround depricated formatter

* add text fix

* add package listing

* Bump coverlet.collector from 6.0.0 to 6.0.1 (#1757)

Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](coverlet-coverage/coverlet@v6.0.0...v6.0.1)

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* RDMP-143 Reorder Excel Attacher Processes (#1752)

* update excel attacher processing ordering

* Bump CsvHelper from 30.0.1 to 31.0.0 (#1761)

* Bump SixLabors.ImageSharp from 3.1.2 to 3.1.3 (#1770)

Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/SixLabors/ImageSharp/releases)
- [Commits](SixLabors/ImageSharp@v3.1.2...v3.1.3)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump SixLabors.ImageSharp.Drawing from 2.1.1 to 2.1.2

Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp.Drawing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Resetting Dependabot for central versioning

* Reinstate Dependabot to reset state

* Move ManagePackageVersionsCentrally flag to Directory.Build.props

* Fix casing on Directory.Build.props file

* Task/tidy up net 8 migration (#1775)

* fix packages.md

* Bump coverlet.collector from 6.0.1 to 6.0.2

Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](coverlet-coverage/coverlet@v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump HIC.BadMedicine from 1.1.2 to 1.2.0 (#1776)

* Bump HIC.BadMedicine from 1.1.2 to 1.2.0

Bumps [HIC.BadMedicine](https://github.com/HicServices/BadMedicine) from 1.1.2 to 1.2.0.
- [Release notes](https://github.com/HicServices/BadMedicine/releases)
- [Changelog](https://github.com/HicServices/BadMedicine/blob/develop/CHANGELOG.md)
- [Commits](HicServices/SynthEHR@v1.1.2...v1.2.0)

---
updated-dependencies:
- dependency-name: HIC.BadMedicine
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* BadMedicine API update

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James A Sutherland <[email protected]>

* bump fansisql (#1778)

* Bump Terminal.Gui from 1.15.1 to 1.16.0 (#1781)

Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.15.1 to 1.16.0.
- [Release notes](https://github.com/gui-cs/Terminal.Gui/releases)
- [Commits](gui-cs/Terminal.Gui@v1.15.1...v1.16.0)

---
updated-dependencies:
- dependency-name: Terminal.Gui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump NUnit.Analyzers from 4.0.1 to 4.1.0 (#1780)

Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/nunit/nunit.analyzers/releases)
- [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.txt)
- [Commits](nunit/nunit.analyzers@4.0.1...4.1.0)

---
updated-dependencies:
- dependency-name: NUnit.Analyzers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump HIC.BadMedicine from 1.2.0 to 1.2.1

Bumps [HIC.BadMedicine](https://github.com/HicServices/BadMedicine) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/HicServices/BadMedicine/releases)
- [Changelog](https://github.com/HicServices/BadMedicine/blob/develop/CHANGELOG.md)
- [Commits](HicServices/SynthEHR@v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: HIC.BadMedicine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* external database commands saved

* Bigfix: Bring Notification Boxes To Front (#1785)

* bring notification to front

* add top most

* Bump NPOI from 2.6.2 to 2.7.0 (#1787)

Bumps [NPOI](https://github.com/nissl-lab/npoi) from 2.6.2 to 2.7.0.
- [Release notes](https://github.com/nissl-lab/npoi/releases)
- [Commits](https://github.com/nissl-lab/npoi/commits)

---
updated-dependencies:
- dependency-name: NPOI
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix value to string conversion (#1788)

* fix value to string conversion

* Update ExcelDataFlowSource.cs

* Task/RDMP-65 remember last used extraction pipeline (#1768)

* extractions remember pipeline

* update changelog

* reorder testing

* fix test

* revert test

* add order to test

* updates from codeql

* tidy up code

* Update ExecuteExtractionUI.cs

* Task/allow extended timeouts (#1773)

* add 50min timeout

* interim

* add optional timeout

* add changelog

* tidy up from codeql

* update

* Task/rdmp 145 improve bak experience (#1772)

* improve bak file usage

* add documentation stub

* add docs

* tidy up code

* bump sixLabors

* update to ui

* restore files

* improve documentation

* add using statement

* specify server when importing existing cohorts

* Task/RDMP-129 Remove wix toolset (#1789)

* start of msi upgrade

* remove wix

* update build steps

* tidy up

* restore file

* update sln

* Feature/rdmp 117 multiple loads per catalogue (#1754)

* basic db objects

* fix typo

* working db linkage

* working build

* add sql update

* update sql

* update tests

* update sql

* update create sql

* update sql

* update sql

* update class

* fix extra space

* attempt to fix tests

* remove linkage

* fix typo

* add test case

* attempt image fix

* fix up image

* add missing file

* add changelog

* interim

* interim

* tidy up code

* fix build

* icons

* rename icon file (#1755)

* working icon

* update create sql

* update patch

* add patch

* working patches

* add basic tests

* tidy up code

* add go

* attempt to fix patch

* tidy up code

* remove true equal true check

* tidy up from review

* update migration

* remove dupe file (#1774)

* fix build

* interim sql

* update patch

* fix sql patch

* update patch id

* update patch id

* fix bad merge

* tidy up code

* tidy up code

---------

Co-authored-by: James A Sutherland <[email protected]>

* allow for multiple identifiers in an project catalogue (#1791)

* fix logic issue

* update changelog

* only convert core categories

* add release date

* update changelog

* Task/rdmp-156 prep 8.1.5 release (#1793)

* add release date

* update changelog

* attempt to fix nuge tpackaging

* Update build.yml

* Task/rdmp 156 prep 8.1.5 release (#1795)

* disable tag check

* add sgen

* revert bad fix

* nudge deps

* fix duplicate deps

* drop dep

* fix build

* Bump SixLabors.ImageSharp from 3.1.3 to 3.1.4

Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/SixLabors/ImageSharp/releases)
- [Commits](SixLabors/ImageSharp@v3.1.3...v3.1.4)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Task/RDMP-164 Fix Plugin Dependency Issue (#1800)

* add asyncinterfaces dep

* add package info

* Bump FluentFTP from 49.0.2 to 50.0.0

Bumps [FluentFTP](https://github.com/robinrodricks/FluentFTP) from 49.0.2 to 50.0.0.
- [Release notes](https://github.com/robinrodricks/FluentFTP/releases)
- [Changelog](https://github.com/robinrodricks/FluentFTP/blob/master/RELEASES.md)
- [Commits](https://github.com/robinrodricks/FluentFTP/commits)

---
updated-dependencies:
- dependency-name: FluentFTP
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump MongoDB.Driver from 2.24.0 to 2.25.0

Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 2.24.0 to 2.25.0.
- [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases)
- [Commits](mongodb/mongo-csharp-driver@v2.24.0...v2.25.0)

---
updated-dependencies:
- dependency-name: MongoDB.Driver
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump SixLabors.ImageSharp.Drawing from 2.1.2 to 2.1.3 (#1804)

Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.1.2...v2.1.3)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp.Drawing
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump FluentFTP from 50.0.0 to 50.0.1

Bumps [FluentFTP](https://github.com/robinrodricks/FluentFTP) from 50.0.0 to 50.0.1.
- [Release notes](https://github.com/robinrodricks/FluentFTP/releases)
- [Changelog](https://github.com/robinrodricks/FluentFTP/blob/master/RELEASES.md)
- [Commits](https://github.com/robinrodricks/FluentFTP/commits)

---
updated-dependencies:
- dependency-name: FluentFTP
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* update readme and changelog

* tidy up

* add default value

* tidy up

* add variable usage

* add some documentation

* multi-instance replace

* add button

* working yaml read

* tidy up code

* re-add selectdialog

* consistant casing

* fix codeql

* Bump Spectre.Console from 0.48.0 to 0.49.0

Bumps [Spectre.Console](https://github.com/spectreconsole/spectre.console) from 0.48.0 to 0.49.0.
- [Release notes](https://github.com/spectreconsole/spectre.console/releases)
- [Commits](spectreconsole/spectre.console@0.48.0...0.49.0)

---
updated-dependencies:
- dependency-name: Spectre.Console
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump NUnit.Analyzers from 4.1.0 to 4.2.0

Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/nunit/nunit.analyzers/releases)
- [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.md)
- [Commits](nunit/nunit.analyzers@4.1.0...4.2.0)

---
updated-dependencies:
- dependency-name: NUnit.Analyzers
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump LibArchive.Net from 0.1.4 to 0.1.5

Bumps [LibArchive.Net](https://github.com/jas88/libarchive.net) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/jas88/libarchive.net/releases)
- [Changelog](https://github.com/jas88/libarchive.net/blob/main/CHANGELOG.md)
- [Commits](jas88/libarchive.net@v0.1.4...v0.1.5)

---
updated-dependencies:
- dependency-name: LibArchive.Net
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump Spectre.Console from 0.49.0 to 0.49.1

Bumps [Spectre.Console](https://github.com/spectreconsole/spectre.console) from 0.49.0 to 0.49.1.
- [Release notes](https://github.com/spectreconsole/spectre.console/releases)
- [Commits](spectreconsole/spectre.console@0.49.0...0.49.1)

---
updated-dependencies:
- dependency-name: Spectre.Console
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump NLog from 5.2.8 to 5.3.1

Bumps [NLog](https://github.com/NLog/NLog) from 5.2.8 to 5.3.1.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](NLog/NLog@v5.2.8...v5.3.1)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* prompt for rename of filter change

* Bump NLog from 5.3.1 to 5.3.2

Bumps [NLog](https://github.com/NLog/NLog) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](NLog/NLog@v5.3.1...v5.3.2)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update CodeQL Config (#1817)

* add codeql config

* dont double init

* tidy up config file

* Task/rdmp 19 fix codescanning (#1818)

* add codeql config

* dont double init

* tidy up config file

* ignore .designer in codeql

* remove number identifier

* Bump coverallsapp/github-action from 2.2.3 to 2.3.0 (#1819)

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](coverallsapp/github-action@v2.2.3...v2.3.0)

---
updated-dependencies:
- dependency-name: coverallsapp/github-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Task/RDMP-161 Add ability to mark as not extractable (#1796)

* add ability to mark as not extractable

* add code comments

* update changelog

* Bump YamlDotNet from 15.1.2 to 15.1.4 (#1822)

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 15.1.2 to 15.1.4.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v15.1.2...v15.1.4)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump Autoupdater.NET.Official from 1.8.5 to 1.8.6 (#1821)

Bumps [Autoupdater.NET.Official](https://github.com/ravibpatel/AutoUpdater.NET) from 1.8.5 to 1.8.6.
- [Release notes](https://github.com/ravibpatel/AutoUpdater.NET/releases)
- [Commits](ravibpatel/AutoUpdater.NET@v1.8.5...v1.8.6)

---
updated-dependencies:
- dependency-name: Autoupdater.NET.Official
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Friel <[email protected]>

* Bugfix/rdmp 162 Fix Error Msg Being Swallowed (#1798)

* update dll imports

* tidy up code

* update ddl import to libraryimport

* use getScrolPos

* Update directory.build.props

* RDMP-70 Change made to cause view stack trace to appear only when popup is an exception (#1810)

* Change made to cause view stack trace to appear only when popup is an exception

* Update CHANGELOG.md

Added change to changelog under 8.1.5

* Update CHANGELOG.md

Second update into correct release

---------

Co-authored-by: James Friel <[email protected]>

* update to use synthehr

* tidy up

* Task/document test plan (#1823)

* add pull request template and test plan

* add to test plan

* use real link

* update test plan

* Task/RDMP-184 Fix RDMP Slow start Issue (#1827)

* attempt fix

* add null checking

* tidy up

* fix typos

* Update LoggingDatabasePatcher.cs (#1833)

* Update LoggingDatabasePatcher.cs

Wrap identifiers correctly according to target DB platform

* Note pgsql logging creation fix, fix changelog typos

---------

Co-authored-by: James A Sutherland <>

* Fix bcl.AsyncInterfaces issue in plugins (#1835)

* Fix bcl.AsyncInterfaces issue in plugins

* Remove AsyncInterfaces ref

* tidy up docs

---------

Co-authored-by: James A Sutherland <>
Co-authored-by: James Friel <[email protected]>

* Update SharedAssemblyInfo.cs

* Bump Microsoft.NET.Test.Sdk from 17.9.0 to 17.10.0

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.9.0 to 17.10.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](microsoft/vstest@v17.9.0...v17.10.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Bump HIC.FAnsiSql from 3.2.2 to 3.2.3

Bumps [HIC.FAnsiSql](https://github.com/HicServices/FAnsiSql) from 3.2.2 to 3.2.3.
- [Release notes](https://github.com/HicServices/FAnsiSql/releases)
- [Changelog](https://github.com/HicServices/FAnsiSql/blob/main/CHANGELOG.md)
- [Commits](HicServices/FAnsiSql@v3.2.2...v3.2.3)

---
updated-dependencies:
- dependency-name: HIC.FAnsiSql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update ServerDatabaseTableSelector.cs

Fix async enumeration since it's actually async now

* Update DataTableUploadDestinationTests.cs

Fix bit vs tinyint boolean

* add release date

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James A Sutherland <[email protected]>
Co-authored-by: Brian <[email protected]>
Co-authored-by: James A Sutherland <>
Co-authored-by: James A Sutherland <[email protected]>
Co-authored-by: rdteviotdale <[email protected]>
Co-authored-by: JBaird00183 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jas88 jas88 jas88 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JFriel @jas88