From 734d06f7bb6720def356bf93c3699833f876d708 Mon Sep 17 00:00:00 2001 From: cygon Date: Fri, 14 Jun 2024 17:39:10 +0200 Subject: [PATCH] Dissolved dependency on Nuclex.Support.Transactions by dropping two progress reporting helpers --- .gitignore | 37 +++++++++++++++++++ Nuclex.Windows.Forms (net-4.6).csproj | 17 ++------- .../ProgressReporterForm.Designer.cs | 19 ++++++---- .../ProgressReporter/ProgressReporterForm.cs | 4 ++ Source/TrackingBar/ToolStripTrackingBar.cs | 4 ++ Source/TrackingBar/TrackingBar.Designer.cs | 4 ++ Source/TrackingBar/TrackingBar.cs | 4 ++ 7 files changed, 69 insertions(+), 20 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d55983e --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +NuclexSupportConfig.cmake + +# Visual Studio Codium +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Visual Studio +.vs/ +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates +*.userprefs + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Artifacts +[Bb]in/ +[Oo]bj/ diff --git a/Nuclex.Windows.Forms (net-4.6).csproj b/Nuclex.Windows.Forms (net-4.6).csproj index 2c5fcb8..58b9613 100644 --- a/Nuclex.Windows.Forms (net-4.6).csproj +++ b/Nuclex.Windows.Forms (net-4.6).csproj @@ -42,9 +42,8 @@ ..\Foundation.snk - - False - ..\References\nunit\net-4.0\framework\nunit.framework.dll + + ..\third-party\nunit\net-4.0\framework\nunit.framework.dll @@ -147,12 +146,8 @@ ProgressReporterForm.cs - - Component - - - Component - + + TrackingBar.cs @@ -166,10 +161,6 @@ - - {2f487c4d-8e06-496f-bcd5-7119b18c78d8} - Nuclex.Support.Transactions %28net-4.6%29 - {00567408-4f44-4c00-866e-b04a99e482f2} Nuclex.Support %28net-4.6%29 diff --git a/Source/ProgressReporter/ProgressReporterForm.Designer.cs b/Source/ProgressReporter/ProgressReporterForm.Designer.cs index f56f6f1..92502bb 100644 --- a/Source/ProgressReporter/ProgressReporterForm.Designer.cs +++ b/Source/ProgressReporter/ProgressReporterForm.Designer.cs @@ -17,21 +17,22 @@ limitations under the License. */ #endregion // Apache License 2.0 +#if WITH_NUCLEX_SUPPORT_TRANSACTIONS + namespace Nuclex.Windows.Forms { + partial class ProgressReporterForm { - /// - /// Required designer variable. - /// + + /// Required designer variable. private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// + /// Clean up any resources being used. /// true if managed resources should be disposed; otherwise, false. protected override void Dispose(bool disposing) { if(disposing && (components != null)) { components.Dispose(); } + base.Dispose(disposing); } @@ -115,5 +116,9 @@ namespace Nuclex.Windows.Forms { private Nuclex.Windows.Forms.AsyncProgressBar progressBar; private System.Windows.Forms.Label statusLabel; private System.Windows.Forms.Timer controlCreationTimer; + } -} \ No newline at end of file + +} // namespace Nuclex.Windows.Forms + +#endif // WITH_NUCLEX_SUPPORT_TRANSACTIONS diff --git a/Source/ProgressReporter/ProgressReporterForm.cs b/Source/ProgressReporter/ProgressReporterForm.cs index 4e034a8..f0fa074 100644 --- a/Source/ProgressReporter/ProgressReporterForm.cs +++ b/Source/ProgressReporter/ProgressReporterForm.cs @@ -22,6 +22,8 @@ using System.ComponentModel; using System.Threading; using System.Windows.Forms; +#if WITH_NUCLEX_SUPPORT_TRANSACTIONS + using Nuclex.Support.Scheduling; using Nuclex.Support.Tracking; @@ -270,3 +272,5 @@ namespace Nuclex.Windows.Forms { } } // namespace Nuclex.Windows.Forms + +#endif // WITH_NUCLEX_SUPPORT_TRANSACTIONS diff --git a/Source/TrackingBar/ToolStripTrackingBar.cs b/Source/TrackingBar/ToolStripTrackingBar.cs index cf5ad11..8d8d253 100644 --- a/Source/TrackingBar/ToolStripTrackingBar.cs +++ b/Source/TrackingBar/ToolStripTrackingBar.cs @@ -22,6 +22,8 @@ using System.ComponentModel; using System.Drawing; using System.Windows.Forms; +#if WITH_NUCLEX_SUPPORT_TRANSACTIONS + using Nuclex.Support.Tracking; namespace Nuclex.Windows.Forms { @@ -111,3 +113,5 @@ namespace Nuclex.Windows.Forms { } } // namespace Nuclex.Windows.Forms + +#endif // WITH_NUCLEX_SUPPORT_TRANSACTIONS diff --git a/Source/TrackingBar/TrackingBar.Designer.cs b/Source/TrackingBar/TrackingBar.Designer.cs index 5d9c48c..d725f6d 100644 --- a/Source/TrackingBar/TrackingBar.Designer.cs +++ b/Source/TrackingBar/TrackingBar.Designer.cs @@ -17,6 +17,8 @@ limitations under the License. */ #endregion // Apache License 2.0 +#if WITH_NUCLEX_SUPPORT_TRANSACTIONS + namespace Nuclex.Windows.Forms { partial class TrackingBar { @@ -48,3 +50,5 @@ namespace Nuclex.Windows.Forms { } } // namespace Nuclex.Windows.Forms + +#endif // WITH_NUCLEX_SUPPORT_TRANSACTIONS diff --git a/Source/TrackingBar/TrackingBar.cs b/Source/TrackingBar/TrackingBar.cs index 4aa2023..d1a59a0 100644 --- a/Source/TrackingBar/TrackingBar.cs +++ b/Source/TrackingBar/TrackingBar.cs @@ -26,6 +26,8 @@ using System.Text; using System.Windows.Forms; using System.Threading; +#if WITH_NUCLEX_SUPPORT_TRANSACTIONS + using Nuclex.Support.Tracking; namespace Nuclex.Windows.Forms { @@ -131,3 +133,5 @@ namespace Nuclex.Windows.Forms { } } // namespace Nuclex.Windows.Forms + +#endif // WITH_NUCLEX_SUPPORT_TRANSACTIONS