Skip to content

upgrade to .net10 #2274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
JFriel wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

upgrade to .net10 #2274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3d7695
upgrade to .net10
JFriel Nov 25, 2025
088a782
point to net10
JFriel Nov 26, 2025
eaea9e5
fix up test
JFriel Dec 2, 2025
9e7b177
fix static issue
JFriel Dec 2, 2025
690d3ed
fix bad link
JFriel Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
16 changes: 8 additions & 8 deletions Application/ResearchDataManagementPlatform/RDMPMainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
// 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.ComponentModel;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using NPOI.OpenXmlFormats.Wordprocessing;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.MapsDirectlyToDatabaseTable;
using Rdmp.Core.Repositories;
Expand All @@ -27,6 +21,13 @@
using ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.Persistence;
using ResearchDataManagementPlatform.WindowManagement.ExtenderFunctionality;
using ResearchDataManagementPlatform.WindowManagement.Licenses;
using System;
using System.ComponentModel;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;

namespace ResearchDataManagementPlatform;
Expand All @@ -52,7 +53,6 @@ public RDMPMainForm()
InitializeComponent();

PatchController.EnableAll = true;

try
{
var t = UserSettings.Theme;
Expand Down
1 change: 0 additions & 1 deletion Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion ...anagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Application/ResearchDataManagementPlatform/WindowManagement/WindowManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 0 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@
<PackageVersion Include="ConsoleControl" Version="1.3.0" />
<PackageVersion Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
<PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" />
<PackageVersion Include="WeCantSpell.Hunspell" Version="6.0.3" />
<PackageVersion Include="NUnit" Version="4.4.0" />
<PackageVersion Include="ObjectListView.Repack.NET6Plus" Version="2.9.5" />
<PackageVersion Include="Scintilla.NET" Version="5.3.2.9" />
<PackageVersion Include="System.Resources.Extensions" Version="9.0.10" />
<PackageVersion Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16" />
<PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
Expand Down
3 changes: 0 additions & 3 deletions Documentation/CodeTutorials/Packages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) | |
| 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|
Expand Down
51 changes: 32 additions & 19 deletions Rdmp.Core.Tests/DataExport/DataRelease/S3BucketReleaseDestinationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
using NUnit.Framework;
using Minio;
using Rdmp.Core.ReusableLibraryCode.AWS;
using Tests.Common.Scenarios;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.ReusableLibraryCode.Progress;
using System;
using Rdmp.Core.Curation.Data.Pipelines;
using Rdmp.Core.DataExport.DataRelease;
using Minio;
using Minio.ApiEndpoints;
using Minio.DataModel.Args;
using NUnit.Framework;
using Rdmp.Core.CommandExecution;
using Rdmp.Core.CommandLine.Options;
using Rdmp.Core.CommandLine.Runners;
using Rdmp.Core.CommandExecution;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.Curation.Data.Pipelines;
using Rdmp.Core.DataExport.DataRelease;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.ReusableLibraryCode.AWS;
using Rdmp.Core.ReusableLibraryCode.Checks;
using System.Linq;
using Minio.DataModel.Args;
using Rdmp.Core.ReusableLibraryCode.Progress;
using System;
using System.Collections.Generic;
using Minio.DataModel;
using Rdmp.Core.Curation.Data.DataLoad;

using System.Linq;
using System.Reactive.Linq;
using System.Threading;
using System.Threading.Tasks;
using Tests.Common.Scenarios;
namespace Rdmp.Core.Tests.DataExport.DataRelease;

public sealed class S3BucketReleaseDestinationTests : TestsRequiringAnExtractionConfiguration
public class S3BucketReleaseDestinationTests : TestsRequiringAnExtractionConfiguration
{
private const string Username = "minioadmin";
private const string Password = "minioadmin";
Expand Down Expand Up @@ -63,11 +65,22 @@ private static void DeleteBucket(string name)
_minioClient.RemoveBucketAsync(rbArgs).Wait();
}

private static List<Minio.DataModel.Item> GetObjects(string bucketName)
private List<Minio.DataModel.Item> GetObjects(string bucketName)
{
var loArgs = new ListObjectsArgs().WithBucket(bucketName);
var x = _minioClient.ListObjectsEnumAsync(loArgs).ToListAsync();
return x.IsCompleted ? x.Result : x.AsTask().Result;
var x = _minioClient.ListObjectsEnumAsync(loArgs);
var results = ToListAsync(x).Result;
return results;
}

private async Task<List<T>> ToListAsync<T>(IAsyncEnumerable<T> items,
CancellationToken cancellationToken = default)
{
var results = new List<T>();
await foreach (var item in items.WithCancellation(cancellationToken)
.ConfigureAwait(false))
results.Add(item);
return results;
}

private static void SetArgs(IArgument[] args, Dictionary<string, object> values)
Expand Down
1 change: 0 additions & 1 deletion Rdmp.Core/Curation/Data/SafeDirectoryCatalog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@ public static class SafeDirectoryCatalog
"system.printing.dll",
"system.private.corelib.dll",
"system.private.datacontractserialization.dll",
"system.private.uri.dll",
"system.private.xml.dll",
"system.private.xml.linq.dll",
"system.reflection.dispatchproxy.dll",
Expand Down
2 changes: 0 additions & 2 deletions Rdmp.Core/Rdmp.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,6 @@
<PackageReference Include="SixLabors.ImageSharp" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" />
<PackageReference Include="Spectre.Console" />
<PackageReference Include="System.Private.Uri" />
<PackageReference Include="System.Resources.Extensions" />
<PackageReference Include="SSH.NET" />
<PackageReference Include="Terminal.Gui" />
<PackageReference Include="YamlDotNet" />
Expand Down
4 changes: 2 additions & 2 deletions Rdmp.UI/ChecksUI/PopupChecksUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ public bool OnCheckPerformed(CheckEventArgs args)
return checksUI1.OnCheckPerformed(args);
}

protected override void OnClosed(EventArgs e)
protected override void OnFormClosed(FormClosedEventArgs e)
{
if (_haveDemandedVisibility)
checksUI1.TerminateWithExtremePrejudice();

base.OnClosed(e);
base.OnFormClosed(e);
}

public void Check(ICheckable checkable)
Expand Down
1 change: 0 additions & 1 deletion Rdmp.UI/Rdmp.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
</PackageReference>
<PackageReference Include="ObjectListView.Repack.NET6Plus" />
<PackageReference Include="Scintilla.NET" />
<PackageReference Include="System.Resources.Extensions" />
<PackageReference Include="VPKSoft.ScintillaLexers.NET" />
<PackageReference Include="WeCantSpell.Hunspell" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Tools/rdmp/rdmp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<ItemGroup>
<ProjectReference Include="..\..\Rdmp.Core\Rdmp.Core.csproj" />
<PackageReference Include="Terminal.Gui" />
<PackageReference Include="System.Threading.ThreadPool" />
<PackageReference Include="YamlDotNet" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.300",
"version": "10.0.100",
"rollForward": "minor"
}
}
Loading