Skip to content

Commit

Permalink
Merge Latest Release into main (#1702)
Browse files Browse the repository at this point in the history
* Bump YamlDotNet from 13.3.1 to 13.4.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.3.1 to 13.4.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v13.3.1...v13.4.0)

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

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

* Bump shogo82148/actions-setup-perl from 1.23.1 to 1.24.1

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.23.1 to 1.24.1.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](shogo82148/actions-setup-perl@v1.23.1...v1.24.1)

---
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]>

* fix checkbox issue

* improve confirmation text (#1639)

* improve confirmation text
* Loop tidyup, use var where possible

---------

Co-authored-by: jas88 <[email protected]>

* correct typo in create logging sql (#1640)

* Feature/ci codescan (#1641)

* Move SecurityCodescan.VS2019 to run on Github CI alone, integrate results with CodeQL
* Remove SecurityCodescan from Packages.md, no longer used via Nuget

---------

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

* hide source control when not available

* Remove old Plugin object bits, tidy up (#1636)

* Remove old Plugin object bits, tidy up

* Purge remaining bits of AllExpiredPluginsNode

* Fix plugin display name in tree

* Update CreateNewDataExtractionProjectUI.cs

Casting fix

* Feature/rdmp42 delete plugins (#1642)

* add ui plugin delete functionality

* Warning and inheritance redundancy cleanups

* Narrow scope of catch clause per CodeQL warning

* Tidy Plugin name retrieval

---------

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

* Bump MongoDB.Driver from 2.21.0 to 2.22.0

Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 2.21.0 to 2.22.0.
- [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases)
- [Commits](mongodb/mongo-csharp-driver@v2.21.0...v2.22.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 YamlDotNet from 13.4.0 to 13.5.2 (#1644)

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.4.0 to 13.5.2.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v13.4.0...v13.5.2)

---
updated-dependencies:
- dependency-name: YamlDotNet
  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 YamlDotNet from 13.5.2 to 13.7.0 (#1647)

* Bump SSH.NET from 2020.0.2 to 2023.0.0 (#1646)

* Bump YamlDotNet from 13.7.0 to 13.7.1

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 13.7.0 to 13.7.1.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v13.7.0...v13.7.1)

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

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

* Bump NLog from 5.2.4 to 5.2.5

Bumps [NLog](https://github.com/NLog/NLog) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](NLog/NLog@v5.2.4...v5.2.5)

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

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

* New FTP/FTPS support, improve SFTP (#1649)

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

* Cut Windows exe file counts (#1650)

* Cut Windows exe file counts

* Remove manual deletion of files dotnet publish used to create

* Fix up docs links

* More doc link fixups

* Fix FAnsiSql Implementations README links

* Make GUI and CLI Windows exes single-file, update MSI accordingly

* Build source zip early on for inclusion later

---------

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

* Bump actions/setup-node from 3.8.1 to 4.0.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3.8.1...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Task/rdmp-32 Fix Progress Log writing using excessive resources (#1657)

* add load

* readd sorting

* revert sorting

* tidy up code

* Task/rdmp 32 Name DataTable Chunks (#1658)

* add chunk naming
* bump to 8.1.1-r1
* Add heading for WIP 8.1.1 release

---------

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

* RDMP-15 Use .bak files as Data Loads (#1656)

* basic ui triggers
* working dl

---------

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

* Bump FluentFTP from 48.0.1 to 48.0.3

Bumps [FluentFTP](https://github.com/robinrodricks/FluentFTP) from 48.0.1 to 48.0.3.
- [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]>

* Feature/cleanup (#1659)

* Use var

* Whitespace fixes

* Remove stray parentheses

* Update SingletonNode.cs

Fix confused syntax, use Equ for simplicity

* Typos

Fix typos, also make some verbatim strings raw strings for better formatting.

* Spelling/grammar, wrongly marked partial classes

* Update SingletonNode.cs

Fix up equality test to be strict about types

* Fix typos and tidy tooltip cache logic

* Bump shogo82148/actions-setup-perl from 1.24.1 to 1.24.2

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

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

* Bump SixLabors.ImageSharp.Drawing from 2.0.0 to 2.0.1

Bumps [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.0.0...v2.0.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 Terminal.Gui from 1.14.0 to 1.14.1 (#1662)

Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.14.0 to 1.14.1.
- [Release notes](https://github.com/gui-cs/Terminal.Gui/releases)
- [Commits](gui-cs/Terminal.Gui@v1.14.0...v1.14.1)

---
updated-dependencies:
- dependency-name: Terminal.Gui
  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>

* Restore buggy Equals behaviour on SingletonNode since some UI code relied on the bug

* Bump NUnit from 3.13.3 to 3.14.0

Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.3 to 3.14.0.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/master/CHANGES.md)
- [Commits](nunit/nunit@v3.13.3...v3.14.0)

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

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

* Fix Extraction Refresh Issue (#1671)

* fix extraction refresh issue
* reload, but not hot

* Bump Microsoft.NET.Test.Sdk from 17.7.2 to 17.8.0

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.7.2 to 17.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md)
- [Commits](microsoft/vstest@v17.7.2...v17.8.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]>

* Feature/rdmp 73 cohort holdouts (#1653)

* add top to cohort

* working holdout flow

* interim

* basic ui  flow

* now filtering

* working flow

* working auto-holdout

* fix test

* add query

* improved holdout

* tidy up code

* add description

* revert test db

* add holdout description

* add todo

* fixups from codeql

* Minor syntax fix

* Fix possible null deref

* fix todo url

* Tidy, typo fix

* Remove disused field

---------

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

* RDMP-108 Unified UI Alerting from Processing Chunks (#1663)

* batched ui

* tidy up

* attempt to fix codeql

* fix linting

* add if check

* fix test

* add pragma

* fix up test

* update from codeql

* Update DataFlowPipelineEngine.cs

Tidy thread logic, fix double-disposal of objects

* Put chunk disposal in a finally block to avoid leaks

---------

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

* Bump NLog from 5.2.5 to 5.2.6 (#1679)

Bumps [NLog](https://github.com/NLog/NLog) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](NLog/NLog@v5.2.5...v5.2.6)

---
updated-dependencies:
- dependency-name: NLog
  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 Microsoft.SourceLink.GitHub from 1.1.1 to 8.0.0

Bumps [Microsoft.SourceLink.GitHub](https://github.com/dotnet/sourcelink) from 1.1.1 to 8.0.0.
- [Release notes](https://github.com/dotnet/sourcelink/releases)
- [Commits](https://github.com/dotnet/sourcelink/commits)

---
updated-dependencies:
- dependency-name: Microsoft.SourceLink.GitHub
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump Microsoft.XmlSerializer.Generator from 7.0.0 to 8.0.0

Bumps [Microsoft.XmlSerializer.Generator](https://github.com/dotnet/runtime) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v7.0.0...v8.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.XmlSerializer.Generator
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* fix bump

* Fix coverage reporting (#1683)

* Rearrange lcov file handling
* Update coveralls action
* Point Github-Actions Dependabot updates at develop branch, add JFriel as reviewer

* Bump Spectre.Console from 0.47.0 to 0.48.0

Bumps [Spectre.Console](https://github.com/spectreconsole/spectre.console) from 0.47.0 to 0.48.0.
- [Release notes](https://github.com/spectreconsole/spectre.console/releases)
- [Commits](spectreconsole/spectre.console@0.47.0...0.48.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 WeCantSpell.Hunspell from 4.0.0 to 4.1.0

Bumps [WeCantSpell.Hunspell](https://github.com/aarondandy/WeCantSpell.Hunspell) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/aarondandy/WeCantSpell.Hunspell/releases)
- [Changelog](https://github.com/aarondandy/WeCantSpell.Hunspell/blob/main/changelog.md)
- [Commits](aarondandy/WeCantSpell.Hunspell@4.0.0...4.1.0)

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

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

* Task/update plugin bundling (#1678)

* attempt to wget dicom plugin

* improved looping for plugins

* update script

* add to bundle

* update build

* add charts

* update changelog

* remove bad files

* improve build

* add verbose curl

* temp diable tests

* attempt to simplify build

* readd tests

---------

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

* Bump shogo82148/actions-setup-perl from 1.24.2 to 1.24.3

Bumps [shogo82148/actions-setup-perl](https://github.com/shogo82148/actions-setup-perl) from 1.24.2 to 1.24.3.
- [Release notes](https://github.com/shogo82148/actions-setup-perl/releases)
- [Commits](shogo82148/actions-setup-perl@v1.24.2...v1.24.3)

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

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

* bump version

* attemt sign

* remove coveralls

* update sign

* add ls

* correct file name

* more ls

* correct linux file extention

* comment out linux

* fix typo

* update signing

* update changelog

* add ls

* remove extra sign

* add test back in

* Bump NLog from 5.2.6 to 5.2.7

Bumps [NLog](https://github.com/NLog/NLog) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/commits)

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

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

* Bump System.Security.Permissions from 7.0.0 to 8.0.0 (#1676)

* Bump System.Threading.AccessControl from 7.0.1 to 8.0.0 (#1675)

* Bump NUnit from 3.14.0 to 4.0.0 (#1686)

* Bump actions/setup-dotnet from 3.2.0 to 4.0.0 (#1694)

* Feature/rdmp-113 datasets (#1682)

* Dataset PR

* Bump shogo82148/actions-setup-perl from 1.24.3 to 1.25.0 (#1692)

Bump shogo82148/actions-setup-perl from 1.24.3 to 1.25.0 (#1692)

* Bump SixLabors.ImageSharp from 3.0.2 to 3.1.0 (#1693)

* Bump NUnit from 4.0.0 to 4.0.1

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

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

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

* Bump SixLabors.ImageSharp.Drawing from 2.0.1 to 2.1.0

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

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

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

* Implement first pass at platform export tool (#1672)

* Implement first pass at platform export tool

* Remove dead code, add progress report

* Syntax fix

* Note command addition in CHANGELOG

* ignore certain dqe types

---------

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

* update rdmp client xml

* Bump SixLabors.ImageSharp from 3.1.0 to 3.1.1

Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/SixLabors/ImageSharp/releases)
- [Commits](SixLabors/ImageSharp@v3.1.0...v3.1.1)

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

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

* Bump MongoDB.Driver from 2.22.0 to 2.23.0

Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 2.22.0 to 2.23.0.
- [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases)
- [Commits](mongodb/mongo-csharp-driver@v2.22.0...v2.23.0)

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

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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jas88 <[email protected]>
Co-authored-by: James A Sutherland <[email protected]>
Co-authored-by: James A Sutherland <unknown>
Co-authored-by: Brian <[email protected]>
  • Loading branch information
5 people authored Dec 13, 2023
1 parent 25a967e commit 1446bc6
Show file tree
Hide file tree
Showing 517 changed files with 12,234 additions and 8,892 deletions.
72 changes: 41 additions & 31 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,6 @@ jobs:
runs-on: windows-latest

steps:
- name: Stub Node dependencies
shell: bash
run: touch package-lock.json
- name: Install Node for coverage reporting
uses: actions/[email protected]
with:
node-version: '16.x'
cache: 'npm'
- name: LCov merger tool
run: npm install -g lcov-result-merger
- name: Checkout code
uses: actions/checkout@v4
- name: Determine RDMP build version
Expand All @@ -37,7 +27,7 @@ jobs:
- name: Check output
run: echo ${{ steps.version.outputs.rdmpversion }}
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
uses: actions/setup-dotnet@v4.0.0
with:
dotnet-version: 6.0.x
- name: Install MS SQL 2019 Express LocalDB
Expand All @@ -59,6 +49,14 @@ jobs:
shell: bash
run: |
find ./Tools/rdmp/Databases.yaml -type f -exec sed -i 's/RDMP_/TEST_/g' {} \;
- name: BundleSource
shell: bash
run: |
mkdir -p Tools/BundleUpSourceIntoZip/output
rm -f Tools/BundleUpSourceIntoZip/output/SourceCodeForSelfAwareness.zip
echo "dir /s/b *.cs *.xml > srcbitsa.txt" | cmd
perl -pe '$_=reverse' < srcbitsa.txt | sort -t'\' -k1,1 -u | perl -pe '$_=reverse' > srcbits.txt
echo 7z a -mx=9 Tools/BundleUpSourceIntoZip/output/SourceCodeForSelfAwareness.zip @srcbits.txt | cmd
- name: Build
run: dotnet build --configuration Release --verbosity minimal
- name: Create MySql Logging, DQE and Cohort Building Cache Db
Expand Down Expand Up @@ -97,51 +95,59 @@ jobs:
mv `find coverage -type f` fs-ui.lcov
dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
mv `find coverage -type f` fs-core.lcov
- name: Merge LCovs
run: lcov-result-merger "{db,fs}-{ui,core}.lcov" all.lcov
- name: Coveralls
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v2.2.3
with:
github-token: ${{ secrets.github_token }}
path-to-lcov: all.lcov
files: ./db-ui.lcov ./db-core.lcov ./fs-ui.lcov ./fs-core.lcov
flag-name: unit tests

- name: Package
run: |
dotnet publish Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj -r win-x64 --self-contained -c Release -o PublishWinForms -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true --verbosity minimal --nologo
dotnet publish Tools/rdmp/rdmp.csproj -r win-x64 --self-contained -c Release -o PublishWindows -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true --verbosity minimal --nologo
dotnet publish Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj -r win-x64 --self-contained -c Release -o PublishWinForms -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:IncludeNativeLibrariesForSelfExtract=true --verbosity minimal --nologo
dotnet publish Tools/rdmp/rdmp.csproj -r win-x64 --self-contained -c Release -o PublishWindows -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true -p:IncludeNativeLibrariesForSelfExtract=true --verbosity minimal --nologo
dotnet publish Tools/rdmp/rdmp.csproj -r linux-x64 --self-contained -c Release -o PublishLinux -p:GenerateDocumentationFile=false -p:PublishSingleFile=true -p:PublishReadyToRun=true --verbosity minimal --nologo
- name: BundleSource
- name: Install Plugins
if: contains(github.ref, 'refs/tags/v') || contains('refs/heads/main refs/heads/develop',github.ref)
shell: bash
run: |
mkdir -p Tools/BundleUpSourceIntoZip/output
echo "dir /s/b *.cs *.xml > srcbitsa.txt" | cmd
perl -pe '$_=reverse' < srcbitsa.txt | sort -t'\' -k1,1 -u | perl -pe '$_=reverse' > srcbits.txt
echo 7z a -mx=9 Tools/BundleUpSourceIntoZip/output/SourceCodeForSelfAwareness.zip @srcbits.txt | cmd
for plugin in https://api.github.com/repos/SMI/RdmpDicom/releases/latest https://api.github.com/repos/HICServices/HicPlugin/releases/latest https://api.github.com/repos/HICServices/RdmpExtensions/releases/latest
do
PluginName="$(cut -d/ -f6 <<< $plugin)"
NAME="$(curl -s $plugin | grep "browser_download_url.*$PluginName.*nupkg" | cut -d : -f 2,3 | cut -d "\"" -f 2)"
echo $NAME
curl -OL $NAME
for platform in PublishWindows PublishLinux PublishWinForms
do
cp *.nupkg $platform
done
rm *.nupkg
done
- name: Sign
if: contains(github.ref, 'refs/tags/v') || contains('refs/heads/main refs/heads/develop',github.ref)
shell: bash
run: |
signtool=(/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/*/x64/signtool.exe)
signtool=${signtool[${#signtool[@]}-1]}
signtool=`echo $signtool | sed -e 's#^/c#c:#' | tr / \\\\`
echo ${{ secrets.DIGICERT_PFX }} | base64 --decode > GitHubActionsWorkflow.pfx
echo '"'$signtool'"' 'Sign /f GitHubActionsWorkflow.pfx /fd sha256 /tr http://timestamp.digicert.com /td sha256 /p ${{ secrets.DIGICERT_PASSWORD }} PublishWindows/*.exe PublishWinForms/*.exe' | cmd
dotnet tool install --global AzureSignTool
AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v PublishWindows/rdmp.exe
AzureSignTool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v PublishWinForms/ResearchDataManagementPlatform.exe
mkdir -p dist
cmd /c wix\\build.cmd ${{ steps.version.outputs.rdmpversion }}
echo '"'$signtool'"' 'Sign /f GitHubActionsWorkflow.pfx /fd sha256 /tr http://timestamp.digicert.com /td sha256 /p ${{ secrets.DIGICERT_PASSWORD }} dist/rdmp.msi' | cmd
(cd PublishWindows ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-win-x64.zip . | cmd)
(cd PublishWindows ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-win-x64.zip rdmp.exe NLog.config *.yaml *.nupkg | cmd)
(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 . | cmd)
(cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-client.zip ResearchDataManagementPlatform.exe *.nupkg | cmd)
- name: Install Perl dependencies
uses: shogo82148/[email protected]
if: contains(github.ref, 'refs/tags/v') || contains('refs/heads/main refs/heads/develop',github.ref)
uses: shogo82148/[email protected]
with:
install-modules-with: cpanm
install-modules: Archive::Zip Archive::Tar
- name: Fix execute permissions
if: contains(github.ref, 'refs/tags/v') || contains('refs/heads/main refs/heads/develop',github.ref)
shell: perl {0}
run: |
use strict;
Expand Down Expand Up @@ -173,11 +179,13 @@ jobs:
$zip->memberNamed('rdmp')->unixFileAttributes( 0755 );
$zip->overwriteAs($zipname);
- name: Compress tar
if: contains(github.ref, 'refs/tags/v') || contains('refs/heads/main refs/heads/develop',github.ref)
run: |
7z a -txz dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.tar.xz dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.tar
rm dist/rdmp-${{ steps.version.outputs.rdmpversion }}-cli-linux-x64.tar
- name: Build Nuget packages
if: contains(github.ref, 'refs/tags/v')
shell: bash
run: |
for i in Rdmp.Core/Rdmp.Core.csproj Rdmp.UI/Rdmp.UI.csproj Tests.Common/Tests.Common.csproj
Expand All @@ -190,9 +198,11 @@ jobs:
run: dotnet nuget push HIC.RDMP.Plugin*${{ steps.version.outputs.rdmpversion }}.nupkg -s https://api.nuget.org/v3/index.json --skip-duplicate -k ${{ secrets.NUGET_KEY }}

- name: Calculate SHA256SUMS
if: contains(github.ref, 'refs/tags/v')
run: '&{foreach ($i in Get-ChildItem dist -Exclude *SUMS|Get-FileHash) { echo "$($i.Hash) $(echo $i | Split-Path -Leaf)" }} > dist/SHA256SUMS'

- name: Archive production artifacts
if: contains(github.ref, 'refs/tags/v') || contains('refs/heads/main refs/heads/develop',github.ref)
uses: actions/upload-artifact@v3
with:
name: dist
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,21 @@ jobs:
- name: Build
run: dotnet build

- name: SecurityCodescan
run: |
dotnet tool install --global security-scan
mkdir -p sarif-results
security-scan HIC.DataManagementPlatform.sln -n -x sarif-results/scs.sarif
sed -i 's/"language": ""/"language": "en-US"/' sarif-results/scs.sarif
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
upload: False
output: sarif-results

- name: Upload SARIF
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: sarif-results
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
submodules: true
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
uses: actions/setup-dotnet@v4.0.0
with:
dotnet-version: 6.0.x
- name: Cache Nuget
Expand Down
23 changes: 0 additions & 23 deletions Application/ResearchDataManagementPlatform/NLog.template.config

This file was deleted.

2 changes: 0 additions & 2 deletions Application/ResearchDataManagementPlatform/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.IO;
using System.Runtime.InteropServices;
using CommandLine;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.ReusableLibraryCode;
using Rdmp.Core.ReusableLibraryCode.Checks;
using Rdmp.Core.Startup;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<DebugType>embedded</DebugType>
<DebugSymbols>true</DebugSymbols>
<PublishSingleFile>true</PublishSingleFile>
<PublishReadyToRun>true</PublishReadyToRun>
<ServerGarbageCollection>true</ServerGarbageCollection>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -29,17 +28,10 @@
<ItemGroup>
<EmbeddedResource Remove="Updates\UpdaterUI.resx" />
</ItemGroup>
<ItemGroup>
<None Remove="NLog.template.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ConsoleControl" Version="1.3.0" />
<PackageReference Include="Autoupdater.NET.Official" Version="1.8.4" />
<PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
<PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -70,9 +62,6 @@
</Compile>
<Content Include="Icon\main.ico" />
<Content Include="Icon\main.png" />
<Content Include="NLog.template.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Update="RDMPMainForm.resx">
<DependentUpon>RDMPMainForm.cs</DependentUpon>
</EmbeddedResource>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@ public override IEnumerable<Type> GetIgnoredCommands()
yield return typeof(ExecuteCommandRefreshObject);
yield return typeof(ExecuteCommandChangeExtractability);
yield return typeof(ExecuteCommandOpenInExplorer);
yield return typeof(ExecuteCommandDeletePlugin);
yield return typeof(ExecuteCommandCreateNewFileBasedProcessTask);
}

Expand Down Expand Up @@ -831,6 +832,11 @@ public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabase

public override IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline)
{

if(useCase is not null && pipeline is not null)
{
return new PipelineRunner(useCase, pipeline);
}
var configureAndExecuteDialog = new ConfigureAndExecutePipelineUI(args, useCase, this)
{
Dock = DockStyle.Fill
Expand All @@ -855,9 +861,27 @@ public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTab
return ui.ShowDialog() == DialogResult.OK ? ui.Result : null;
}

public override CohortHoldoutLookupRequest GetCohortHoldoutLookupRequest(ExternalCohortTable externalCohortTable, IProject project, CohortIdentificationConfiguration cic)
{
// if on wrong Thread
if (_mainDockPanel?.InvokeRequired ?? false)
return _mainDockPanel.Invoke(() =>
GetCohortHoldoutLookupRequest(externalCohortTable, project, cic));

var ui = new Rdmp.UI.CohortUI.CreateHoldoutLookup.CreateHoldoutLookupUI(this, externalCohortTable, cic);

if (!string.IsNullOrWhiteSpace(cic.Description))
ui.CohortDescription = $"{cic.Description} ({Environment.UserName} - {DateTime.Now})";
return ui.ShowDialog() == DialogResult.OK ? ui.Result : null;
}

public override ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo,
ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific, string folder)
{
if(extractionIdentifierColumns is not null)
{
return base.CreateAndConfigureCatalogue(tableInfo, extractionIdentifierColumns, initialDescription, projectSpecific, folder);
}
// if on wrong Thread
if (_mainDockPanel?.InvokeRequired ?? false)
return _mainDockPanel.Invoke(() => CreateAndConfigureCatalogue(tableInfo, extractionIdentifierColumns,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

using FAnsi.Discovery;
using Rdmp.Core.CommandExecution;
using System.Collections.Generic;
using Equ;
using Rdmp.Core.MapsDirectlyToDatabaseTable;

Expand Down
Loading

0 comments on commit 1446bc6

Please sign in to comment.