Skip to content

Commit afa6b6a

Browse files
JFrielJFriel
committed
Merge branch 'develop' of https://github.com/HicServices/RDMP into task/RDMP-265-version-data-loads
2 parents 89036d0 + 276d613 commit afa6b6a

File tree

9 files changed

+32
-44
lines changed

9 files changed

+32
-44
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
217217
218218
- name: Install Perl dependencies
219-
uses: shogo82148/actions-setup-perl@v1.31.4
219+
uses: shogo82148/actions-setup-perl@v1.32.0
220220
with:
221221
install-modules-with: cpanm
222222
install-modules: Archive::Zip Archive::Tar

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ jobs:
2727
uses: actions/checkout@v4
2828
- name: setup .NET
2929
uses: actions/setup-dotnet@v4.2.0
30+
with:
31+
global-json-file: global.json
32+
dotnet-version: '6.0.x'
3033

3134
- name: Initialize CodeQL
3235
uses: github/codeql-action/init@v3

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
- Build on and target .Net 9 rather than 8
1010
- Simplify DB Patching Interface
11+
- Fix issue with Simple File Extractor pipeline component checking
1112

1213
## [8.4.2] - 2024-12-18
1314

‎Directory.Packages.props‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="AWSSDK.S3" Version="3.7.411.5" />
4-
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.26" />
5-
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.77" />
6-
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.77" />
3+
<PackageVersion Include="AWSSDK.S3" Version="3.7.412.2" />
4+
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.31" />
5+
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.82" />
6+
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.82" />
77
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
88
<PackageVersion Include="Equ" Version="2.3.0" />
99
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
1010
<PackageVersion Include="FluentFTP" Version="52.0.0" />
1111
<PackageVersion Include="HIC.SynthEHR" Version="2.0.1" />
1212
<PackageVersion Include="HIC.FAnsiSql" Version="3.2.7" />
1313
<PackageVersion Include="LibArchive.Net" Version="0.1.5" />
14-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
14+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.1" />
1515
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -36,14 +36,13 @@
3636
<PackageVersion Include="NUnit" Version="4.3.2" />
3737
<PackageVersion Include="ObjectListView.Repack.NET6Plus" Version="2.9.5" />
3838
<PackageVersion Include="Scintilla.NET" Version="5.3.2.9" />
39-
<PackageVersion Include="System.Resources.Extensions" Version="9.0.0" />
39+
<PackageVersion Include="System.Resources.Extensions" Version="9.0.1" />
4040
<PackageVersion Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16" />
4141
<PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1" />
42-
<PackageVersion Include="NunitXml.TestLogger" Version="4.1.0" />
4342
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
4443
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
4544
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4645
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
47-
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
46+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
4847
</ItemGroup>
49-
</Project>
48+
</Project>

‎Documentation/CodeTutorials/PluginWriting.md‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,6 @@ dotnet add package HIC.RDMP.Plugin.Test
504504
dotnet add package Microsoft.NET.Test.Sdk
505505
dotnet add package NUnit
506506
dotnet add package NUnit3TestAdapter
507-
dotnet add package NunitXml.TestLogger
508507
```
509508

510509
Add the following test:
@@ -516,27 +515,26 @@ using Rdmp.Core.DataFlowPipeline;
516515
using ReusableLibraryCode.Progress;
517516
using System.Data;
518517

519-
namespace MyPipelinePluginTests
518+
namespace MyPipelinePluginTests;
519+
520+
public class TestAnonymisationPlugins
520521
{
521-
public class TestAnonymisationPlugins
522+
[Test]
523+
public void TestBasicDataTableAnonymiser1()
522524
{
523-
[Test]
524-
public void TestBasicDataTableAnonymiser1()
525-
{
526-
var dt = new DataTable();
527-
dt.Columns.Add("Story");
528-
dt.Rows.Add(new[] {"Thomas went to school regularly"});
529-
dt.Rows.Add(new[] {"It seems like Wallace went less regularly"});
530-
dt.Rows.Add(new[] {"Mr Smitty was the teacher"});
531-
532-
var a = new BasicDataTableAnonymiser1();
533-
var resultTable = a.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
534-
535-
Assert.AreEqual(resultTable.Rows.Count,3);
536-
Assert.AreEqual("REDACTED went to school regularly",resultTable.Rows[0][0]);
537-
Assert.AreEqual("It seems like REDACTED went less regularly",resultTable.Rows[1][0]);
538-
Assert.AreEqual("Mr Smitty was the teacher",resultTable.Rows[2][0]);
539-
}
525+
using var dt = new DataTable();
526+
dt.Columns.Add("Story");
527+
dt.Rows.Add(new[] {"Thomas went to school regularly"});
528+
dt.Rows.Add(new[] {"It seems like Wallace went less regularly"});
529+
dt.Rows.Add(new[] {"Mr Smitty was the teacher"});
530+
531+
var a = new BasicDataTableAnonymiser1();
532+
var resultTable = a.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
533+
534+
Assert.AreEqual(resultTable.Rows.Count,3);
535+
Assert.AreEqual("REDACTED went to school regularly",resultTable.Rows[0][0]);
536+
Assert.AreEqual("It seems like REDACTED went less regularly",resultTable.Rows[1][0]);
537+
Assert.AreEqual("Mr Smitty was the teacher",resultTable.Rows[2][0]);
540538
}
541539
}
542540

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
<PrivateAssets>all</PrivateAssets>
8181
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8282
</PackageReference>
83-
<PackageReference Include="NunitXml.TestLogger" />
8483
</ItemGroup>
8584
<ItemGroup>
8685
<ProjectReference Include="..\Rdmp.Core\Rdmp.Core.csproj" />

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,6 @@ public override void Check(ICheckNotifier notifier)
7272
notifier.OnCheckPerformed(new CheckEventArgs(
7373
$"PerPatient is false but Pattern {Pattern} contains token $p. This token will never be matched in MoveAll mode",
7474
CheckResult.Fail));
75-
76-
try
77-
{
78-
notifier.OnCheckPerformed(new CheckEventArgs($"Output path is:{GetDestinationDirectory()}",
79-
CheckResult.Success));
80-
}
81-
catch (Exception ex)
82-
{
83-
throw new Exception(
84-
"Unable to to determine output directory from 'OutputDirectoryName'. Perhaps pattern is bad", ex);
85-
}
8675
}
8776

8877
protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
33-
<PackageReference Include="NunitXml.TestLogger" />
3433
</ItemGroup>
3534
<ItemGroup>
3635
<ProjectReference Include="..\Application\ResearchDataManagementPlatform\ResearchDataManagementPlatform.csproj" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.101",
3+
"version": "9.0.102",
44
"rollForward": "minor"
55
}
66
}

0 commit comments

Comments
 (0)