Skip to content

Commit

Permalink
marge v8.4.3 into main (#2145)
Browse files Browse the repository at this point in the history
* simple db update

* add changelog

* revert csproj

* Fix up some codeql/inspection code issues (#2087)

* Update OverviewModel.cs

Fix up some .Dispose/using issues, make finding most recent load ID more efficient

* LINQ tidying

* CodeQL fixups

* Update Catalogue.cs

Add Hashcode, Equals methods.

* Update Catalogue.cs

Tweak equality semantics for RDMP DB oddities

* Bump actions/setup-dotnet from 4.1.0 to 4.2.0

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](actions/setup-dotnet@v4.1.0...v4.2.0)

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

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

* Bump NUnit.Analyzers from 4.4.0 to 4.5.0

Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.4.0 to 4.5.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.4.0...4.5.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 Minio from 6.0.3 to 6.0.4

Bumps [Minio](https://github.com/minio/minio-dotnet) from 6.0.3 to 6.0.4.
- [Release notes](https://github.com/minio/minio-dotnet/releases)
- [Commits](minio/minio-dotnet@6.0.3...6.0.4)

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

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

* Bump the aws-sdk group across 1 directory with 4 updates

Bumps the aws-sdk group with 4 updates in the / directory: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net).


Updates `AWSSDK.S3` from 3.7.410.6 to 3.7.411
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits/3.7.411.0)

Updates `AWSSDK.SecurityToken` from 3.7.401.13 to 3.7.401.21
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSO` from 3.7.400.64 to 3.7.400.72
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSOOIDC` from 3.7.400.64 to 3.7.400.72
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

---
updated-dependencies:
- dependency-name: AWSSDK.S3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SecurityToken
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSO
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSOOIDC
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
...

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

* Bump coverlet.collector from 6.0.2 to 6.0.3

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

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

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

* Bump YamlDotNet from 16.2.1 to 16.3.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 16.2.1 to 16.3.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v16.2.1...v16.3.0)

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

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

* Bump NUnit from 4.3.0 to 4.3.2

Bumps [NUnit](https://github.com/nunit/nunit) from 4.3.0 to 4.3.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/main/CHANGES.md)
- [Commits](nunit/nunit@4.3.0...4.3.2)

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

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

* tidy up

* fix simple file extractor

* fix white space

* Bump SixLabors.ImageSharp and SixLabors.ImageSharp.Drawing (#2112)

Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) and [SixLabors.ImageSharp.Drawing](https://github.com/SixLabors/ImageSharp.Drawing). These dependencies needed to be updated together.

Updates `SixLabors.ImageSharp` from 3.1.6 to 3.1.6
- [Release notes](https://github.com/SixLabors/ImageSharp/releases)
- [Commits](SixLabors/ImageSharp@v3.1.6...v3.1.6)

Updates `SixLabors.ImageSharp.Drawing` from 2.1.4 to 2.1.5
- [Release notes](https://github.com/SixLabors/ImageSharp.Drawing/releases)
- [Commits](SixLabors/ImageSharp.Drawing@v2.1.4...v2.1.5)

---
updated-dependencies:
- dependency-name: SixLabors.ImageSharp
  dependency-type: direct:production
  update-type: version-update:semver-patch
- 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 NUnit.Analyzers from 4.5.0 to 4.6.0 (#2111)

Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 4.5.0 to 4.6.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.5.0...4.6.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 the aws-sdk group with 4 updates (#2110)

Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net).


Updates `AWSSDK.S3` from 3.7.411 to 3.7.411.5
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SecurityToken` from 3.7.401.21 to 3.7.401.26
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSO` from 3.7.400.72 to 3.7.400.77
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSOOIDC` from 3.7.400.72 to 3.7.400.77
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

---
updated-dependencies:
- dependency-name: AWSSDK.S3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SecurityToken
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSO
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSOOIDC
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
...

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

* Bump NunitXml.TestLogger from 4.1.0 to 5.0.0 (#2098)

* Bump NunitXml.TestLogger from 4.1.0 to 5.0.0

Bumps [NunitXml.TestLogger](https://github.com/spekt/testlogger) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/spekt/testlogger/releases)
- [Changelog](https://github.com/spekt/testlogger/blob/master/CHANGELOG.md)
- [Commits](spekt/testlogger@v4.1.0...v5.0.0)

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

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

* Remove disused test loggers

* Remove old TestLogger ref from docs

---------

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 <>
Co-authored-by: James Friel <[email protected]>

* Bump shogo82148/actions-setup-perl from 1.31.4 to 1.32.0 (#2117)

* Bump the aws-sdk group with 4 updates

Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net).


Updates `AWSSDK.S3` from 3.7.411.5 to 3.7.412.2
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SecurityToken` from 3.7.401.26 to 3.7.401.31
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSO` from 3.7.400.77 to 3.7.400.82
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSOOIDC` from 3.7.400.77 to 3.7.400.82
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

---
updated-dependencies:
- dependency-name: AWSSDK.S3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SecurityToken
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSO
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSOOIDC
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
...

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

* Bump Microsoft.Bcl.AsyncInterfaces from 9.0.0 to 9.0.1

Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v9.0.0...v9.0.1)

---
updated-dependencies:
- dependency-name: Microsoft.Bcl.AsyncInterfaces
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump System.Resources.Extensions from 9.0.0 to 9.0.1

Bumps [System.Resources.Extensions](https://github.com/dotnet/runtime) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v9.0.0...v9.0.1)

---
updated-dependencies:
- dependency-name: System.Resources.Extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Bump coverlet.collector from 6.0.3 to 6.0.4

Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.3 to 6.0.4.
- [Release notes](https://github.com/coverlet-coverage/coverlet/releases)
- [Commits](coverlet-coverage/coverlet@v6.0.3...v6.0.4)

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

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

* Bump dotnet-sdk from 9.0.101 to 9.0.102

Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 9.0.101 to 9.0.102.
- [Release notes](https://github.com/dotnet/sdk/releases)
- [Commits](https://github.com/dotnet/sdk/commits/v9.0.102)

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

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

* Bump the aws-sdk group with 4 updates (#2124)

Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net).


Updates `AWSSDK.S3` from 3.7.412.2 to 3.7.412.4
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SecurityToken` from 3.7.401.31 to 3.7.401.33
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSO` from 3.7.400.82 to 3.7.400.84
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSOOIDC` from 3.7.400.82 to 3.7.400.85
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

---
updated-dependencies:
- dependency-name: AWSSDK.S3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SecurityToken
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSO
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSOOIDC
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
...

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

* Bump coverallsapp/github-action from 2.3.4 to 2.3.6

Bumps [coverallsapp/github-action](https://github.com/coverallsapp/github-action) from 2.3.4 to 2.3.6.
- [Release notes](https://github.com/coverallsapp/github-action/releases)
- [Commits](coverallsapp/github-action@v2.3.4...v2.3.6)

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

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

* Bump shogo82148/actions-setup-perl from 1.32.0 to 1.33.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]>

* add filter

* tidy up

* Bump actions/setup-dotnet from 4.2.0 to 4.3.0

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](actions/setup-dotnet@v4.2.0...v4.3.0)

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

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

* Bump the aws-sdk group with 4 updates

Bumps the aws-sdk group with 4 updates: [AWSSDK.S3](https://github.com/aws/aws-sdk-net), [AWSSDK.SecurityToken](https://github.com/aws/aws-sdk-net), [AWSSDK.SSO](https://github.com/aws/aws-sdk-net) and [AWSSDK.SSOOIDC](https://github.com/aws/aws-sdk-net).


Updates `AWSSDK.S3` from 3.7.412.4 to 3.7.413.1
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits/3.7.413.1)

Updates `AWSSDK.SecurityToken` from 3.7.401.33 to 3.7.401.35
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSO` from 3.7.400.84 to 3.7.400.86
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

Updates `AWSSDK.SSOOIDC` from 3.7.400.85 to 3.7.400.87
- [Release notes](https://github.com/aws/aws-sdk-net/releases)
- [Changelog](https://github.com/aws/aws-sdk-net/blob/main/SDK.CHANGELOG.MD)
- [Commits](https://github.com/aws/aws-sdk-net/commits)

---
updated-dependencies:
- dependency-name: AWSSDK.S3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SecurityToken
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSO
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
- dependency-name: AWSSDK.SSOOIDC
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: aws-sdk
...

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

* Bump NLog from 5.3.4 to 5.4.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.3.4 to 5.4.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](NLog/NLog@v5.3.4...v5.4.0)

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

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

* tidy up

* update cohort deprecation text (#2130)

* update cohort deprecation text

* fix typo

* fix restarter (#2121)

* Spike/rdmp 282 cohort temp tables (#2131)

* interim

* add cohort temp table

* tidy up code

* handle all types of db

* tidy up

* tidy up

* add changelog

* add error handling

* Task/rdmp 265 version data loads (#2125)

* basic versions

* add basic versioning

* add versioning

* rename file

* update changelog

* fix catalogue

* fix sql

* fix up sql

* update delete

* add tests

* tidy up

* fiz clone

* fix up tree structure

* clone version

* tidy up

* fix up cohort freezing and warning ui alert

* add chnagelog

* tidy up

* tidy up

* Feature/spillchuck (#2133)

* Fix non-UTF8 character in version text

* Fix a few typos.

* Fix link filename

* Update URL for Atlassian HIC docs

---------

Co-authored-by: James A Sutherland <>

* Task/rdmp 276 catalogue metadata (#2120)

* add basic editable

* intermin new ui

* smarter binding

* tab updates

* remove unused

* workign dropdowns

* finish bindings

* update tests

* update chips

* use group boxes

* use group boxes

* better layout

* working ui

* update tests

* update tests

* add missing file

* tidy up

* add scroll

* fix up scroll bars

* downward scroll

* tidy up

* tidy up

* add purpose of dataset

* add additional info

* add missing file

* attempt to fix test

* add tooltips

* add missing file

* improve display

* add tooltips

* update helper text

* rename

* update data source parsing

* tidy up

* add other

* move other

* update chip

* fix data surce types of catalogue

* fix copy to mem

* Feature/fixusings (#2135)

* Finally fix that joink typo

* Update ObjectConstructor.cs

Redundant verbatim prefix

* Remove redundant usings

* Redundant string interpolations

* Redundant qualifiers (e.g. System.foo -> foo)

* Update RedactCatalogueUI.cs

* Redundant initialisers

* add rc versioning

* Bump dotnet-sdk from 9.0.102 to 9.0.200 (#2137)

Bumps [dotnet-sdk](https://github.com/dotnet/sdk) from 9.0.102 to 9.0.200.
- [Release notes](https://github.com/dotnet/sdk/releases)
- [Commits](dotnet/sdk@v9.0.102...v9.0.200)

---
updated-dependencies:
- dependency-name: dotnet-sdk
  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]>

* Bump System.Resources.Extensions from 9.0.1 to 9.0.2 (#2136)

Bumps [System.Resources.Extensions](https://github.com/dotnet/runtime) from 9.0.1 to 9.0.2.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](dotnet/runtime@v9.0.1...v9.0.2)

---
updated-dependencies:
- dependency-name: System.Resources.Extensions
  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]>

* add rc versioning (#2138)

* add missing file

* interim

* set release date

* update changelog

* bump docker ubuntu version

* fix typo

* update shared assembly

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: James A Sutherland <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: rdteviotdale <[email protected]>
  • Loading branch information
4 people authored Feb 24, 2025
1 parent 43bc53f commit 8f35b0f
Show file tree
Hide file tree
Showing 444 changed files with 7,269 additions and 4,262 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.3.0
- name: Populate Databases.yaml
shell: bash
run: |
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
mv `find coverage -type f` db-ui.lcov
dotnet test Rdmp.Core.Tests/Rdmp.Core.Tests.csproj --nologo --collect:"XPlat Code Coverage" --no-build --verbosity minimal -c Release -e AWS_ENDPOINT_URL="http://127.0.0.1:9000" --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
mv `find coverage -type f` db-core.lcov
- uses: coverallsapp/[email protected].4
- uses: coverallsapp/[email protected].6
with:
github-token: ${{ secrets.github_token }}
files: ./db-ui.lcov ./db-core.lcov
Expand All @@ -86,7 +86,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.3.0
- name: Populate Databases.yaml
shell: bash
run: |
Expand Down Expand Up @@ -141,7 +141,7 @@ 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 -e AWS_ENDPOINT_URL="http://127.0.0.1:9000" --results-directory coverage -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=lcov
mv `find coverage -type f` fs-core.lcov
- uses: coverallsapp/[email protected].4
- uses: coverallsapp/[email protected].6
with:
github-token: ${{ secrets.github_token }}
files: ./fs-ui.lcov ./fs-core.lcov
Expand All @@ -154,13 +154,13 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.3.0
- name: Determine RDMP build version
id: version
shell: bash
run: perl -ne "print \"rdmpversion=\$1\n\" if /AssemblyInformationalVersion\(\"([0-9a-z.-]+)\"\)/;" SharedAssemblyInfo.cs >> $GITHUB_OUTPUT
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.3.0
with:
dotnet-version: 7.0.x
- name: BundleSource
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
- name: Install Perl dependencies
uses: shogo82148/actions-setup-perl@v1.31.4
uses: shogo82148/actions-setup-perl@v1.33.0
with:
install-modules-with: cpanm
install-modules: Archive::Zip Archive::Tar
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
path: ${{ github.workspace }}/
key: ${{ github.sha }}-your-cache-key-bundled
- name: setup .NET
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.3.0
- name: Determine RDMP build version
id: version
shell: bash
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: setup .NET
uses: actions/[email protected]
uses: actions/[email protected]
with:
global-json-file: global.json
dotnet-version: '6.0.x'

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
build:
name: Build and push Docker image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: read
packages: write
Expand All @@ -17,7 +17,7 @@ jobs:
with:
submodules: true
- name: Setup .NET Core
uses: actions/setup-dotnet@v4.1.0
uses: actions/setup-dotnet@v4.3.0
with:
dotnet-version: 6.0.x
- name: Cache Nuget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,13 @@ public void SetWindowManager(WindowManager windowManager)
}

launchAnotherInstanceToolStripMenuItem.ToolTipText =
"Start another copy of the RDMP process targetting the same (or another) RDMP platform database";
"Start another copy of the RDMP process targeting the same (or another) RDMP platform database";

if (switchToInstanceToolStripMenuItem.DropDownItems.Count > 1)
{
switchToInstanceToolStripMenuItem.Enabled = true;
switchToInstanceToolStripMenuItem.ToolTipText =
"Close the application and start another copy of the RDMP process targetting another RDMP platform database";
"Close the application and start another copy of the RDMP process targeting another RDMP platform database";
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion Application/ResearchDataManagementPlatform/Theme/Themes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace ResearchDataManagementPlatform.Theme;

//These classes should not be moved. They are referenced by name in UserSettingsFileUI and UserSettings
[System.ComponentModel.DesignerCategory("")]
[DesignerCategory("")]
public class MyVS2015BlueTheme : VS2015BlueTheme, ITheme
{
private ThemeExtender _extender;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,18 @@ public override void Publish(IMapsDirectlyToDatabaseTable databaseEntity)
RefreshBus.Publish(this, new RefreshObjectEventArgs(de));
}

public override void ShowWarning(string message)
{
// if on wrong Thread
if (_mainDockPanel?.InvokeRequired ?? false)
{
_mainDockPanel.Invoke(() => ShowWarning(message));
return;
}

WideMessageBox.Show("Message", message, Environment.StackTrace, true, null, WideMessageBoxTheme.Warning);
}

public override void Show(string title, string message)
{
// if on wrong Thread
Expand Down Expand Up @@ -386,7 +398,7 @@ private T Activate<T, T2>(T2 databaseObject, Image<Rgba32> tabImage)

uiInstance.SetDatabaseObject(this, databaseObject);

if (insertIndex is not null)
if (insertIndex is not null && _mainDockPanel.ActivePane is not null)
{
_mainDockPanel.ActivePane.SetContentIndex(floatable, (int)insertIndex);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.

/// <summary>
/// A Document Tab that hosts an RDMPSingleDatabaseObjectControl T, the control knows how to save itself to the persistence settings file for the user ensuring that when they next open the
/// software the Tab can be reloaded and displayed. Persistance involves storing this Tab type, the Control type being hosted by the Tab (a RDMPSingleDatabaseObjectControl) and the object
/// software the Tab can be reloaded and displayed. Persistence involves storing this Tab type, the Control type being hosted by the Tab (a RDMPSingleDatabaseObjectControl) and the object
/// ID , object Type and Repository (DataExport or Catalogue) of the T object currently held in the RDMPSingleDatabaseObjectControl.
/// </summary>
[System.ComponentModel.DesignerCategory("")]
[DesignerCategory("")]
[TechnicalUI]
public class PersistableSingleDatabaseObjectDockContent : RDMPSingleControlTab
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.

/// <summary>
/// A Document Tab that hosts an RDMPCollection, the control knows how to save itself to the persistence settings file for the user ensuring that when they next open the
/// software the Tab can be reloaded and displayed. Persistance involves storing this Tab type, the Collection Control type being hosted by the Tab (an RDMPCollection).
/// software the Tab can be reloaded and displayed. Persistence involves storing this Tab type, the Collection Control type being hosted by the Tab (an RDMPCollection).
/// Since there can only ever be one RDMPCollection of any Type active at a time this is all that must be stored to persist the control
/// </summary>
[TechnicalUI]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.
/// <summary>
/// TECHNICAL: Base class for all dockable tabs that host a single control
/// </summary>
[System.ComponentModel.DesignerCategory("")]
[DesignerCategory("")]
[TechnicalUI]
public class RDMPSingleControlTab : DockContent, IRefreshBusSubscriber
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ internal void OnFormClosing(System.Windows.Forms.FormClosingEventArgs e)
/// <summary>
/// Attempts to ensure that a compatible RDMPCollectionUI is made visible for the supplied object which must be one of the expected root Tree types of
/// an RDMPCollectionUI. For example Project is the a root object of DataExportCollectionUI. If a matching collection is already visible or no collection
/// supports the supplied object as a root object then nothing will happen. Otherwise the coresponding collection will be shown
/// supports the supplied object as a root object then nothing will happen. Otherwise the corresponding collection will be shown
/// </summary>
/// <param name="root"></param>
public void ShowCollectionWhichSupportsRootObjectType(object root)
Expand Down Expand Up @@ -415,13 +415,13 @@ public PersistableObjectCollectionDockContent GetActiveWindowIfAnyFor(Type windo
/// Check whether a given RDMPSingleControlTab is already showing with the given DatabaseObject (e.g. is user currently editing Catalogue bob in CatalogueUI)
/// </summary>
/// <exception cref="ArgumentException"></exception>
/// <param name="windowType">A Type derrived from RDMPSingleControlTab</param>
/// <param name="windowType">A Type derived from RDMPSingleControlTab</param>
/// <param name="databaseObject">An instance of an object which matches the windowType</param>
/// <returns></returns>
public bool AlreadyActive(Type windowType, IMapsDirectlyToDatabaseTable databaseObject)
{
return !typeof(IRDMPSingleDatabaseObjectControl).IsAssignableFrom(windowType)
? throw new ArgumentException("windowType must be a Type derrived from RDMPSingleControlTab")
? throw new ArgumentException("windowType must be a Type derived from RDMPSingleControlTab")
: _trackedWindows.OfType<PersistableSingleDatabaseObjectDockContent>().Any(t =>
t.Control.GetType() == windowType && t.DatabaseObject.Equals(databaseObject));
}
Expand Down
Loading

0 comments on commit 8f35b0f

Please sign in to comment.