nuclex-shared-dotnet/Nuclex.Windows.Forms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Upgraded project to .NET 8.0 because .NET 6.0 is out of support

Browse source
This commit is contained in:
Markus Ewald 2025-06-19 10:43:58 +02:00 • committed by cygon
parent 0f5d22520e
commit 0761f1a8c1
16 changed files with 113 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/ViewModels/ThreadedAction.cs
View file

@ -22,6 +22,10 @@ using System.ComponentModel;
using System.Threading;
using System.Windows.Forms;
#if NET6_0_OR_GREATER
using System.Runtime.Versioning;
#endif
using Nuclex.Support;
using Nuclex.Support.Threading;
@ -91,6 +95,9 @@ namespace Nuclex.Windows.Forms.ViewModels {
/// <summary>Initializes a threaded action that uses its own thread runner</summary>
public ThreadedAction(ISynchronizeInvoke uiContext = null) : this() {
#if NET6_0_OR_GREATER
if(OperatingSystem.IsWindows()) {
#endif
if(uiContext == null) {
this.uiContext = LateCheckedSynchronizer.GetMainWindow();
if(this.uiContext == null) {
@ -99,6 +106,9 @@ namespace Nuclex.Windows.Forms.ViewModels {
} else {
this.uiContext = uiContext;
}
#if NET6_0_OR_GREATER
}
#endif
this.ownThreadRunner = new ThreadedActionThreadRunner(this);
}
@ -113,6 +123,9 @@ namespace Nuclex.Windows.Forms.ViewModels {
public ThreadedAction(
ThreadedViewModel viewModel, ISynchronizeInvoke uiContext = null
) : this() {
#if NET6_0_OR_GREATER
if(OperatingSystem.IsWindows()) {
#endif
if(uiContext == null) {
this.uiContext = LateCheckedSynchronizer.GetMainWindow();
if(this.uiContext == null) {
@ -121,6 +134,9 @@ namespace Nuclex.Windows.Forms.ViewModels {
} else {
this.uiContext = uiContext;
}
#if NET6_0_OR_GREATER
}
#endif
this.externalThreadRunner = viewModel.ThreadRunner;
}

6
Source/ViewModels/ThreadedViewModel.cs
View file

@ -62,6 +62,9 @@ namespace Nuclex.Windows.Forms.ViewModels {
/// UI dispatcher that can be used to run callbacks in the UI thread
/// </param>
protected ThreadedViewModel(ISynchronizeInvoke uiContext = null) {
#if NET6_0_OR_GREATER
if(OperatingSystem.IsWindows()) {
#endif
if(uiContext == null) {
this.uiContext = LateCheckedSynchronizer.GetMainWindow();
if(this.uiContext == null) {
@ -70,6 +73,9 @@ namespace Nuclex.Windows.Forms.ViewModels {
} else {
this.uiContext = uiContext;
}
#if NET6_0_OR_GREATER
}
#endif
this.reportErrorDelegate = new Action<Exception>(ReportError);