Aligned folder structure with namespaces (#523)

This PR aligns namespaces with folder structures.
Removes 2 unused methods.
Applies minor code modernizations.

AppControl Manager/.editorconfig

@@ -1096,3 +1096,9 @@ dotnet_diagnostic.CA1002.severity = error
 
 # CA1034: Nested types should not be visible
 dotnet_diagnostic.CA1034.severity = error
+
+# IDE0130: Namespace does not match folder structure
+dotnet_diagnostic.IDE0130.severity = error
+
+# IDE0320: Make anonymous function static
+dotnet_diagnostic.IDE0320.severity = error

AppControl Manager/App.xaml.cs

@@ -2,7 +2,8 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using AppControlManager.Logging;
+using AppControlManager.AppSettings;
+using AppControlManager.Others;
 using CommunityToolkit.WinUI;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
@@ -57,7 +58,7 @@ public App()
 		#region
 
 		// Check for the SoundSetting in the local settings
-		bool soundSetting = AppSettings.GetSetting<bool>(AppSettings.SettingKeys.SoundSetting);
+		bool soundSetting = AppSettingsCls.GetSetting<bool>(AppSettingsCls.SettingKeys.SoundSetting);
 
 		if (soundSetting)
 		{

AppControl Manager/AppSettings/AppSettings.cs → AppControl Manager/AppSettings/AppSettingsCls.cs

@@ -1,10 +1,10 @@
 using Windows.Storage;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // https://learn.microsoft.com/en-us/uwp/api/windows.storage.applicationdata.localsettings
 
-internal static class AppSettings
+internal static class AppSettingsCls
 {
 	/// <summary>
 	/// Save setting to local storage with a specific key and value

AppControl Manager/AppSettings/AppThemeManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // Custom EventArgs class for app theme changes
 internal sealed class AppThemeChangedEventArgs(string? newTheme) : EventArgs

AppControl Manager/AppSettings/IconsStyleManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // Custom EventArgs class for Icons Style changes
 internal sealed class IconsStyleChangedEventArgs(string? newIconsStyle) : EventArgs

AppControl Manager/AppSettings/NavigationBackgroundManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // Custom EventArgs class for navigation background changes
 internal sealed class NavigationBackgroundChangedEventArgs(bool isBackgroundOn) : EventArgs

AppControl Manager/AppSettings/NavigationViewLocationManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // Custom EventArgs class for navigation view location changes
 internal sealed class NavigationViewLocationChangedEventArgs(string newLocation) : EventArgs

AppControl Manager/AppSettings/SoundManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // Custom EventArgs class for sound setting changes
 internal sealed class SoundSettingChangedEventArgs(bool isSoundOn) : EventArgs

AppControl Manager/AppSettings/ThemeManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace AppControlManager;
+namespace AppControlManager.AppSettings;
 
 // Custom EventArgs class for the event
 internal sealed class BackgroundChangedEventArgs(string? newBackground) : EventArgs

AppControl Manager/CustomUIElements/SigningDetailsDialog.xaml.cs

@@ -3,7 +3,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using AppControlManager.Logic.IntelGathering;
+using AppControlManager.IntelGathering;
+using AppControlManager.Main;
+using AppControlManager.Others;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;

AppControl Manager/CustomUIElements/SigningDetailsDialogForRemoval.xaml.cs

@@ -3,7 +3,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using AppControlManager.Logic.IntelGathering;
+using AppControlManager.IntelGathering;
+using AppControlManager.Main;
+using AppControlManager.Others;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;

AppControl Manager/Logic/IntelGathering/CertCNFetcher.cs → AppControl Manager/IntelGathering/CertCNFetcher.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
+using AppControlManager.Others;
 
-namespace AppControlManager;
+namespace AppControlManager.IntelGathering;
 
 internal static class CertCNFetcher
 {

AppControl Manager/Logic/IntelGathering/FileIdentityECCBasedHashSet.cs → AppControl Manager/IntelGathering/FileIdentityECCBasedHashSet.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 
 namespace AppControlManager.IntelGathering;
 

AppControl Manager/Logic/IntelGathering/FileIdentitySignatureBasedHashSet.cs → AppControl Manager/IntelGathering/FileIdentitySignatureBasedHashSet.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 
 namespace AppControlManager.IntelGathering;
 

AppControl Manager/Logic/IntelGathering/FileIdentityTimeBasedHashSet.cs → AppControl Manager/IntelGathering/FileIdentityTimeBasedHashSet.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 
 namespace AppControlManager.IntelGathering;
 

AppControl Manager/Logic/IntelGathering/GetEventLogsData.cs → AppControl Manager/IntelGathering/GetEventLogsData.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Xml;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 
 namespace AppControlManager.IntelGathering;
 

AppControl Manager/Logic/IntelGathering/InferCertificatePresence.cs → AppControl Manager/IntelGathering/InferCertificatePresence.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 using AppControlManager.SiPolicy;
 
-namespace AppControlManager.Logic.IntelGathering;
+namespace AppControlManager.IntelGathering;
 
 internal static class CertificatePresence
 {

AppControl Manager/Logic/IntelGathering/KernelModeDrivers.cs → AppControl Manager/IntelGathering/KernelModeDrivers.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 
 #pragma warning disable CS0649
 

AppControl Manager/Logic/IntelGathering/LocalFilesScan.cs → AppControl Manager/IntelGathering/LocalFilesScan.cs

@@ -8,7 +8,9 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using AppControlManager.Logging;
+using AppControlManager.Main;
+using AppControlManager.Others;
+using AppControlManager.SimulationMethods;
 using Microsoft.UI.Xaml.Controls;
 
 namespace AppControlManager.IntelGathering;

AppControl Manager/Logic/IntelGathering/PrepareEmptyPolicy.cs → AppControl Manager/IntelGathering/PrepareEmptyPolicy.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using AppControlManager.Logging;
+using AppControlManager.Others;
 using AppControlManager.XMLOps;
 
 namespace AppControlManager.IntelGathering;

AppControl Manager/Logic/Main/AppControlSimulation.cs → AppControl Manager/Main/AppControlSimulation.cs

@@ -10,11 +10,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml;
-using AppControlManager.Logging;
+using AppControlManager.Others;
+using AppControlManager.SimulationMethods;
 using AppControlManager.XMLOps;
 using Microsoft.UI.Xaml.Controls;
 
-namespace AppControlManager;
+namespace AppControlManager.Main;
 
 internal static class AppControlSimulation
 {
@@ -29,7 +30,7 @@ internal static class AppControlSimulation
 	internal static bool Invoke(List<string>? filePaths, string xmlFilePath, bool noCatalogScanning)
 	{
 		// Call the main method to get the verdicts
-		ConcurrentDictionary<string, SimulationOutput> Results = (Invoke(filePaths, null, xmlFilePath, noCatalogScanning, false, null, 2));
+		ConcurrentDictionary<string, SimulationOutput> Results = Invoke(filePaths, null, xmlFilePath, noCatalogScanning, false, null, 2);
 
 		// See if there are any unauthorized files
 		IEnumerable<SimulationOutput> ResultsAfterFilter = Results.Values.Where(R => !R.IsAuthorized);
@@ -249,7 +250,7 @@ internal static ConcurrentDictionary<string, SimulationOutput> Invoke(
 		double AllFilesCount = CollectedFiles.Count;
 
 		// split the file paths by ThreadsCount which by default is 2 and minimum 1
-		IEnumerable<FileInfo[]> SplitArrays = Enumerable.Chunk(CollectedFiles, (int)Math.Ceiling(AllFilesCount / threadsCount));
+		IEnumerable<FileInfo[]> SplitArrays = CollectedFiles.Chunk((int)Math.Ceiling(AllFilesCount / threadsCount));
 
 		// List of tasks to run in parallel
 		List<Task> tasks = [];
@@ -273,7 +274,7 @@ internal static ConcurrentDictionary<string, SimulationOutput> Invoke(
 						// Update progress bar safely on the UI thread
 						_ = UIProgressBar.DispatcherQueue.TryEnqueue(() =>
 						{
-							double progressPercentage = (processedFilesCount / AllFilesCount) * 100;
+							double progressPercentage = processedFilesCount / AllFilesCount * 100;
 
 							UIProgressBar.Value = Math.Min(progressPercentage, 100);
 						});
@@ -310,8 +311,8 @@ internal static ConcurrentDictionary<string, SimulationOutput> Invoke(
 						continue;
 					}
 
-					String CurrentFilePathHashSHA256;
-					String CurrentFilePathHashSHA1;
+					string CurrentFilePathHashSHA256;
+					string CurrentFilePathHashSHA1;
 
 					try
 					{

AppControl Manager/Logic/Main/BasePolicyCreator.cs → AppControl Manager/Main/BasePolicyCreator.cs

@@ -9,11 +9,10 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Xml;
-using AppControlManager.Logging;
-using AppControlManager.Logic;
+using AppControlManager.Others;
 using AppControlManager.XMLOps;
 
-namespace AppControlManager;
+namespace AppControlManager.Main;
 
 internal static partial class BasePolicyCreator
 {

AppControl Manager/Logic/Main/GetCIPolicySetting.cs → AppControl Manager/Main/GetCIPolicySetting.cs

@@ -1,6 +1,7 @@
 using System.Runtime.InteropServices;
+using AppControlManager.Others;
 
-namespace AppControlManager;
+namespace AppControlManager.Main;
 
 internal sealed class SecurePolicySetting(object? Value, WLDP_SECURE_SETTING_VALUE_TYPE ValueType, uint ValueSize, bool Status, int StatusCode)
 {