diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index c8de742..77b1b3c 100644 --- 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 index 57d8c7b..691a7b5 100644 --- 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 index 0e6f489..9ba01f9 100644 --- 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 index 0097ba2..71be071 100644 --- a/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj +++ b/LoadModules.Extensions.Tests/LoadModules.Extensions.Tests.csproj @@ -17,7 +17,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/RDMP b/RDMP index 2d888af..53516e7 160000 --- 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 index 6b5a27c..cee2fbe 100644 --- a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj +++ b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/LoadModules.Extensions.ReleasePlugins.csproj @@ -27,7 +27,7 @@ - + diff --git a/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/RemoteRDMPDataReleaseDestination.cs b/ReleasePlugins/LoadModules.Extensions.ReleasePlugins/RemoteRDMPDataReleaseDestination.cs index 881ab45..a16068b 100644 --- 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 index 5ab5200..2660d8f 100644 --- 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")]