add dicom to csv pipeline component

SMI · Feb 3, 2025 · 60da60e · 60da60e
1 parent 52e9e79
commit 60da60e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 11 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -26,8 +26,14 @@ jobs:
         id: version
         shell: cmd
         run: |
-          for /f tokens^=1^,2^ delims^=^" %%i in (SharedAssemblyInfo.cs) do @if "%%i"=="[assembly: AssemblyVersion(" echo version=%%j>> %GITHUB_OUTPUT%
-          perl -ne "print """rdmpversion=""".$1."""\n""" if /version>(.+)</i"  RDMP\directory.build.props >>%GITHUB_OUTPUT%
+          perl getversions.pl
+          perl getversions.pl >> %GITHUB_OUTPUT%
+      - name: Fetch RDMP latest tag
+        run: |
+          cd RDMP
+          git fetch --unshallow --tags
+          git checkout v${{steps.version.outputs.rdmpversion}}
+          cd ..
       - name: Install MS SQL 2019
         uses: crazy-max/ghaction-chocolatey@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [7.1.4] - Unreleased
+
+- Add DicomToCSV pipeline component
 
 ## [7.1.3] 2024-12-02
 

diff --git a/RDMP b/RDMP
diff --git a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj
@@ -42,15 +42,15 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NunitXml.TestLogger" Version="4.1.0" />
+    <PackageReference Include="NunitXml.TestLogger" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="TestDatabases.txt">

diff --git a/Rdmp.Dicom.UI/TagColumnAdderUI.cs b/Rdmp.Dicom.UI/TagColumnAdderUI.cs
@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using Rdmp.Core.Curation.Data;
 using Rdmp.Dicom.TagPromotionSchema;
+using System.ComponentModel;
 
 namespace Rdmp.Dicom.UI;
 
@@ -37,7 +38,9 @@ private void cbxTag_SelectedIndexChanged(object sender, EventArgs e)
         }
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string ColumnName { get; private set; }
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public string ColumnDataType { get; private set; }
 
     private void btnOk_Click(object sender, EventArgs e)

diff --git a/Rdmp.Dicom.UI/TagElevationXmlUI.cs b/Rdmp.Dicom.UI/TagElevationXmlUI.cs
@@ -8,6 +8,7 @@
 using System.Runtime.Versioning;
 using System.Windows.Forms;
 using Rdmp.UI.ScintillaHelper;
+using System.ComponentModel;
 
 namespace Rdmp.Dicom.UI;
 
@@ -71,6 +72,7 @@ private void RunChecks()
         }
     }
 
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public ICatalogueRepository CatalogueRepository { get;set; }
 
     public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()

diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -12,7 +12,7 @@
 [assembly: AssemblyCulture("")]
 
 // These should be replaced with correct values by the release process
-[assembly: AssemblyVersion("7.1.3")]
-[assembly: AssemblyFileVersion("7.1.3")]
-[assembly: AssemblyInformationalVersion("7.1.3")]
+[assembly: AssemblyVersion("7.1.4")]
+[assembly: AssemblyFileVersion("7.1.4")]
+[assembly: AssemblyInformationalVersion("7.1.4")]
 [assembly: InternalsVisibleTo("Rdmp.Dicom.Tests")]
+10 −1		CHANGELOG.md
+1 −0		Directory.Packages.props
+1 −0		Documentation/CodeTutorials/Packages.md
+32 −0		Rdmp.Core.Tests/DataLoad/Modules/Attachers/AttacherMEFTest.cs
+1 −1		Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPerformRegexRedactionOnCatalogue.cs
+1 −1		Rdmp.Core/Curation/Data/Overview/OverviewModel.cs
+5 −0		Rdmp.Core/DataLoad/Engine/Attachers/Attacher.cs
+1 −0		Rdmp.Core/DataLoad/Modules/Attachers/RemoteAttacher.cs
+4 −1		Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs
+19 −0		Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableWithoutDBCreationAttacher.cs
+1 −1		Rdmp.Core/DataLoad/Modules/Mutilators/RegexRedactionMutilator.cs
+1 −0		Rdmp.Core/Rdmp.Core.csproj
+2 −1		Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs
+3 −3		SharedAssemblyInfo.cs
+2 −2		rdmp-client.xml