Merge branch 'develop'

SMI · Sep 28, 2022 · 6060e29 · 6060e29
2 parents b05cc2e + eddf4f3
commit 6060e29
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@ 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
+
 ## [5.0.12] 2022-09-09
 
 - Fixed API for new `Bitmap` substitute (see https://github.com/HicServices/RDMP/pull/1355)
@@ -374,7 +382,9 @@ 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.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
 [5.0.10]: https://github.com/HicServices/RdmpDicom/compare/v5.0.9...v5.0.10

diff --git 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.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.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
@@ -14,9 +14,9 @@
         <copyright>Copyright 2018-2019</copyright>
         <dependencies>
           <dependency id="HIC.DicomTypeTranslation" version="4.0.1" />
-          <dependency id="HIC.RDMP.Plugin" version="7.0.20" />
+          <dependency id="HIC.RDMP.Plugin" version="8.0.0" />
           <dependency id="SharpCompress" version="0.32.2" />
-		  <dependency id="Terminal.Gui" version="1.7.2" />
+		  <dependency id="Terminal.Gui" version="1.8.2" />
         </dependencies>
     </metadata>
   <files>

diff --git a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj
@@ -41,11 +41,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.14" />
-    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="7.0.20" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.117" />
+    <PackageReference Include="NunitXml.TestLogger" Version="3.0.127" />
   </ItemGroup>
   <ItemGroup>
     <None Update="TestDatabases.txt">

diff --git a/Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj b/Rdmp.Dicom.UI/Rdmp.Dicom.UI.csproj
@@ -13,7 +13,7 @@
     <ProjectReference Include="..\Rdmp.Dicom\Rdmp.Dicom.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin.UI" Version="7.0.20" />
+    <PackageReference Include="HIC.RDMP.Plugin.UI" Version="8.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Rdmp.Dicom.nuspec b/Rdmp.Dicom.nuspec
@@ -6,7 +6,7 @@
 		<authors>Health Informatics Service, University of Dundee</authors>
 		<description>Imaging plugin for Research Data Management Platform </description>
 		<dependencies>
-            <dependency id="HIC.RDMP.Plugin" version="7.0" />
+            <dependency id="HIC.RDMP.Plugin" version="8.0" />
 		</dependencies>
     </metadata>
   <files>

diff --git 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 }");
 

diff --git a/Rdmp.Dicom/Rdmp.Dicom.csproj b/Rdmp.Dicom/Rdmp.Dicom.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.1" />
-    <PackageReference Include="HIC.RDMP.Plugin" Version="7.0.20" />
+    <PackageReference Include="HIC.RDMP.Plugin" Version="8.0.0" />
     <PackageReference Include="SharpCompress" Version="0.32.2" />
-    <PackageReference Include="Terminal.Gui" Version="1.7.2" />
+    <PackageReference Include="Terminal.Gui" Version="1.8.2" />
   </ItemGroup>
 </Project>
diff --git 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.1")]
+[assembly: AssemblyFileVersion("6.0.1")]
+[assembly: AssemblyInformationalVersion("6.0.1")]
 [assembly: InternalsVisibleTo("Rdmp.Dicom.Tests")]