Merge pull request #150 from HicServices/task/prep-9.0.2

rdteviotdale · web-flow · commit cbb76faf6f29 · 2026-03-09T16:22:44.000Z
Task/prep 9.0.2
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: HicServices/RDMP
-          ref: v9.0.0-rc1
+          ref: v9.2.0-rc1
           path: RDMP
       - uses: actions/setup-dotnet@v4
       - name: Get version
diff --git a/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/Execution/ExtractionPipeline/SuccessfullyExtractedResultsDocumenter.cs b/AutomationPlugins/LoadModules.Extensions.AutomationPlugins/Execution/ExtractionPipeline/SuccessfullyExtractedResultsDocumenter.cs
@@ -1,8 +1,6 @@
-﻿using System;
-using System.Data;
-using System.Linq;
-using LoadModules.Extensions.AutomationPlugins.Data;
+﻿using LoadModules.Extensions.AutomationPlugins.Data;
 using LoadModules.Extensions.AutomationPlugins.Data.Repository;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.DataExport.Data;
 using Rdmp.Core.DataExport.DataExtraction.Commands;
 using Rdmp.Core.DataFlowPipeline;
@@ -12,6 +10,9 @@
 using Rdmp.Core.Repositories;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
+using System;
+using System.Data;
+using System.Linq;
 
 namespace LoadModules.Extensions.AutomationPlugins.Execution.ExtractionPipeline;
 
@@ -110,12 +111,12 @@ public void Check(ICheckNotifier notifier)
 
     }
 
-    public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, IExtractCommand value, IDataLoadEventListener listener)
     {
         _extractDatasetCommand = value;
     }
 
-    public void PreInitialize(DataLoadInfo value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, DataLoadInfo value, IDataLoadEventListener listener)
     {
         _dataLoadInfo = value;
     }
diff --git a/Interactive/LoadModules.Extensions.Interactive/DeAnonymise/DeAnonymiseAgainstCohort.cs b/Interactive/LoadModules.Extensions.Interactive/DeAnonymise/DeAnonymiseAgainstCohort.cs
@@ -71,7 +71,7 @@ public void Check(ICheckNotifier notifier)
 
     }
 
-    public void PreInitialize(IBasicActivateItems value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator,IBasicActivateItems value, IDataLoadEventListener listener)
     {
         _activator = value;
     }
diff --git a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj
@@ -17,7 +17,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AutomationPlugins\LoadModules.Extensions.AutomationPlugins\LoadModules.Extensions.AutomationPlugins.csproj" />
diff --git a/RDMP b/RDMP
@@ -1 +1 @@
-Subproject commit 2d888af249bae7208efbef1a73135938edb71c94
+Subproject commit 53516e795a294c5cc9786f7bf339bfd4b26155fb
diff --git a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DotNetZip" Version="1.16.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     
   </ItemGroup>
   <ItemGroup>
diff --git a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/RemoteRDMPDataReleaseDestination.cs b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/RemoteRDMPDataReleaseDestination.cs
@@ -12,6 +12,7 @@
 using Rdmp.Core.Ticketing;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
+using Rdmp.Core.CommandExecution;
 
 namespace LoadModules.Extensions.ReleasePlugins;
 
@@ -142,12 +143,12 @@ private string GetSafeHavenFolder(string masterTicket)
         return system?.GetProjectFolderName(masterTicket).Replace("/", "") ?? string.Empty;
     }
 
-    public void PreInitialize(Project value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, Project value, IDataLoadEventListener listener)
     {
         _project = value;
     }
 
-    public void PreInitialize(ReleaseData value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, ReleaseData value, IDataLoadEventListener listener)
     {
         _releaseData = value;
     }
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -9,6 +9,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("6.2.12")]
-[assembly: AssemblyFileVersion("6.2.12")]
-[assembly: AssemblyInformationalVersion("6.2.12")]
+[assembly: AssemblyVersion("6.2.13")]
+[assembly: AssemblyFileVersion("6.2.13")]
+[assembly: AssemblyInformationalVersion("6.2.13")]

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`		`-using System;`
`2`		`-using System.Data;`
`3`		`-using System.Linq;`
`4`		`-using LoadModules.Extensions.AutomationPlugins.Data;`
	`1`	`+using LoadModules.Extensions.AutomationPlugins.Data;`
`5`	`2`	`using LoadModules.Extensions.AutomationPlugins.Data.Repository;`
	`3`	`+using Rdmp.Core.CommandExecution;`
`6`	`4`	`using Rdmp.Core.DataExport.Data;`
`7`	`5`	`using Rdmp.Core.DataExport.DataExtraction.Commands;`
`8`	`6`	`using Rdmp.Core.DataFlowPipeline;`
`@@ -12,6 +10,9 @@`
`12`	`10`	`using Rdmp.Core.Repositories;`
`13`	`11`	`using Rdmp.Core.ReusableLibraryCode.Checks;`
`14`	`12`	`using Rdmp.Core.ReusableLibraryCode.Progress;`
	`13`	`+using System;`
	`14`	`+using System.Data;`
	`15`	`+using System.Linq;`
`15`	`16`
`16`	`17`	`namespace LoadModules.Extensions.AutomationPlugins.Execution.ExtractionPipeline;`
`17`	`18`
`@@ -110,12 +111,12 @@ public void Check(ICheckNotifier notifier)`
`110`	`111`
`111`	`112`	`}`
`112`	`113`
`113`		`- public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)`
	`114`	`+ public void PreInitialize(IBasicActivateItems activator, IExtractCommand value, IDataLoadEventListener listener)`
`114`	`115`	`{`
`115`	`116`	`_extractDatasetCommand = value;`
`116`	`117`	`}`
`117`	`118`
`118`		`- public void PreInitialize(DataLoadInfo value, IDataLoadEventListener listener)`
	`119`	`+ public void PreInitialize(IBasicActivateItems activator, DataLoadInfo value, IDataLoadEventListener listener)`
`119`	`120`	`{`
`120`	`121`	`_dataLoadInfo = value;`
`121`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void Check(ICheckNotifier notifier)`
`71`	`71`
`72`	`72`	`}`
`73`	`73`
`74`		`- public void PreInitialize(IBasicActivateItems value, IDataLoadEventListener listener)`
	`74`	`+ public void PreInitialize(IBasicActivateItems activator,IBasicActivateItems value, IDataLoadEventListener listener)`
`75`	`75`	`{`
`76`	`76`	`_activator = value;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Rdmp.Core.Ticketing;`
`13`	`13`	`using Rdmp.Core.ReusableLibraryCode.Checks;`
`14`	`14`	`using Rdmp.Core.ReusableLibraryCode.Progress;`
	`15`	`+using Rdmp.Core.CommandExecution;`
`15`	`16`
`16`	`17`	`namespace LoadModules.Extensions.ReleasePlugins;`
`17`	`18`
`@@ -142,12 +143,12 @@ private string GetSafeHavenFolder(string masterTicket)`
`142`	`143`	`return system?.GetProjectFolderName(masterTicket).Replace("/", "") ?? string.Empty;`
`143`	`144`	`}`
`144`	`145`
`145`		`- public void PreInitialize(Project value, IDataLoadEventListener listener)`
	`146`	`+ public void PreInitialize(IBasicActivateItems activator, Project value, IDataLoadEventListener listener)`
`146`	`147`	`{`
`147`	`148`	`_project = value;`
`148`	`149`	`}`
`149`	`150`
`150`		`- public void PreInitialize(ReleaseData value, IDataLoadEventListener listener)`
	`151`	`+ public void PreInitialize(IBasicActivateItems activator, ReleaseData value, IDataLoadEventListener listener)`
`151`	`152`	`{`
`152`	`153`	`_releaseData = value;`
`153`	`154`	`}`