Merge branch 'develop' of https://github.com/HicServices/RDMP into task/RDMP-265-version-data-loads

Author: JFriel

.github/workflows/build.yml

@@ -216,7 +216,7 @@ jobs:
 
 
       - name: Install Perl dependencies
-        uses: shogo82148/actions-setup-perl@v1.31.4
+        uses: shogo82148/actions-setup-perl@v1.32.0
         with:
           install-modules-with: cpanm
           install-modules: Archive::Zip Archive::Tar

.github/workflows/codeql.yml

@@ -27,6 +27,9 @@ jobs:
         uses: actions/checkout@v4
       - name: setup .NET
         uses: actions/[email protected]
+        with:
+          global-json-file: global.json
+          dotnet-version: '6.0.x'
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Build on and target .Net 9 rather than 8
 - Simplify DB Patching Interface
+- Fix issue with Simple File Extractor pipeline component checking
 
 ## [8.4.2] - 2024-12-18
 

Directory.Packages.props

@@ -1,17 +1,17 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.411.5" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.26" />
-    <PackageVersion Include="AWSSDK.SSO" Version="3.7.400.77" />
-    <PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.77" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.412.2" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.31" />
+    <PackageVersion Include="AWSSDK.SSO" Version="3.7.400.82" />
+    <PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.82" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Equ" Version="2.3.0" />
     <PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
     <PackageVersion Include="FluentFTP" Version="52.0.0" />
     <PackageVersion Include="HIC.SynthEHR" Version="2.0.1" />
     <PackageVersion Include="HIC.FAnsiSql" Version="3.2.7" />
     <PackageVersion Include="LibArchive.Net" Version="0.1.5" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -36,14 +36,13 @@
     <PackageVersion Include="NUnit" Version="4.3.2" />
     <PackageVersion Include="ObjectListView.Repack.NET6Plus" Version="2.9.5" />
     <PackageVersion Include="Scintilla.NET" Version="5.3.2.9" />
-    <PackageVersion Include="System.Resources.Extensions" Version="9.0.0" />
+    <PackageVersion Include="System.Resources.Extensions" Version="9.0.1" />
     <PackageVersion Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16" />
     <PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1" />
-    <PackageVersion Include="NunitXml.TestLogger" Version="4.1.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.3" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
   </ItemGroup>
-</Project>
+</Project>

Documentation/CodeTutorials/PluginWriting.md

@@ -504,7 +504,6 @@ dotnet add package HIC.RDMP.Plugin.Test
 dotnet add package Microsoft.NET.Test.Sdk
 dotnet add package NUnit
 dotnet add package NUnit3TestAdapter
-dotnet add package NunitXml.TestLogger
 ```
 
 Add the following test:
@@ -516,27 +515,26 @@ using Rdmp.Core.DataFlowPipeline;
 using ReusableLibraryCode.Progress;
 using System.Data;
 
-namespace MyPipelinePluginTests
+namespace MyPipelinePluginTests;
+
+public class TestAnonymisationPlugins
 {
-    public class TestAnonymisationPlugins
+    [Test]
+    public void TestBasicDataTableAnonymiser1()
     {
-        [Test]
-        public void TestBasicDataTableAnonymiser1()
-        {
-            var dt = new DataTable();
-            dt.Columns.Add("Story");
-            dt.Rows.Add(new[] {"Thomas went to school regularly"});
-            dt.Rows.Add(new[] {"It seems like Wallace went less regularly"});
-            dt.Rows.Add(new[] {"Mr Smitty was the teacher"});
-
-            var a = new BasicDataTableAnonymiser1();
-            var resultTable = a.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
-
-            Assert.AreEqual(resultTable.Rows.Count,3);
-            Assert.AreEqual("REDACTED went to school regularly",resultTable.Rows[0][0]);
-            Assert.AreEqual("It seems like REDACTED went less regularly",resultTable.Rows[1][0]);
-            Assert.AreEqual("Mr Smitty was the teacher",resultTable.Rows[2][0]);
-        }
+        using var dt = new DataTable();
+        dt.Columns.Add("Story");
+        dt.Rows.Add(new[] {"Thomas went to school regularly"});
+        dt.Rows.Add(new[] {"It seems like Wallace went less regularly"});
+        dt.Rows.Add(new[] {"Mr Smitty was the teacher"});
+
+        var a = new BasicDataTableAnonymiser1();
+        var resultTable = a.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+
+        Assert.AreEqual(resultTable.Rows.Count,3);
+        Assert.AreEqual("REDACTED went to school regularly",resultTable.Rows[0][0]);
+        Assert.AreEqual("It seems like REDACTED went less regularly",resultTable.Rows[1][0]);
+        Assert.AreEqual("Mr Smitty was the teacher",resultTable.Rows[2][0]);
     }
 }
 

Rdmp.Core.Tests/Rdmp.Core.Tests.csproj

@@ -80,7 +80,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NunitXml.TestLogger" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Rdmp.Core\Rdmp.Core.csproj" />

Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs

@@ -72,17 +72,6 @@ public override void Check(ICheckNotifier notifier)
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"PerPatient is false but Pattern {Pattern} contains token $p.  This token will never be matched in MoveAll mode",
                 CheckResult.Fail));
-
-        try
-        {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Output path is:{GetDestinationDirectory()}",
-                CheckResult.Success));
-        }
-        catch (Exception ex)
-        {
-            throw new Exception(
-                "Unable to to determine output directory from 'OutputDirectoryName'.  Perhaps pattern is bad", ex);
-        }
     }
 
     protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener,

Rdmp.UI.Tests/Rdmp.UI.Tests.csproj

@@ -30,7 +30,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NunitXml.TestLogger" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Application\ResearchDataManagementPlatform\ResearchDataManagementPlatform.csproj" />

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.101",
+    "version": "9.0.102",
     "rollForward": "minor"
   }
 }