Merge branch 'develop' into feature/attachertidy

SMI · Sep 25, 2024 · d44cf76 · d44cf76
2 parents 155a5e6 + bbe74e4
commit d44cf76
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -39,7 +39,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        run: dotnet build -c Debug
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -21,7 +21,7 @@ jobs:
           path: RDMP
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Get version
         id: version
         shell: cmd

diff --git a/RDMP b/RDMP
diff --git a/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj b/Rdmp.Dicom.Tests/Rdmp.Dicom.Tests.csproj
@@ -43,8 +43,8 @@
   <ItemGroup>
     <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs b/Rdmp.Dicom/CommandExecution/ExecuteCommandCreateNewImagingDatasetSuite.cs
@@ -283,7 +283,7 @@ public override void Execute()
 
         ////////////////////////////////////////////////////////////////////////////////////////////////
 
-        var checker = new CheckEntireDataLoadProcess(NewLoadMetadata, new HICDatabaseConfiguration(NewLoadMetadata), new HICLoadConfigurationFlags());
+        var checker = new CheckEntireDataLoadProcess(BasicActivator, NewLoadMetadata, new HICDatabaseConfiguration(NewLoadMetadata), new HICLoadConfigurationFlags());
         checker.Check(new AcceptAllCheckNotifier());
     }
 
@@ -328,4 +328,4 @@ private void SetArgument(IArgument[] args, string property, object value)
         arg.SetValue(value);
         arg.SaveToDatabase();
     }
-}
+}
diff --git a/Rdmp.Dicom/Rdmp.Dicom.csproj b/Rdmp.Dicom/Rdmp.Dicom.csproj
@@ -32,7 +32,6 @@
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="fo-dicom" Version="5.1.3" />
-		<PackageReference Include="NLog" Version="5.3.3" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\RDMP\Rdmp.Core\Rdmp.Core.csproj" />

diff --git a/rdmpdicom.nuspec b/rdmpdicom.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="8.1.4" />
+            <dependency id="HIC.RDMP.Plugin" version="8.3.0" />
         </dependencies>
     </metadata>
 </package>
+5 −1		.github/dependabot.yml
+1 −1		.github/workflows/build.yml
+1 −1		.github/workflows/docker.yml
+42 −27		Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
+12 −1		CHANGELOG.md
+1 −1		Directory.Build.props
+10 −10		Directory.Packages.props
+16 −0		Documentation/DataLoadEngine/DataLoadChainer.md
+ −		Documentation/DataLoadEngine/Images/AllowReservedPrefixColumns.PNG
+25 −0		Documentation/DataLoadEngine/ReservedColumnPrefixes.md
+3 −2		Rdmp.Core.Tests/DataLoad/Engine/Integration/CheckingTests/ProcessTaskCheckingTests.cs
+4 −3		Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseDataLoadTests.cs
+143 −0		Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadChainerTests.cs
+1 −1		Rdmp.Core.Tests/DataLoad/Engine/Integration/DatabaseOperationTests.cs
+3 −2		Rdmp.Core.Tests/DataLoad/Engine/Integration/TestTemporalTables.cs
+6 −2		Rdmp.Core/CommandExecution/AtomicCommandFactory.cs
+0 −1		...Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCohortIdentificationConfigurationWithProject.cs
+10 −1		Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateVersionOfCohortConfiguration.cs
+30 −0		Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandToggleAllowReservedPrefixForLoadMetadata.cs
+15 −1		Rdmp.Core/CommandExecution/GoToCommandFactory.cs
+5 −2		Rdmp.Core/CommandLine/Runners/DleRunner.cs
+1 −1		Rdmp.Core/CommandLine/Runners/RunnerFactory.cs
+5 −0		Rdmp.Core/Curation/Data/DataLoad/ILoadMetadata.cs
+10 −1		Rdmp.Core/Curation/Data/DataLoad/LoadMetadata.cs
+6 −2		Rdmp.Core/DataLoad/Engine/Checks/CheckEntireDataLoadProcess.cs
+7 −3		Rdmp.Core/DataLoad/Engine/Checks/Checkers/ProcessTaskChecks.cs
+4 −6		Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/DatabaseCloner.cs
+2 −1		Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/TableInfoCloneOperation.cs
+3 −2		Rdmp.Core/DataLoad/Engine/Job/DataLoadJob.cs
+0 −1		Rdmp.Core/DataLoad/Engine/LoadExecution/Components/PopulateRAW.cs
+20 −1		Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/DataProviderRuntimeTask.cs
+1 −1		Rdmp.Core/DataLoad/Engine/LoadProcess/DataLoadProcess.cs
+22 −4		Rdmp.Core/DataLoad/Modules/Attachers/MDFAttacher.cs
+127 −0		Rdmp.Core/DataLoad/Modules/DataProvider/DataLoadChainer.cs
+4 −6		Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs
+1 −0		Rdmp.Core/Databases/CatalogueDatabase/runAfterCreateDatabase/CreateCatalogue.sql
+8 −0		Rdmp.Core/Databases/CatalogueDatabase/up/086_AddDataLoadPrefixOverride.sql
+ −		Rdmp.Core/Icons/CommittedCohortIdentificationNode.png
+13 −1		Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs
+708 −705		Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx
+2 −1		Rdmp.Core/Icons/IconProvision/RDMPConcept.cs
+7 −11		Rdmp.Core/Providers/CatalogueProblemProvider.cs
+17 −0		Rdmp.Core/Providers/DataExportChildProvider.cs
+49 −0		Rdmp.Core/Providers/Nodes/CohortNodes/CommittedCohortIdentificationNode.cs
+2 −0		Rdmp.Core/Rdmp.Core.csproj
+2 −4		Rdmp.UI/CohortUI/ExtractableCohortCollectionUI.cs
+1 −0		Rdmp.UI/ProjectUI/ProjectUI.cs
+3 −3		SharedAssemblyInfo.cs
+4 −3		Tests.Common/Scenarios/TestsRequiringADle.cs
+2 −2		Tests.Common/TestDatabases.txt
+1 −1		rdmp-client.xml