From 9344745f5f4c83ec6ea557ccfe959e2a034c90ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Sep 2022 12:04:04 +0000 Subject: [PATCH 01/10] Bump NunitXml.TestLogger from 3.0.117 to 3.0.127 Bumps [NunitXml.TestLogger](https://github.com/spekt/nunit.testlogger) from 3.0.117 to 3.0.127. - [Release notes](https://github.com/spekt/nunit.testlogger/releases) - [Changelog](https://github.com/spekt/nunit.testlogger/blob/master/CHANGELOG.md) - [Commits](https://github.com/spekt/nunit.testlogger/compare/v3.0.117...v3.0.127) --- updated-dependencies: - dependency-name: NunitXml.TestLogger dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj index 2890a9dd..f27e900a 100644 --- a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj +++ b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj @@ -45,7 +45,7 @@ - + From 28244c39527956d48f081510ba560cb7a8da5660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Sep 2022 12:04:32 +0000 Subject: [PATCH 02/10] Bump Terminal.Gui from 1.7.2 to 1.8.0 Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.7.2 to 1.8.0. - [Release notes](https://github.com/gui-cs/Terminal.Gui/releases) - [Commits](https://github.com/gui-cs/Terminal.Gui/compare/v1.7.2...v1.8.0) --- updated-dependencies: - dependency-name: Terminal.Gui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Rdmp.Dicom/Rdmp.Dicom.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Dicom/Rdmp.Dicom.csproj b/Rdmp.Dicom/Rdmp.Dicom.csproj index 4d263d1e..5b8fc0b7 100644 --- a/Rdmp.Dicom/Rdmp.Dicom.csproj +++ b/Rdmp.Dicom/Rdmp.Dicom.csproj @@ -28,6 +28,6 @@ - + From 0a13400a7a126515ac4e199f8cf03bc8ff07f3cc Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Tue, 20 Sep 2022 09:36:22 -0500 Subject: [PATCH 03/10] Bump Terminal.Gui from 1.7.2 to 1.8.0 --- Packages.md | 2 +- Rdmp.Dicom.Library.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages.md b/Packages.md index e4b20558..1088644a 100644 --- a/Packages.md +++ b/Packages.md @@ -12,4 +12,4 @@ | HIC.DicomTypeTranslation | [GitHub](https://github.com/HicServices/DicomTypeTranslation) | [4.0.1](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Translate dicom types into C# / database types | | | HIC.RDMP.Plugin | [GitHub](https://github.com/HicServices/RDMP) | [7.0.20](https://www.nuget.org/packages/HIC.RDMP.Plugin/7.0.20) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Interact with RDMP objects, base classes for plugin components etc | | | SharpCompress | [GitHub](https://github.com/adamhathcock/sharpcompress) | [0.32.2](https://www.nuget.org/packages/SharpCompress/0.32.2) | [MIT] | Access diverse archive formats including RAR, 7zip | | -| Terminal.Gui | [GitHub](https://github.com/migueldeicaza/gui.cs) | [1.7.2](https://www.nuget.org/packages/Terminal.Gui/1.7.2) | [MIT] | UIs compatible with RDMP gui command line | | +| Terminal.Gui | [GitHub](https://github.com/migueldeicaza/gui.cs) | [1.8.0](https://www.nuget.org/packages/Terminal.Gui/1.8.0) | [MIT] | UIs compatible with RDMP gui command line | | diff --git a/Rdmp.Dicom.Library.nuspec b/Rdmp.Dicom.Library.nuspec index bb02ae6c..b6aac549 100644 --- a/Rdmp.Dicom.Library.nuspec +++ b/Rdmp.Dicom.Library.nuspec @@ -16,7 +16,7 @@ - + From f0803de3bba88899c1451db154122031a00aacf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 12:04:24 +0000 Subject: [PATCH 04/10] Bump Terminal.Gui from 1.8.0 to 1.8.2 Bumps [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui) from 1.8.0 to 1.8.2. - [Release notes](https://github.com/gui-cs/Terminal.Gui/releases) - [Commits](https://github.com/gui-cs/Terminal.Gui/compare/v1.8.0...v1.8.2) --- updated-dependencies: - dependency-name: Terminal.Gui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Rdmp.Dicom/Rdmp.Dicom.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Dicom/Rdmp.Dicom.csproj b/Rdmp.Dicom/Rdmp.Dicom.csproj index 5b8fc0b7..614fe780 100644 --- a/Rdmp.Dicom/Rdmp.Dicom.csproj +++ b/Rdmp.Dicom/Rdmp.Dicom.csproj @@ -28,6 +28,6 @@ - + From 4a2c2e535801e087ee194e2dcdb95ea827837db6 Mon Sep 17 00:00:00 2001 From: James A Sutherland <> Date: Thu, 22 Sep 2022 08:07:30 -0500 Subject: [PATCH 05/10] Bump Terminal.Gui from 1.8.0 to 1.8.2 --- Packages.md | 2 +- Rdmp.Dicom.Library.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages.md b/Packages.md index 1088644a..593e2552 100644 --- a/Packages.md +++ b/Packages.md @@ -12,4 +12,4 @@ | HIC.DicomTypeTranslation | [GitHub](https://github.com/HicServices/DicomTypeTranslation) | [4.0.1](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Translate dicom types into C# / database types | | | HIC.RDMP.Plugin | [GitHub](https://github.com/HicServices/RDMP) | [7.0.20](https://www.nuget.org/packages/HIC.RDMP.Plugin/7.0.20) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Interact with RDMP objects, base classes for plugin components etc | | | SharpCompress | [GitHub](https://github.com/adamhathcock/sharpcompress) | [0.32.2](https://www.nuget.org/packages/SharpCompress/0.32.2) | [MIT] | Access diverse archive formats including RAR, 7zip | | -| Terminal.Gui | [GitHub](https://github.com/migueldeicaza/gui.cs) | [1.8.0](https://www.nuget.org/packages/Terminal.Gui/1.8.0) | [MIT] | UIs compatible with RDMP gui command line | | +| Terminal.Gui | [GitHub](https://github.com/migueldeicaza/gui.cs) | [1.8.2](https://www.nuget.org/packages/Terminal.Gui/1.8.2) | [MIT] | UIs compatible with RDMP gui command line | | diff --git a/Rdmp.Dicom.Library.nuspec b/Rdmp.Dicom.Library.nuspec index b6aac549..b72ef710 100644 --- a/Rdmp.Dicom.Library.nuspec +++ b/Rdmp.Dicom.Library.nuspec @@ -16,7 +16,7 @@ - + From b7eb7d929fdd99e91b6f9d9d76c5aafc1fdf3cdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 12:03:04 +0000 Subject: [PATCH 06/10] Bump Microsoft.NET.Test.Sdk from 17.3.1 to 17.3.2 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.3.1 to 17.3.2. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v17.3.1...v17.3.2) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj index f27e900a..ca516ff7 100644 --- a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj +++ b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj @@ -42,7 +42,7 @@ - + From 9ab0c88b04ad759516dfdf3d391895ebad882d04 Mon Sep 17 00:00:00 2001 From: tznind Date: Tue, 27 Sep 2022 12:13:32 +0100 Subject: [PATCH 07/10] Version 6.0.0 (targetting RDMP version 8.0) --- CHANGELOG.md | 7 ++++++- Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj | 2 +- Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj | 2 +- Rdmp.Dicom.nuspec | 2 +- Rdmp.Dicom/Rdmp.Dicom.csproj | 2 +- SharedAssemblyInfo.cs | 6 +++--- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fcdc9c7..c3035b5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.0.0] 2022-09-27 + +- Updated to target RDMP version 8.0.0 + ## [5.0.12] 2022-09-09 - Fixed API for new `Bitmap` substitute (see https://github.com/HicServices/RDMP/pull/1355) @@ -374,7 +378,8 @@ Updated to be compatible with RDMP 4.2 - Initial commit from private repo -[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v5.0.12...develop +[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v6.0.0...develop +[6.0.0]: https://github.com/HicServices/RdmpDicom/compare/v5.0.12...v6.0.0 [5.0.12]: https://github.com/HicServices/RdmpDicom/compare/v5.0.11...v5.0.12 [5.0.11]: https://github.com/HicServices/RdmpDicom/compare/v5.0.10...v5.0.11 [5.0.10]: https://github.com/HicServices/RdmpDicom/compare/v5.0.9...v5.0.10 diff --git a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj index ca516ff7..06fd9eaf 100644 --- a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj +++ b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj @@ -41,7 +41,7 @@ - + diff --git a/Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj b/Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj index 42af2516..1fa2f9cb 100644 --- a/Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj +++ b/Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj @@ -13,7 +13,7 @@ - + diff --git a/Rdmp.Dicom.nuspec b/Rdmp.Dicom.nuspec index 0a227aba..fc6c590b 100644 --- a/Rdmp.Dicom.nuspec +++ b/Rdmp.Dicom.nuspec @@ -6,7 +6,7 @@ Health Informatics Service, University of Dundee Imaging plugin for Research Data Management Platform - + diff --git a/Rdmp.Dicom/Rdmp.Dicom.csproj b/Rdmp.Dicom/Rdmp.Dicom.csproj index 614fe780..7d0e2bbc 100644 --- a/Rdmp.Dicom/Rdmp.Dicom.csproj +++ b/Rdmp.Dicom/Rdmp.Dicom.csproj @@ -26,7 +26,7 @@ - + diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index d1131cb2..285b096e 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyCulture("")] // These should be replaced with correct values by the release process -[assembly: AssemblyVersion("5.0.12")] -[assembly: AssemblyFileVersion("5.0.12")] -[assembly: AssemblyInformationalVersion("5.0.12")] +[assembly: AssemblyVersion("6.0.0")] +[assembly: AssemblyFileVersion("6.0.0")] +[assembly: AssemblyInformationalVersion("6.0.0")] [assembly: InternalsVisibleTo("Rdmp.Dicom.Tests")] From f1a39f8b18e0bb5d4546384ca9c9bbc143ab5ac7 Mon Sep 17 00:00:00 2001 From: tznind Date: Tue, 27 Sep 2022 12:35:34 +0100 Subject: [PATCH 08/10] Updated nuspec/docs to show correct version of RDMP --- Packages.md | 2 +- Rdmp.Dicom.Library.nuspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages.md b/Packages.md index 593e2552..006280e9 100644 --- a/Packages.md +++ b/Packages.md @@ -10,6 +10,6 @@ | Package | Source Code | Version | License | Purpose | Additional Risk Assessment | | ------- | ------------| --------| ------- | ------- | -------------------------- | | HIC.DicomTypeTranslation | [GitHub](https://github.com/HicServices/DicomTypeTranslation) | [4.0.1](https://www.nuget.org/packages/HIC.DicomTypeTranslation/4.0.1) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Translate dicom types into C# / database types | | -| HIC.RDMP.Plugin | [GitHub](https://github.com/HicServices/RDMP) | [7.0.20](https://www.nuget.org/packages/HIC.RDMP.Plugin/7.0.20) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Interact with RDMP objects, base classes for plugin components etc | | +| HIC.RDMP.Plugin | [GitHub](https://github.com/HicServices/RDMP) | [8.0.0](https://www.nuget.org/packages/HIC.RDMP.Plugin/8.0.0) | [GPL 3.0](https://www.gnu.org/licenses/gpl-3.0.html) | Interact with RDMP objects, base classes for plugin components etc | | | SharpCompress | [GitHub](https://github.com/adamhathcock/sharpcompress) | [0.32.2](https://www.nuget.org/packages/SharpCompress/0.32.2) | [MIT] | Access diverse archive formats including RAR, 7zip | | | Terminal.Gui | [GitHub](https://github.com/migueldeicaza/gui.cs) | [1.8.2](https://www.nuget.org/packages/Terminal.Gui/1.8.2) | [MIT] | UIs compatible with RDMP gui command line | | diff --git a/Rdmp.Dicom.Library.nuspec b/Rdmp.Dicom.Library.nuspec index b72ef710..ad93b2b9 100644 --- a/Rdmp.Dicom.Library.nuspec +++ b/Rdmp.Dicom.Library.nuspec @@ -14,7 +14,7 @@ Copyright 2018-2019 - + From 82d9f32ca730c0afb0cf6fc552d6e337ff5cba60 Mon Sep 17 00:00:00 2001 From: tznind Date: Wed, 28 Sep 2022 16:08:09 +0100 Subject: [PATCH 09/10] Fixes #295 --- .../ExecuteCommandCreateNewImagingDatasetSuite.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs b/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs index b226ddc1..41541c44 100644 --- a/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs +++ b/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs @@ -316,7 +316,7 @@ private void SetArgument(IArgument[] args, string property, object value) var arg = args.Single(a => a.Name.Equals(property)); - var mef = ((CatalogueRepository) arg.Repository).MEF; + var mef = ((ICatalogueRepository) arg.Repository).MEF; if (mef.GetType(value.GetType().FullName) == null) throw new ArgumentException($"No type found for { value.GetType().FullName }"); From 0075809f4c3170f9eb3128a4d56e1716f72adaa4 Mon Sep 17 00:00:00 2001 From: tznind Date: Wed, 28 Sep 2022 16:21:20 +0100 Subject: [PATCH 10/10] Update to v6.0.1 --- CHANGELOG.md | 7 ++++++- SharedAssemblyInfo.cs | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3035b5b..8ae5e267 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.0.1] 2022-09-27 + +- Fixed issue running `ExecuteCommandCreateNewImagingDatasetSuite` when using a YamlRepository + ## [6.0.0] 2022-09-27 - Updated to target RDMP version 8.0.0 @@ -378,7 +382,8 @@ Updated to be compatible with RDMP 4.2 - Initial commit from private repo -[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v6.0.0...develop +[Unreleased]: https://github.com/HicServices/RdmpDicom/compare/v6.0.1...develop +[6.0.1]: https://github.com/HicServices/RdmpDicom/compare/v6.0.0...v6.0.1 [6.0.0]: https://github.com/HicServices/RdmpDicom/compare/v5.0.12...v6.0.0 [5.0.12]: https://github.com/HicServices/RdmpDicom/compare/v5.0.11...v5.0.12 [5.0.11]: https://github.com/HicServices/RdmpDicom/compare/v5.0.10...v5.0.11 diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index 285b096e..f9c11b37 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -8,7 +8,7 @@ [assembly: AssemblyCulture("")] // These should be replaced with correct values by the release process -[assembly: AssemblyVersion("6.0.0")] -[assembly: AssemblyFileVersion("6.0.0")] -[assembly: AssemblyInformationalVersion("6.0.0")] +[assembly: AssemblyVersion("6.0.1")] +[assembly: AssemblyFileVersion("6.0.1")] +[assembly: AssemblyInformationalVersion("6.0.1")] [assembly: InternalsVisibleTo("Rdmp.Dicom.Tests")]