Merge branch 'develop' into task/RDMP-365-better-load-metadata-logging

Author: JFriel

.github/workflows/build.yml

@@ -179,14 +179,14 @@ jobs:
       - name: Temporary Bundle of ddls for auto-updater
         shell: bash
         run: |
-          cp -r Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/runtimes ./PublishWinForms
-          cp -r Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/x64 ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/D3DCompiler_47_cor3.dll ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/PenImc_cor3.dll ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/PresentationNative_cor3.dll ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/vcruntime140_cor3.dll ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/WebView2Loader.dll ./PublishWinForms
-          cp Application/ResearchDataManagementPlatform/bin/Release/net9.0-windows/win-x64/wpfgfx_cor3.dll ./PublishWinForms
+          cp -r Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/runtimes ./PublishWinForms
+          cp -r Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/x64 ./PublishWinForms
+          cp Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/D3DCompiler_47_cor3.dll ./PublishWinForms
+          cp Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/PenImc_cor3.dll ./PublishWinForms
+          cp Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/PresentationNative_cor3.dll ./PublishWinForms
+          cp Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/vcruntime140_cor3.dll ./PublishWinForms
+          cp Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/WebView2Loader.dll ./PublishWinForms
+          cp Application/ResearchDataManagementPlatform/bin/Release/net10.0-windows/win-x64/wpfgfx_cor3.dll ./PublishWinForms
       - name: Install Plugins
         shell: bash
         run: |

Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj

@@ -32,7 +32,6 @@
     <PackageReference Include="ConsoleControl" />
     <PackageReference Include="Autoupdater.NET.Official" />
     <PackageReference Include="DockPanelSuite.ThemeVS2015" />
-    <PackageReference Include="System.Resources.Extensions" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />

Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs

@@ -43,7 +43,7 @@ public PersistableSingleDatabaseObjectDockContent(IRDMPSingleDatabaseObjectContr
         TabText = "Loading...";
 
         control.UnSavedChanges += OnUnSavedChanges;
-        Closing += (s, e) => control.UnSavedChanges -= OnUnSavedChanges;
+        FormClosing += (s, e) => control.UnSavedChanges -= OnUnSavedChanges;
     }
 
     private void OnUnSavedChanges(object sender, bool unsavedChanges)

Application/ResearchDataManagementPlatform/WindowManagement/WindowManager.cs

@@ -179,7 +179,7 @@ private PersistableToolboxDockContent Show(RDMPCollection collection, RDMPCollec
         var content =
             _windowFactory.Create(ActivateItems, control, label, image,
                 collection); //these are collections so are not tracked with a window tracker.
-        content.Closed += (s, e) => content_Closed(collection);
+        content.FormClosed += (s, e) => content_Closed(collection);
 
         _visibleToolboxes.Add(collection, content);
         content.Show(_mainDockPanel, DockState.DockLeft);
@@ -301,7 +301,7 @@ public void PopHome()
 
             _homeContent = _windowFactory.Create(ActivateItems, _home, "Home",
                 Image.Load<Rgba32>(FamFamFamIcons.application_home));
-            _homeContent.Closed += (s, e) => _home = null;
+            _homeContent.FormClosed += (s, e) => _home = null;
             _homeContent.Show(_mainDockPanel, DockState.Document);
         }
         else

CHANGELOG.md

@@ -6,11 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [9.3.0] - Unreleased
 - Update Load Metadata logging linkage to Catalogue
+- Update Sql Merge component to force destination column types
 
-## [9.2.0] - Unreleased
+## [9.2.0] - 2026-03-10
 - Add Internal Note to Catalogue
 - Fix issue where project associations were not copied when a CIC was cloned
 - Fix issue with using Internal Catalogues in Cohort Identification Configurations
+- Fix issue with using Project Specific Catalogues in Cohort Identification Configurations when not associated to project
+- Fix bug with copying project specific Catalogues between Projects when committing a Cohort
+- Remove Tree filters from UI
+
 - Simplify Project Cohorts tree
 - Fix bug with copying project specific Catalogues between Projects when committing a Cohort
 - Remove Tree filters from UI
@@ -21,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Simplify use of Extraction Progress
 - Update CHI validation to allow mod10 CHIs
 - Hardened Confluence export functionality
+- Fix issue with using Internal Catalogues in Cohort Identification Configurations
 - Add new SQL merge extraction component
 
 ## [9.1.1] - 2025-12-02

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 		<NoWarn>NU1902;NU1903;NU1904;1701;1702;CS1591;NU1701;CA1416</NoWarn>

Documentation/CodeTutorials/Packages.md

@@ -29,10 +29,7 @@
 | YamlDotNet | [GitHub](https://github.com/aaubry/YamlDotNet)  | [MIT](https://opensource.org/licenses/MIT) |Loading configuration files|
 | SixLabors.ImageSharp | [GitHub](https://github.com/SixLabors/ImageSharp) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Platform-independent replacement for legacy Windows-only System.Drawing.Common | |
 | SixLabors.ImageSharp.Drawing | [GitHub](https://github.com/SixLabors/ImageSharp.Drawing) | [Apache 2.0](https://github.com/SixLabors/ImageSharp/blob/main/LICENSE) | Font handling for ImageSharp | |
-| System.Private.Uri | Part of .Net, referenced to override vulnerable transitive dependency | .Net SDK | |
-| System.Threading.ThreadPool | [GitHub](https://github.com/dotnet/corefx) |[MIT](https://opensource.org/licenses/MIT) | Required to compile native linux binaries |  |
-| [AutoComplete Console](https://www.codeproject.com/Articles/1182358/Using-Autocomplete-in-Windows-Console-Applications) by Jasper Lammers | Embedded | [CPOL](https://www.codeproject.com/info/cpol10.aspx) | Provides interactive autocomplete in console input | |
-| System.Resources.Extensions | [GitHub](https://github.com/dotnet/corefx) | [MIT](https://opensource.org/licenses/MIT) | Allows [publishing with dotnet publish on machines with netcoreapp3.0 SDK installed](https://github.com/microsoft/msbuild/issues/4704#issuecomment-530034240) | |
+| [AutoComplete Console] by Jasper Lammers | Embedded | [CPOL]() | Provides interactive autocomplete in console input | |
 | Spectre.Console | [GitHub](https://github.com/spectreconsole/spectre.console) | [MIT](https://opensource.org/licenses/MIT) | Allows richer command line interactions| |
 | HIC.System.Windows.Forms.DataVisualization | [GitHub](https://github.com/HicServices/winforms-datavisualization) |[MIT](https://opensource.org/licenses/MIT) | Dotnet core support for DQE charts |  |
 | Autoupdater.NET.Official | [GitHub](https://github.com/ravibpatel/AutoUpdater.NET) | MIT | Manages updating of the RDMP windows client directly from the RDMP GitHub Releases|

Rdmp.Core.Tests/Caching/Integration/CustomDateCachingTests.cs

@@ -4,18 +4,14 @@
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using NSubstitute;
 using NUnit.Framework;
 using Rdmp.Core.Caching;
 using Rdmp.Core.Caching.Layouts;
 using Rdmp.Core.Caching.Pipeline.Destinations;
 using Rdmp.Core.Caching.Pipeline.Sources;
 using Rdmp.Core.Caching.Requests;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.Curation;
 using Rdmp.Core.Curation.Data;
 using Rdmp.Core.Curation.Data.Cache;
@@ -25,6 +21,11 @@
 using Rdmp.Core.Repositories;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 using Tests.Common;
 
 namespace Rdmp.Core.Tests.Caching.Integration;
@@ -182,7 +183,7 @@ public void Check(ICheckNotifier notifier)
 
     private ILoadDirectory project;
 
-    public void PreInitialize(ILoadDirectory value, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, ILoadDirectory value, IDataLoadEventListener listener)
     {
         project = value;
     }

Rdmp.Core.Tests/Caching/Unit/TestIFileDataFlowComponents.cs

@@ -9,6 +9,7 @@
 using System.IO;
 using System.Linq;
 using Rdmp.Core.Caching.Layouts;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.Curation.Data.Cache;
 using Rdmp.Core.DataFlowPipeline.Requirements;
 using Rdmp.Core.ReusableLibraryCode.Progress;
@@ -83,12 +84,12 @@ public void Dispose(IDataLoadEventListener listener)
         throw new NotImplementedException();
     }
 
-    public void PreInitialize(CacheProgress cacheProgress, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, CacheProgress cacheProgress, IDataLoadEventListener listener)
     {
         CacheProgress = cacheProgress;
     }
 
-    public void PreInitialize(DirectoryInfo cacheDirectory, IDataLoadEventListener listener)
+    public void PreInitialize(IBasicActivateItems activator, DirectoryInfo cacheDirectory, IDataLoadEventListener listener)
     {
         CacheDirectory = cacheDirectory;
     }

Rdmp.Core.Tests/CohortCommitting/CommitCohortExample.cs

@@ -4,18 +4,19 @@
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
-using System.Data;
-using System.Linq;
 using FAnsi;
 using NUnit.Framework;
 using Rdmp.Core.CohortCommitting;
 using Rdmp.Core.CohortCommitting.Pipeline;
 using Rdmp.Core.CohortCommitting.Pipeline.Destinations;
 using Rdmp.Core.CohortCommitting.Pipeline.Destinations.IdentifierAllocation;
+using Rdmp.Core.CommandExecution;
 using Rdmp.Core.DataExport.Data;
 using Rdmp.Core.DataFlowPipeline;
 using Rdmp.Core.ReusableLibraryCode.Checks;
 using Rdmp.Core.ReusableLibraryCode.Progress;
+using System.Data;
+using System.Linq;
 using Tests.Common;
 
 namespace Rdmp.Core.Tests.CohortCommitting;
@@ -63,7 +64,7 @@ public void CommitCohortExampleTest(DatabaseType dbType, string privateDataType)
         };
 
         //initialize the destination
-        pipelineDestination.PreInitialize(
+        pipelineDestination.PreInitialize(new ThrowImmediatelyActivator(RepositoryLocator, null),
             new CohortCreationRequest(project, definition, DataExportRepository,
                 "A cohort created in an example unit test"),
             ThrowImmediatelyDataLoadEventListener.Quiet);