Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

chore: sync namespaces and format files by csharpier

fatDuck311d188aec38
diff --git a/.codegraph/daemon.pid b/.codegraph/daemon.pid
deleted file mode 100644
index 5ed8ad5..0000000
--- a/.codegraph/daemon.pid
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "pid": 6084,
- "version": "0.9.9",
- "socketPath": "\\\\.\\pipe\\codegraph-2ee028a0b3d441bd",
- "startedAt": 1782132149215
-}
diff --git a/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs b/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs
index 94e8cea..2f7cc80 100644
--- a/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs
+++ b/optimizerDuck.Test/Services/ApplyRevertComprehensiveTests.cs
@@ -7,8 +7,9 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Optimization;
+using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System;
using Wpf.Ui;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
index ffee561..b07fba4 100644
--- a/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
+++ b/optimizerDuck.Test/Services/Managers/RevertManagerTests.cs
@@ -7,7 +7,7 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Revert;
namespace optimizerDuck.Test.Services.Managers;
diff --git a/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs b/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs
index a8c194e..c85b773 100644
--- a/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServiceIntegrationTests.cs
@@ -12,8 +12,9 @@ using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Optimization;
+using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System;
using Xunit;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck.Test/Services/OptimizationServiceTests.cs b/optimizerDuck.Test/Services/OptimizationServiceTests.cs
index cdb6c13..b2894f7 100644
--- a/optimizerDuck.Test/Services/OptimizationServiceTests.cs
+++ b/optimizerDuck.Test/Services/OptimizationServiceTests.cs
@@ -7,8 +7,9 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Optimization;
+using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System;
using Wpf.Ui;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck.Test/Services/RegistryWatcherTests.cs b/optimizerDuck.Test/Services/RegistryWatcherTests.cs
index 0e1207c..1785a15 100644
--- a/optimizerDuck.Test/Services/RegistryWatcherTests.cs
+++ b/optimizerDuck.Test/Services/RegistryWatcherTests.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Win32;
-using optimizerDuck.Services;
+using optimizerDuck.Services.System;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck.Test/Services/SystemInfoServiceTests.cs b/optimizerDuck.Test/Services/SystemInfoServiceTests.cs
index c2a0716..e47f56d 100644
--- a/optimizerDuck.Test/Services/SystemInfoServiceTests.cs
+++ b/optimizerDuck.Test/Services/SystemInfoServiceTests.cs
@@ -1,5 +1,5 @@
using Microsoft.Extensions.Logging.Abstractions;
-using optimizerDuck.Services;
+using optimizerDuck.Services.System;
namespace optimizerDuck.Test.Services;
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.cs
index df79a4a..a1c2ad8 100644
--- a/optimizerDuck/App.xaml.cs
+++ b/optimizerDuck/App.xaml.cs
@@ -12,9 +12,12 @@ using optimizerDuck.Common.Extensions;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Configuration;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
+using optimizerDuck.Services.Customize;
+using optimizerDuck.Services.Optimization;
using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System;
using optimizerDuck.Services.UI;
using optimizerDuck.UI.Behaviors;
using optimizerDuck.UI.Pages;
diff --git a/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs
index a555a0a..651a999 100644
--- a/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs
+++ b/optimizerDuck/Common/Extensions/CustomizePageRegistryExtensions.cs
@@ -4,7 +4,8 @@ using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Attributes;
-using optimizerDuck.Services;
+using optimizerDuck.Services.Customize;
+using optimizerDuck.Services.System;
using optimizerDuck.UI.ViewModels.Pages;
namespace optimizerDuck.Common.Extensions;
diff --git a/optimizerDuck/Common/Extensions/LanguageExtensions.cs b/optimizerDuck/Common/Extensions/LanguageExtensions.cs
index fed5479..88f6881 100644
--- a/optimizerDuck/Common/Extensions/LanguageExtensions.cs
+++ b/optimizerDuck/Common/Extensions/LanguageExtensions.cs
@@ -1,7 +1,7 @@
-using System.Globalization;
+using System.Globalization;
using System.Windows.Data;
using System.Windows.Markup;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
namespace optimizerDuck.Common.Extensions;
diff --git a/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs b/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
index afeb2a8..238a644 100644
--- a/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
+++ b/optimizerDuck/Common/Extensions/OptimizationPageRegistryExtensions.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
@@ -6,8 +6,8 @@ using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Configuration;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Optimization;
+using optimizerDuck.Services.Revert;
using Wpf.Ui;
using OptimizationCategoryViewModel = optimizerDuck.UI.ViewModels.Optimizer.OptimizationCategoryViewModel;
diff --git a/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs b/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs
index 3e71783..75741cb 100644
--- a/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs
+++ b/optimizerDuck/Common/Helpers/GitHubSourceHelper.cs
@@ -3,9 +3,9 @@ using System.Diagnostics;
using System.Net.Http;
using System.Text.RegularExpressions;
using Microsoft.Extensions.Logging;
+using optimizerDuck.Resources.Languages;
using Wpf.Ui;
using Wpf.Ui.Controls;
-using optimizerDuck.Resources.Languages;
namespace optimizerDuck.Common.Helpers;
@@ -16,7 +16,10 @@ namespace optimizerDuck.Common.Helpers;
public static class GitHubSourceHelper
{
private static readonly HttpClient HttpClient = new() { Timeout = TimeSpan.FromSeconds(5) };
- private static readonly ConcurrentDictionary<string, Lazy<Task<(string Content, DateTime FetchedAt)>>> SourceCache = new();
+ private static readonly ConcurrentDictionary<
+ string,
+ Lazy<Task<(string Content, DateTime FetchedAt)>>
+ > SourceCache = new();
private static readonly TimeSpan SourceCacheTtl = TimeSpan.FromMinutes(5);
/// <summary>
@@ -32,7 +35,8 @@ public static class GitHubSourceHelper
string className,
string? baseClassPattern = null,
ILogger? logger = null,
- ISnackbarService? snackbarService = null)
+ ISnackbarService? snackbarService = null
+ )
{
var fileName = ownerType.Name;
var namespacePath = (ownerType.Namespace ?? string.Empty).Replace('.', '/');
@@ -42,7 +46,8 @@ public static class GitHubSourceHelper
// Fetch source from GitHub raw content to find the class line number
try
{
- var rawUrl = $"https://raw.githubusercontent.com/itsfatduck/optimizerDuck/master/{relativePath}";
+ var rawUrl =
+ $"https://raw.githubusercontent.com/itsfatduck/optimizerDuck/master/{relativePath}";
var cached = SourceCache.GetOrAdd(rawUrl, CreateSourceCacheEntry);
var cachedSource = await cached.Value;
@@ -58,9 +63,10 @@ public static class GitHubSourceHelper
// Use regex with word boundaries to avoid false-positive substring matches
var classNameEscaped = Regex.Escape(className);
- var pattern = baseClassPattern != null
- ? $@"class\s+{classNameEscaped}\s*:\s*{Regex.Escape(baseClassPattern)}\b"
- : $@"class\s+{classNameEscaped}\b";
+ var pattern =
+ baseClassPattern != null
+ ? $@"class\s+{classNameEscaped}\s*:\s*{Regex.Escape(baseClassPattern)}\b"
+ : $@"class\s+{classNameEscaped}\b";
var lineIndex = -1;
var lines = source.Split('\n');
@@ -78,7 +84,11 @@ public static class GitHubSourceHelper
}
catch (Exception ex)
{
- logger?.LogWarning(ex, "Could not fetch source to find line number for {Class}", className);
+ logger?.LogWarning(
+ ex,
+ "Could not fetch source to find line number for {Class}",
+ className
+ );
}
try
@@ -93,13 +103,17 @@ public static class GitHubSourceHelper
Translations.Snackbar_OpenLinkFailed_Message,
ControlAppearance.Danger,
new SymbolIcon { Symbol = SymbolRegular.ErrorCircle24, Filled = true },
- TimeSpan.FromSeconds(5));
+ TimeSpan.FromSeconds(5)
+ );
}
}
- private static Lazy<Task<(string Content, DateTime FetchedAt)>> CreateSourceCacheEntry(string rawUrl)
+ private static Lazy<Task<(string Content, DateTime FetchedAt)>> CreateSourceCacheEntry(
+ string rawUrl
+ )
{
return new Lazy<Task<(string Content, DateTime FetchedAt)>>(async () =>
- (await HttpClient.GetStringAsync(rawUrl), DateTime.UtcNow));
+ (await HttpClient.GetStringAsync(rawUrl), DateTime.UtcNow)
+ );
}
}
diff --git a/optimizerDuck/Domain/Customize/Categories/Desktop.cs b/optimizerDuck/Domain/Customize/Categories/Desktop.cs
index 800bb3f..ee06187 100644
--- a/optimizerDuck/Domain/Customize/Categories/Desktop.cs
+++ b/optimizerDuck/Domain/Customize/Categories/Desktop.cs
@@ -5,9 +5,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Customize;
+using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Customize.Categories;
@@ -132,8 +132,7 @@ public class Desktop : ICustomizeCategory
[
new()
{
- Path =
- @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
+ Path = @"HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced",
Name = "HideIcons",
OnValue = 0,
OffValue = 1,
diff --git a/optimizerDuck/Domain/Customize/Categories/Gaming.cs b/optimizerDuck/Domain/Customize/Categories/Gaming.cs
index a391d7c..536ae76 100644
--- a/optimizerDuck/Domain/Customize/Categories/Gaming.cs
+++ b/optimizerDuck/Domain/Customize/Categories/Gaming.cs
@@ -4,9 +4,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Customize;
+using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Customize.Categories;
@@ -277,5 +277,4 @@ public class Gaming : ICustomizeCategory
},
];
}
-
}
diff --git a/optimizerDuck/Domain/Customize/Categories/Preferences.cs b/optimizerDuck/Domain/Customize/Categories/Preferences.cs
index 9d175fb..bc0ed28 100644
--- a/optimizerDuck/Domain/Customize/Categories/Preferences.cs
+++ b/optimizerDuck/Domain/Customize/Categories/Preferences.cs
@@ -5,9 +5,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Customize;
+using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Customize.Categories;
@@ -496,12 +496,7 @@ public class Preferences : ICustomizeCategory
Option("IconAndLabel", 2),
Option("SearchBox", 3),
];
- return
- [
- Option("Hidden", 0),
- Option("Icon", 1),
- Option("SearchBox", 2),
- ];
+ return [Option("Hidden", 0), Option("Icon", 1), Option("SearchBox", 2)];
}
}
@@ -542,5 +537,4 @@ public class Preferences : ICustomizeCategory
},
];
}
-
}
diff --git a/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs b/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs
index cf1875d..6ef1f17 100644
--- a/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs
+++ b/optimizerDuck/Domain/Customize/Categories/SystemFeatures.cs
@@ -2,11 +2,9 @@ using System.Collections.ObjectModel;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Customize.Models;
-using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
-using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Customize;
+using optimizerDuck.Services.Configuration;
+using optimizerDuck.UI.Pages.Customize.Categories;
using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Customize.Categories;
@@ -55,8 +53,6 @@ public class SystemFeatures : ICustomizeCategory
];
}
-
-
#region Developer
[CustomizeSetting(
@@ -129,7 +125,7 @@ public class SystemFeatures : ICustomizeCategory
#endregion
-[CustomizeSetting(Section = nameof(Sections.Power), Icon = SymbolRegular.BatteryCharge24)]
+ [CustomizeSetting(Section = nameof(Sections.Power), Icon = SymbolRegular.BatteryCharge24)]
public class ShowBatteryPercentage : BaseCustomizeSetting
{
private const string RegPath =
diff --git a/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs b/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs
index 4b855ce..a2533bd 100644
--- a/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs
+++ b/optimizerDuck/Domain/Customize/Models/BaseCustomizeSetting.cs
@@ -2,7 +2,7 @@ using System.Reflection;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Attributes;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using Wpf.Ui.Controls;
namespace optimizerDuck.Domain.Customize.Models;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
index 124176e..6ff49b7 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/BloatwareAndServices.cs
@@ -5,9 +5,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
index cc2dadc..82cd383 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/Gpu.cs
@@ -5,10 +5,10 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.Services.System;
+using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
index e52fb4d..3189d6d 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/Performance.cs
@@ -6,9 +6,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
@@ -143,7 +143,11 @@ public class Performance : IOptimizationCategory
[Optimization(
Id = "FFB49D94-CCA9-4591-B329-6FDA3A2758F9",
Risk = OptimizationRisk.Safe,
- Tags = OptimizationTags.System | OptimizationTags.Performance | OptimizationTags.Latency | OptimizationTags.Audio | OptimizationTags.Display
+ Tags = OptimizationTags.System
+ | OptimizationTags.Performance
+ | OptimizationTags.Latency
+ | OptimizationTags.Audio
+ | OptimizationTags.Display
)]
public class OptimizeMultimediaScheduler : BaseOptimization
{
diff --git a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
index 54eb1b6..091b52b 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/PowerManagement.cs
@@ -13,9 +13,9 @@ using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.Revert.Steps;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
index 3349db5..079751e 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/SecurityAndPrivacy.cs
@@ -5,9 +5,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
@@ -578,7 +578,10 @@ public class SecurityAndPrivacy : IOptimizationCategory
[Optimization(
Id = "64C6BEC3-B58C-4E57-830A-1DE1F4650542",
Risk = OptimizationRisk.Moderate,
- Tags = OptimizationTags.Privacy | OptimizationTags.System | OptimizationTags.Windows11Only | OptimizationTags.Visual
+ Tags = OptimizationTags.Privacy
+ | OptimizationTags.System
+ | OptimizationTags.Windows11Only
+ | OptimizationTags.Visual
)]
public class DisableCopilot : BaseOptimization
{
diff --git a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
index 02a4573..6d0a1a7 100644
--- a/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
+++ b/optimizerDuck/Domain/Optimizations/Categories/UserExperience.cs
@@ -5,9 +5,9 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Optimizations.Models.Services;
using optimizerDuck.Domain.UI;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using optimizerDuck.Services.Optimization.Providers;
-using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.UI.Pages.Optimize.Categories;
namespace optimizerDuck.Domain.Optimizations.Categories;
diff --git a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
index 52b5267..7bccec0 100644
--- a/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/BaseOptimization.cs
@@ -1,10 +1,10 @@
-using System.Reflection;
+using System.Reflection;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Execution;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
using Wpf.Ui.Controls;
using OptimizationState = optimizerDuck.Domain.UI.OptimizationState;
diff --git a/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs b/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
index 1ebe4b2..48cf33b 100644
--- a/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
+++ b/optimizerDuck/Domain/Optimizations/Models/OptimizationContext.cs
@@ -1,5 +1,5 @@
-using Microsoft.Extensions.Logging;
-using optimizerDuck.Services;
+using Microsoft.Extensions.Logging;
+using optimizerDuck.Services.System;
namespace optimizerDuck.Domain.Optimizations.Models;
diff --git a/optimizerDuck/Services/Configuration/ConfigManager.cs b/optimizerDuck/Services/Configuration/ConfigManager.cs
index d7a7da8..cc69011 100644
--- a/optimizerDuck/Services/Configuration/ConfigManager.cs
+++ b/optimizerDuck/Services/Configuration/ConfigManager.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
using System.Linq.Expressions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Configuration;
-namespace optimizerDuck.Services.Managers;
+namespace optimizerDuck.Services.Configuration;
/// <summary>
/// Manages application configuration settings stored in appsettings.json.
diff --git a/optimizerDuck/Services/Configuration/LanguageManager.cs b/optimizerDuck/Services/Configuration/LanguageManager.cs
index b8eb3be..d820718 100644
--- a/optimizerDuck/Services/Configuration/LanguageManager.cs
+++ b/optimizerDuck/Services/Configuration/LanguageManager.cs
@@ -1,7 +1,7 @@
using System.Globalization;
using optimizerDuck.Resources.Languages;
-namespace optimizerDuck.Services.Managers;
+namespace optimizerDuck.Services.Configuration;
/// <summary>
/// Provides localization and culture management for the application.
diff --git a/optimizerDuck/Services/Customize/CustomizeRegistry.cs b/optimizerDuck/Services/Customize/CustomizeRegistry.cs
index 6d68de9..688d3ed 100644
--- a/optimizerDuck/Services/Customize/CustomizeRegistry.cs
+++ b/optimizerDuck/Services/Customize/CustomizeRegistry.cs
@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Reflection;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
@@ -6,7 +6,7 @@ using optimizerDuck.Domain.Attributes;
using optimizerDuck.Domain.Customize.Models;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.Customize;
public class CustomizeRegistry
{
diff --git a/optimizerDuck/Services/Optimization/OptimizationRegistry.cs b/optimizerDuck/Services/Optimization/OptimizationRegistry.cs
index 4c5a53b..4e60317 100644
--- a/optimizerDuck/Services/Optimization/OptimizationRegistry.cs
+++ b/optimizerDuck/Services/Optimization/OptimizationRegistry.cs
@@ -5,7 +5,7 @@ using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Optimizations.Models;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.Optimization;
public class OptimizationRegistry(ILoggerFactory loggerFactory)
{
diff --git a/optimizerDuck/Services/Optimization/OptimizationService.cs b/optimizerDuck/Services/Optimization/OptimizationService.cs
index 069a85f..179ff4c 100644
--- a/optimizerDuck/Services/Optimization/OptimizationService.cs
+++ b/optimizerDuck/Services/Optimization/OptimizationService.cs
@@ -8,14 +8,15 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services.Managers;
using optimizerDuck.Services.Optimization.Providers;
+using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System;
using optimizerDuck.UI.Dialogs;
using optimizerDuck.UI.ViewModels.Dialogs;
using Wpf.Ui;
using Wpf.Ui.Controls;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.Optimization;
public class OptimizationService(
RevertManager revertManager,
diff --git a/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs b/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
index 3c250af..6356684 100644
--- a/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
+++ b/optimizerDuck/Services/Optimization/Providers/ScheduledTaskService.cs
@@ -94,7 +94,7 @@ public static class ScheduledTaskService
false,
null,
_lastError.Value,
- () => System.Threading.Tasks.Task.FromResult(DisableTask(fullPath)),
+ () => global::System.Threading.Tasks.Task.FromResult(DisableTask(fullPath)),
_lastErrorDetail.Value
);
return false;
@@ -111,7 +111,7 @@ public static class ScheduledTaskService
false,
null,
_lastError.Value,
- () => System.Threading.Tasks.Task.FromResult(DisableTask(fullPath)),
+ () => global::System.Threading.Tasks.Task.FromResult(DisableTask(fullPath)),
_lastErrorDetail.Value
);
return false;
@@ -175,7 +175,7 @@ public static class ScheduledTaskService
false,
null,
_lastError.Value,
- () => System.Threading.Tasks.Task.FromResult(EnableTask(fullPath)),
+ () => global::System.Threading.Tasks.Task.FromResult(EnableTask(fullPath)),
_lastErrorDetail.Value
);
return false;
@@ -192,7 +192,7 @@ public static class ScheduledTaskService
false,
null,
_lastError.Value,
- () => System.Threading.Tasks.Task.FromResult(EnableTask(fullPath)),
+ () => global::System.Threading.Tasks.Task.FromResult(EnableTask(fullPath)),
_lastErrorDetail.Value
);
return false;
diff --git a/optimizerDuck/Services/Revert/RevertManager.cs b/optimizerDuck/Services/Revert/RevertManager.cs
index 73cf0cf..617248e 100644
--- a/optimizerDuck/Services/Revert/RevertManager.cs
+++ b/optimizerDuck/Services/Revert/RevertManager.cs
@@ -13,7 +13,7 @@ using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-namespace optimizerDuck.Services.Managers;
+namespace optimizerDuck.Services.Revert;
public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _loggerFactory)
{
@@ -329,7 +329,11 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge
private static void TraceCorruptRevertFile(string path, Exception ex)
{
- System.Diagnostics.Trace.TraceWarning("Corrupt revert file {0}: {1}", path, ex.Message);
+ global::System.Diagnostics.Trace.TraceWarning(
+ "Corrupt revert file {0}: {1}",
+ path,
+ ex.Message
+ );
}
public void RemoveRevertData(Guid id, string? name = null)
@@ -474,7 +478,7 @@ public class RevertManager(ILogger<RevertManager> _logger, ILoggerFactory _logge
}
catch (Exception ex)
{
- System.Diagnostics.Trace.TraceWarning(
+ global::System.Diagnostics.Trace.TraceWarning(
"Failed to register revert step {Type}: {Message}",
type.FullName,
ex.Message
diff --git a/optimizerDuck/Services/System/RegistryWatcher.cs b/optimizerDuck/Services/System/RegistryWatcher.cs
index 17be293..a32d2ec 100644
--- a/optimizerDuck/Services/System/RegistryWatcher.cs
+++ b/optimizerDuck/Services/System/RegistryWatcher.cs
@@ -2,7 +2,7 @@ using System.Collections.Concurrent;
using System.Runtime.InteropServices;
using Microsoft.Extensions.Logging;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.System;
/// <summary>Monitors Windows registry keys for changes using RegNotifyChangeKeyValue.</summary>
public interface IRegistryWatcher : IDisposable
diff --git a/optimizerDuck/Services/System/StreamService.cs b/optimizerDuck/Services/System/StreamService.cs
index 3aab318..18b6efa 100644
--- a/optimizerDuck/Services/System/StreamService.cs
+++ b/optimizerDuck/Services/System/StreamService.cs
@@ -3,7 +3,7 @@ using System.Net.Http;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.System;
public class StreamService(ILogger<StreamService> logger) : IDisposable
{
diff --git a/optimizerDuck/Services/System/SystemInfoService.cs b/optimizerDuck/Services/System/SystemInfoService.cs
index 80d714f..69de060 100644
--- a/optimizerDuck/Services/System/SystemInfoService.cs
+++ b/optimizerDuck/Services/System/SystemInfoService.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using System.IO;
using System.Management;
using System.Runtime.InteropServices;
@@ -7,7 +7,7 @@ using Microsoft.Win32;
using Microsoft.Win32.SafeHandles;
using optimizerDuck.Resources.Languages;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.System;
// ============================================================================
// MODELS (Immutable Records)
diff --git a/optimizerDuck/Services/System/UpdaterService.cs b/optimizerDuck/Services/System/UpdaterService.cs
index 0e87c7d..c23a2c3 100644
--- a/optimizerDuck/Services/System/UpdaterService.cs
+++ b/optimizerDuck/Services/System/UpdaterService.cs
@@ -1,10 +1,10 @@
-using System.Net.Http;
+using System.Net.Http;
using System.Net.Http.Headers;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using optimizerDuck.Common.Helpers;
-namespace optimizerDuck.Services;
+namespace optimizerDuck.Services.System;
public class UpdaterService : IDisposable
{
diff --git a/optimizerDuck/Services/UI/BloatwareService.cs b/optimizerDuck/Services/UI/BloatwareService.cs
index 3f90555..a61338b 100644
--- a/optimizerDuck/Services/UI/BloatwareService.cs
+++ b/optimizerDuck/Services/UI/BloatwareService.cs
@@ -270,16 +270,22 @@ public class BloatwareService(
if (allImageFiles.Count != 0)
{
var groups = allImageFiles
- .GroupBy(path =>
- {
- var name = Path.GetFileNameWithoutExtension(path);
- return StripKnownQualifiers(name);
- }, StringComparer.OrdinalIgnoreCase)
- .OrderByDescending(g => g.Key.Contains("applist", StringComparison.OrdinalIgnoreCase) ? 2
- : g.Key.Contains("square44x44", StringComparison.OrdinalIgnoreCase) ? 2
- : g.Key.Contains("square150x150", StringComparison.OrdinalIgnoreCase) ? 1
- : g.Key.Contains("storelogo", StringComparison.OrdinalIgnoreCase) ? -1
- : 0)
+ .GroupBy(
+ path =>
+ {
+ var name = Path.GetFileNameWithoutExtension(path);
+ return StripKnownQualifiers(name);
+ },
+ StringComparer.OrdinalIgnoreCase
+ )
+ .OrderByDescending(g =>
+ g.Key.Contains("applist", StringComparison.OrdinalIgnoreCase) ? 2
+ : g.Key.Contains("square44x44", StringComparison.OrdinalIgnoreCase) ? 2
+ : g.Key.Contains("square150x150", StringComparison.OrdinalIgnoreCase)
+ ? 1
+ : g.Key.Contains("storelogo", StringComparison.OrdinalIgnoreCase) ? -1
+ : 0
+ )
.ThenByDescending(g => g.Count());
foreach (var group in groups)
@@ -472,7 +478,7 @@ public class BloatwareService(
public LogoVariant(string path, int logicalBaseSize, bool includeThemeSpecific)
{
Path = path;
- var fileNameWithoutExtension = System.IO.Path.GetFileNameWithoutExtension(path);
+ var fileNameWithoutExtension = global::System.IO.Path.GetFileNameWithoutExtension(path);
var targetSize = TryGetQualifierNumber(TargetSizeRegex, fileNameWithoutExtension);
var scale = TryGetQualifierNumber(ScaleRegex, fileNameWithoutExtension);
@@ -485,10 +491,14 @@ public class BloatwareService(
score += Math.Min(resolvedPixelSize * 5, 1500);
- if (resolvedPixelSize >= 256) score += 600;
- else if (resolvedPixelSize >= 96) score += 400;
- else if (resolvedPixelSize >= 64) score += 200;
- else if (resolvedPixelSize >= 48) score += 100;
+ if (resolvedPixelSize >= 256)
+ score += 600;
+ else if (resolvedPixelSize >= 96)
+ score += 400;
+ else if (resolvedPixelSize >= 64)
+ score += 200;
+ else if (resolvedPixelSize >= 48)
+ score += 100;
if (targetSize.HasValue)
score += Math.Min(targetSize.Value * 3, 800);
diff --git a/optimizerDuck/Services/UI/DiskCleanupService.cs b/optimizerDuck/Services/UI/DiskCleanupService.cs
index fb95783..a9c4330 100644
--- a/optimizerDuck/Services/UI/DiskCleanupService.cs
+++ b/optimizerDuck/Services/UI/DiskCleanupService.cs
@@ -15,6 +15,7 @@ public class DiskCleanupService(ILogger<DiskCleanupService> logger)
private static readonly string DotNetTempPath =
Path.GetFullPath(Path.Combine(Path.GetTempPath(), ".net"))
.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar;
+
/// <summary>
/// Gets the available cleanup items.
/// </summary>
diff --git a/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPages.cs b/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPages.cs
index 8a09764..9687ee6 100644
--- a/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPages.cs
+++ b/optimizerDuck/UI/Pages/Customize/Categories/CustomizeCategoryPages.cs
@@ -1,6 +1,6 @@
using optimizerDuck.UI.ViewModels.Pages;
-namespace optimizerDuck.UI.Pages.Customize;
+namespace optimizerDuck.UI.Pages.Customize.Categories;
public sealed class PreferencesFeatureCategory : CustomizeCategoryPage
{
@@ -37,4 +37,3 @@ public sealed class DesktopFeatureCategory : CustomizeCategoryPage
InitializeComponent();
}
}
-
diff --git a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs
index 437948f..477cfd0 100644
--- a/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs
+++ b/optimizerDuck/UI/Pages/Optimize/Categories/OptimizationPages.cs
@@ -1,6 +1,7 @@
-using optimizerDuck.UI.ViewModels.Optimizer;
+using optimizerDuck.UI.Pages.Optimizations;
+using optimizerDuck.UI.ViewModels.Optimizer;
-namespace optimizerDuck.UI.Pages.Optimizations;
+namespace optimizerDuck.UI.Pages.Optimize.Categories;
public sealed class PowerManagementOptimizerPage : OptimizationPage
{
diff --git a/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs b/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs
index 78e5ad5..86d20e8 100644
--- a/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Customize/CustomizeItemViewModel.cs
@@ -5,8 +5,8 @@ using Microsoft.Extensions.Logging;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Domain.Execution;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
+using optimizerDuck.Services.System;
using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Customize;
diff --git a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
index 5dddc1b..ebcdc44 100644
--- a/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Dialogs/OptimizationDetailsViewModel.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
using System.IO;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
@@ -7,7 +7,7 @@ using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Revert;
using Wpf.Ui;
using Wpf.Ui.Controls;
@@ -67,6 +67,7 @@ public partial class OptimizationDetailsViewModel(
baseOpt.OwnerType,
Optimization.OptimizationKey,
logger: logger,
- snackbarService: snackbarService);
+ snackbarService: snackbarService
+ );
}
}
diff --git a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
index 1c0cd3e..7cddcdb 100644
--- a/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Optimizer/OptimizationCategoryViewModel.cs
@@ -12,8 +12,8 @@ using optimizerDuck.Domain.Optimizations.Models;
using optimizerDuck.Domain.Revert;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Optimization;
+using optimizerDuck.Services.Revert;
using optimizerDuck.UI.Dialogs;
using optimizerDuck.UI.ViewModels.Dialogs;
using Wpf.Ui;
@@ -384,7 +384,8 @@ public partial class OptimizationCategoryViewModel : ViewModel
optimization.OptimizationKey,
nameof(BaseOptimization),
_logger,
- _snackbarService);
+ _snackbarService
+ );
}
#endregion Commands
diff --git a/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs
index 6231e3d..5eb54eb 100644
--- a/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/CustomizeCategoryViewModel.cs
@@ -8,7 +8,7 @@ using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Customize.Models;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services;
+using optimizerDuck.Services.System;
using optimizerDuck.UI.ViewModels.Customize;
using Wpf.Ui.Appearance;
using Wpf.Ui.Controls;
@@ -165,6 +165,7 @@ public partial class CustomizeCategoryViewModel : ViewModel
await GitHubSourceHelper.OpenSourceOnGitHubAsync(
baseSetting.OwnerType,
baseSetting.FeatureKey,
- nameof(BaseCustomizeSetting));
+ nameof(BaseCustomizeSetting)
+ );
}
}
diff --git a/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs
index 638d6e8..f910e2a 100644
--- a/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/CustomizeViewModel.cs
@@ -3,7 +3,7 @@ using System.Reflection;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using optimizerDuck.Domain.Attributes;
-using optimizerDuck.Services;
+using optimizerDuck.Services.Customize;
using Wpf.Ui;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
index 189fcbb..cb4fcf1 100644
--- a/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/DashboardViewModel.cs
@@ -6,7 +6,7 @@ using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
using optimizerDuck.Common.Helpers;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services;
+using optimizerDuck.Services.System;
using Wpf.Ui;
using Wpf.Ui.Appearance;
using Wpf.Ui.Controls;
diff --git a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs
index c91e1b0..bb5ed6c 100644
--- a/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/OptimizeViewModel.cs
@@ -1,14 +1,13 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
using System.Reflection;
using optimizerDuck.Domain.Attributes;
-using optimizerDuck.Services;
+using optimizerDuck.Services.Optimization;
using Wpf.Ui.Controls;
namespace optimizerDuck.UI.ViewModels.Pages;
public class OptimizeViewModel(OptimizationRegistry optimizationService) : ViewModel
{
-
public ObservableCollection<NavigationViewItem> OptimizationCategories { get; } = [];
public event Action? OptimizationsLoaded;
diff --git a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
index dbcb0ac..b448995 100644
--- a/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
+++ b/optimizerDuck/UI/ViewModels/Pages/SettingsViewModel.cs
@@ -10,8 +10,10 @@ using optimizerDuck.Common.Helpers;
using optimizerDuck.Domain.Configuration;
using optimizerDuck.Domain.UI;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
+using optimizerDuck.Services.Optimization;
+using optimizerDuck.Services.Revert;
+using optimizerDuck.Services.System;
using optimizerDuck.UI.Behaviors;
using Wpf.Ui;
using Wpf.Ui.Appearance;
diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml.cs b/optimizerDuck/UI/Windows/MainWindow.xaml.cs
index 6e49eec..4b6491c 100644
--- a/optimizerDuck/UI/Windows/MainWindow.xaml.cs
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml.cs
@@ -1,10 +1,10 @@
-using System.Windows;
+using System.Windows;
using Microsoft.Extensions.Options;
using optimizerDuck.Domain.Abstractions;
using optimizerDuck.Domain.Configuration;
using optimizerDuck.Resources.Languages;
-using optimizerDuck.Services;
-using optimizerDuck.Services.Managers;
+using optimizerDuck.Services.Configuration;
+using optimizerDuck.Services.Customize;
using optimizerDuck.UI.Controls;
using optimizerDuck.UI.Dialogs;
using optimizerDuck.UI.Pages;
diff --git a/optimizerDuck/optimizerDuck.csproj b/optimizerDuck/optimizerDuck.csproj
index aa4bbf6..a03f59b 100644
--- a/optimizerDuck/optimizerDuck.csproj
+++ b/optimizerDuck/optimizerDuck.csproj
@@ -9,8 +9,8 @@
<Authors>fatDuck</Authors>
<ApplicationIcon>Logo.ico</ApplicationIcon>
<Company>fatDuck</Company>
- <FileVersion>2.23.0</FileVersion>
- <Version>2.23.0</Version>
+ <FileVersion>2.24.2</FileVersion>
+ <Version>2.24.2</Version>
<Product>optimizerDuck</Product>
<Copyright>Copyright fatDuck 2026</Copyright>
<AssemblyTitle>optimizerDuck</AssemblyTitle>
@@ -49,7 +49,7 @@
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
- <PackageReference Include="System.Management.Automation" Version="7.6.2" />
+ <PackageReference Include="System.Management.Automation" Version="7.6.3" />
<PackageReference Include="TaskScheduler" Version="2.12.2" />
<PackageReference Include="WPF-UI" Version="4.3.0" />
<PackageReference Include="WPF-UI.DependencyInjection" Version="4.3.0" />