From 63c69f22930603379fd30e05bad35e67523ebb55 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Wed, 11 Mar 2026 10:15:07 +0100 Subject: [PATCH] Run dotnet format --- .../Classes/FileOpenDialogRCW.cs | 4 +- .../Classes/FileSaveDialogRCW.cs | 2 +- .../Classes/Helper.cs | 4 +- .../Enums/FDAP.cs | 2 +- .../Enums/FDE_OVERWRITE_RESPONSE.cs | 2 +- .../Enums/FDE_SHAREVIOLATION_RESPONSE.cs | 2 +- .../Enums/FOS.cs | 2 +- .../Enums/HRESULT.cs | 2 +- .../Enums/SIGDN.cs | 2 +- .../FileOpenPicker.cs | 2 +- .../FileSavePicker.cs | 2 +- .../FolderPicker.cs | 2 +- .../Guids/CLSIDGuid.cs | 2 +- .../Guids/IIDGuid.cs | 2 +- .../Guids/KFIDGuid.cs | 2 +- .../Interfaces/FileOpenDialog.cs | 4 +- .../Interfaces/FileSaveDialog.cs | 2 +- .../Interfaces/IFileDialog.cs | 2 +- .../Interfaces/IFileDialogEvents.cs | 2 +- .../Interfaces/IFileOpenDialog.cs | 2 +- .../Interfaces/IModalWindow.cs | 2 +- .../Interfaces/IShellItem.cs | 2 +- .../Interfaces/IShellItemArray.cs | 2 +- .../Structures/COMDLG_FILTERSPEC.cs | 2 +- .../Structures/PROPERTYKEY.cs | 2 +- src/SharedAssemblyInfo.cs | 2 +- .../PersonTests.cs | 2 +- .../TaskRecyclerTests.cs | 4 +- .../IIndexableListItem.cs | 2 +- src/UniGetUI.Core.Classes/ObservableQueue.cs | 2 +- src/UniGetUI.Core.Classes/Person.cs | 2 +- .../ContributorsTests.cs | 2 +- src/UniGetUI.Core.Data.Tests/CoreTests.cs | 2 +- src/UniGetUI.Core.Data.Tests/LicensesTest.cs | 2 +- src/UniGetUI.Core.Data/Contributors.cs | 2 +- src/UniGetUI.Core.Data/CoreData.cs | 5 +- .../IconCacheEngine.cs | 2 +- src/UniGetUI.Core.IconStore/Serializable.cs | 2 +- .../LanguageData.cs | 3 +- .../LogEntryTests.cs | 2 +- .../SecureGHTokenManager.cs | 2 +- .../SettingsTest.cs | 2 +- .../SettingsEngine_Dictionaries.cs | 2 +- .../SettingsEngine_Extras.cs | 4 +- .../SettingsEngine_ImportExport.cs | 4 +- src/UniGetUI.Core.Tools.Tests/ToolsTests.cs | 16 ++--- src/UniGetUI.Core.Tools/DWMThreadHelper.cs | 4 +- src/UniGetUI.Core.Tools/IntegrityTester.cs | 2 +- src/UniGetUI.Core.Tools/Tools.cs | 10 +-- .../BackgroundApi.cs | 6 +- src/UniGetUI.Interface.Enums/Enums.cs | 2 +- .../TelemetryHandler.cs | 6 +- .../IManagerLogger.cs | 1 + .../OverridenInstallationOptions.cs | 1 + .../Cargo.cs | 6 +- .../Helpers/CargoPkgDetailsHelper.cs | 3 +- .../Helpers/CargoPkgOperationHelper.cs | 4 +- .../Chocolatey.cs | 2 +- .../Helpers/ChocolateyDetailsHelper.cs | 2 +- .../Helpers/ChocolateyPkgOperationHelper.cs | 1 + .../Helpers/DotNetPkgOperationHelper.cs | 1 + .../BaseNuGet.cs | 4 +- .../BaseNuGetDetailsHelper.cs | 10 +-- .../Helpers/NpmPkgDetailsHelper.cs | 8 +-- .../Helpers/NpmPkgOperationHelper.cs | 6 +- .../Helpers/PipPkgOperationHelper.cs | 1 + .../Helpers/PowerShellPkgOperationHelper.cs | 1 + .../PowerShell.cs | 2 +- .../Helpers/PowerShell7PkgOperationHelper.cs | 3 +- .../PowerShell7.cs | 2 +- .../Helpers/ScoopPkgDetailsHelper.cs | 12 ++-- .../Helpers/ScoopPkgOperationHelper.cs | 3 +- .../Scoop.cs | 2 +- .../Helpers/VcpkgPkgDetailsHelper.cs | 2 +- .../Helpers/VcpkgPkgOperationHelper.cs | 4 +- .../Helpers/VcpkgSourceHelper.cs | 7 ++- .../Vcpkg.cs | 2 +- .../ClientHelpers/BundledWinGetHelper.cs | 2 +- .../ClientHelpers/NativeWinGetHelper.cs | 2 +- .../ClientHelpers/WinGetIconsHelper.cs | 1 + .../Helpers/WinGetPkgDetailsHelper.cs | 4 +- .../Helpers/WinGetPkgOperationHelper.cs | 8 ++- .../WinGet.cs | 4 +- .../AbstractOperation.cs | 16 ++--- .../AbstractOperation_Auxiliaries.cs | 2 +- .../AbstractProcessOperation.cs | 2 +- .../DownloadOperation.cs | 5 +- .../KillProcessOperation.cs | 6 +- .../PackageOperations.cs | 8 +-- .../SourceOperations.cs | 6 +- .../PEInterface.cs | 4 +- .../DiscoverablePackagesLoader.cs | 2 +- .../PackageBundlesLoader.cs | 2 +- .../UpgradablePackagesLoader.cs | 2 +- .../Manager/Helpers/BasePkgDetailsHelper.cs | 3 +- .../Manager/PackageManager.cs | 4 +- .../Classes/DesktopShortcutsDatabase.cs | 2 +- .../Packages/Package.cs | 8 +-- .../TestDuplicateUpdateDetection.cs | 2 +- .../TestSerializablePackage.cs | 2 +- .../InstallOptions.cs | 4 +- .../SerializableBundle.cs | 8 +-- .../SerializableComponent.cs | 2 +- .../SerializableIncompatiblePackage.cs | 11 ++-- .../SerializablePackage.cs | 2 +- .../SerializableUpdatesOptions.cs | 6 +- src/UniGetUI/App.xaml.cs | 14 ++--- src/UniGetUI/AppOperationHelper.cs | 16 ++--- src/UniGetUI/AutoUpdater.cs | 2 +- src/UniGetUI/CLIHandler.cs | 18 +++--- src/UniGetUI/Controls/CustomNavViewItem.cs | 3 +- .../Controls/DialogCloseButton.xaml.cs | 1 + src/UniGetUI/Controls/MenuForPackage.cs | 4 +- .../OperationWidgets/OperationBadge.cs | 1 + .../OperationWidgets/OperationControl.cs | 62 +++++++++++-------- src/UniGetUI/Controls/PackageItemContainer.cs | 2 +- src/UniGetUI/Controls/PackageWrapper.cs | 2 +- .../SettingsWidgets/CheckboxButtonCard.cs | 11 ++-- .../Controls/SettingsWidgets/CheckboxCard.cs | 19 +++--- .../SettingsWidgets/SecureCheckboxCard.cs | 2 +- .../Controls/SettingsWidgets/TextboxCard.cs | 3 +- src/UniGetUI/CrashHandler.cs | 13 ++-- src/UniGetUI/MainWindow.xaml.cs | 26 ++++---- .../DialogPages/DesktopShortcuts.xaml.cs | 8 +-- .../Pages/DialogPages/DialogHelper_Generic.cs | 14 ++--- .../DialogHelper_Infrastructure.cs | 8 +-- .../DialogPages/DialogHelper_Packages.cs | 15 ++--- .../Pages/DialogPages/IgnoredUpdates.xaml.cs | 4 +- .../InstallOptions_Manager.xaml.cs | 4 +- .../InstallOptions_Package.xaml.cs | 16 ++--- .../DialogPages/PackageDetailsPage.xaml.cs | 28 +++++---- src/UniGetUI/Pages/HelpPage.xaml.cs | 2 +- .../Pages/LogPages/OperationHistoryPage.cs | 2 +- .../Pages/LogPages/UniGetUILogPage.cs | 3 +- src/UniGetUI/Pages/MainView.xaml.cs | 26 ++++---- .../IKeyboardShortcutListener.cs | 2 +- .../Pages/PageInterfaces/ISearchBoxPage.cs | 1 + .../GeneralPages/Administrator.xaml.cs | 2 +- .../GeneralPages/General.xaml.cs | 6 +- .../GeneralPages/Interface_P.xaml.cs | 4 +- .../GeneralPages/Internet.xaml.cs | 4 +- .../GeneralPages/Notifications.xaml.cs | 2 +- .../GeneralPages/Operations.xaml.cs | 2 +- .../GeneralPages/Updates.xaml.cs | 2 +- .../ManagersPages/ManagersHomepage.xaml.cs | 17 ++--- .../ManagersPages/PackageManager.xaml.cs | 40 ++++++------ .../SettingsPages/SettingsBasePage.xaml.cs | 16 ++--- .../AbstractPackagesPage.xaml.cs | 41 ++++++------ .../SoftwarePages/DiscoverSoftwarePage.cs | 8 +-- .../SoftwarePages/InstalledPackagesPage.cs | 6 +- .../Pages/SoftwarePages/PackageBundlesPage.cs | 20 +++--- .../SoftwarePages/SoftwareUpdatesPage.cs | 25 ++++---- src/UniGetUI/Services/BackgroundLoginApi.cs | 2 +- src/UniGetUI/Services/GitHubAuthService.cs | 2 +- src/UniGetUI/Services/UserAvatar.cs | 8 +-- .../WinGetConfigurationException.cs | 2 +- .../WindowsPackageManager/ClassModel.cs | 2 +- .../WindowsPackageManager/ClsidContext.cs | 2 +- 158 files changed, 485 insertions(+), 432 deletions(-) diff --git a/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs b/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs index b54f8c31b1..0a8311fadf 100644 --- a/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs +++ b/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Guids; namespace ExternalLibraries.Pickers.Classes; @@ -11,4 +11,4 @@ namespace ExternalLibraries.Pickers.Classes; Guid(CLSIDGuid.FileOpenDialog)] internal class FileOpenDialogRCW { -} \ No newline at end of file +} diff --git a/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs b/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs index 96a69092fe..76f99e6bd3 100644 --- a/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs +++ b/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Guids; namespace ExternalLibraries.Pickers.Classes; diff --git a/src/ExternalLibraries.FilePickers/Classes/Helper.cs b/src/ExternalLibraries.FilePickers/Classes/Helper.cs index 56a6a379a7..dd81f957c8 100644 --- a/src/ExternalLibraries.FilePickers/Classes/Helper.cs +++ b/src/ExternalLibraries.FilePickers/Classes/Helper.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Interfaces; using ExternalLibraries.Pickers.Structures; @@ -78,7 +78,7 @@ internal static string ShowSave(nint windowHandle, FOS fos, List? typeFi if (fileExtension.Length > 0 && fileExtension[0] == '*') fileExtension = fileExtension.TrimStart('*'); - return path.Contains(fileExtension)? path: path + fileExtension; + return path.Contains(fileExtension) ? path : path + fileExtension; } finally { diff --git a/src/ExternalLibraries.FilePickers/Enums/FDAP.cs b/src/ExternalLibraries.FilePickers/Enums/FDAP.cs index c6347e9328..ff698114e1 100644 --- a/src/ExternalLibraries.FilePickers/Enums/FDAP.cs +++ b/src/ExternalLibraries.FilePickers/Enums/FDAP.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Enums; +namespace ExternalLibraries.Pickers.Enums; // https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/ne-shobjidl_core-fdap internal enum FDAP diff --git a/src/ExternalLibraries.FilePickers/Enums/FDE_OVERWRITE_RESPONSE.cs b/src/ExternalLibraries.FilePickers/Enums/FDE_OVERWRITE_RESPONSE.cs index 011f2bdaa0..3304813743 100644 --- a/src/ExternalLibraries.FilePickers/Enums/FDE_OVERWRITE_RESPONSE.cs +++ b/src/ExternalLibraries.FilePickers/Enums/FDE_OVERWRITE_RESPONSE.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Enums; +namespace ExternalLibraries.Pickers.Enums; // https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/ne-shobjidl_core-fde_overwrite_response internal enum FDE_OVERWRITE_RESPONSE diff --git a/src/ExternalLibraries.FilePickers/Enums/FDE_SHAREVIOLATION_RESPONSE.cs b/src/ExternalLibraries.FilePickers/Enums/FDE_SHAREVIOLATION_RESPONSE.cs index 71fb59290f..8d513a04b6 100644 --- a/src/ExternalLibraries.FilePickers/Enums/FDE_SHAREVIOLATION_RESPONSE.cs +++ b/src/ExternalLibraries.FilePickers/Enums/FDE_SHAREVIOLATION_RESPONSE.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Enums; +namespace ExternalLibraries.Pickers.Enums; // https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/ne-shobjidl_core-fde_shareviolation_response internal enum FDE_SHAREVIOLATION_RESPONSE diff --git a/src/ExternalLibraries.FilePickers/Enums/FOS.cs b/src/ExternalLibraries.FilePickers/Enums/FOS.cs index 5504ea162d..d2e3dc0ad0 100644 --- a/src/ExternalLibraries.FilePickers/Enums/FOS.cs +++ b/src/ExternalLibraries.FilePickers/Enums/FOS.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Enums; +namespace ExternalLibraries.Pickers.Enums; [Flags] // https://learn.microsoft.com/ru-ru/windows/win32/api/shobjidl_core/ne-shobjidl_core-_fileopendialogoptions diff --git a/src/ExternalLibraries.FilePickers/Enums/HRESULT.cs b/src/ExternalLibraries.FilePickers/Enums/HRESULT.cs index 2bbc83dbff..e64edf6d81 100644 --- a/src/ExternalLibraries.FilePickers/Enums/HRESULT.cs +++ b/src/ExternalLibraries.FilePickers/Enums/HRESULT.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Enums; +namespace ExternalLibraries.Pickers.Enums; internal enum HRESULT : long { diff --git a/src/ExternalLibraries.FilePickers/Enums/SIGDN.cs b/src/ExternalLibraries.FilePickers/Enums/SIGDN.cs index 0b2456d0d9..c7ae4356d7 100644 --- a/src/ExternalLibraries.FilePickers/Enums/SIGDN.cs +++ b/src/ExternalLibraries.FilePickers/Enums/SIGDN.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Enums; +namespace ExternalLibraries.Pickers.Enums; // https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/ne-shobjidl_core-sigdn internal enum SIGDN : uint diff --git a/src/ExternalLibraries.FilePickers/FileOpenPicker.cs b/src/ExternalLibraries.FilePickers/FileOpenPicker.cs index 0f86c05da6..365e393a40 100644 --- a/src/ExternalLibraries.FilePickers/FileOpenPicker.cs +++ b/src/ExternalLibraries.FilePickers/FileOpenPicker.cs @@ -1,4 +1,4 @@ -using ExternalLibraries.Pickers.Classes; +using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Enums; namespace ExternalLibraries.Pickers; diff --git a/src/ExternalLibraries.FilePickers/FileSavePicker.cs b/src/ExternalLibraries.FilePickers/FileSavePicker.cs index 1059728807..917ad60647 100644 --- a/src/ExternalLibraries.FilePickers/FileSavePicker.cs +++ b/src/ExternalLibraries.FilePickers/FileSavePicker.cs @@ -1,4 +1,4 @@ -using ExternalLibraries.Pickers.Classes; +using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Enums; namespace ExternalLibraries.Pickers; diff --git a/src/ExternalLibraries.FilePickers/FolderPicker.cs b/src/ExternalLibraries.FilePickers/FolderPicker.cs index 0642f9e2a4..f241217237 100644 --- a/src/ExternalLibraries.FilePickers/FolderPicker.cs +++ b/src/ExternalLibraries.FilePickers/FolderPicker.cs @@ -1,4 +1,4 @@ -using ExternalLibraries.Pickers.Classes; +using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Enums; namespace ExternalLibraries.Pickers; diff --git a/src/ExternalLibraries.FilePickers/Guids/CLSIDGuid.cs b/src/ExternalLibraries.FilePickers/Guids/CLSIDGuid.cs index 228f4ed353..0e42f31158 100644 --- a/src/ExternalLibraries.FilePickers/Guids/CLSIDGuid.cs +++ b/src/ExternalLibraries.FilePickers/Guids/CLSIDGuid.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Guids; +namespace ExternalLibraries.Pickers.Guids; internal static class CLSIDGuid { diff --git a/src/ExternalLibraries.FilePickers/Guids/IIDGuid.cs b/src/ExternalLibraries.FilePickers/Guids/IIDGuid.cs index a0f1878073..22e824da89 100644 --- a/src/ExternalLibraries.FilePickers/Guids/IIDGuid.cs +++ b/src/ExternalLibraries.FilePickers/Guids/IIDGuid.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Guids; +namespace ExternalLibraries.Pickers.Guids; internal static class IIDGuid { diff --git a/src/ExternalLibraries.FilePickers/Guids/KFIDGuid.cs b/src/ExternalLibraries.FilePickers/Guids/KFIDGuid.cs index b51f3740d8..a959a87c68 100644 --- a/src/ExternalLibraries.FilePickers/Guids/KFIDGuid.cs +++ b/src/ExternalLibraries.FilePickers/Guids/KFIDGuid.cs @@ -1,4 +1,4 @@ -namespace ExternalLibraries.Pickers.Guids; +namespace ExternalLibraries.Pickers.Guids; internal static class KFIDGuid { diff --git a/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs index 9cddb1024f..5c9c23b048 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Guids; @@ -14,4 +14,4 @@ namespace ExternalLibraries.Pickers.Interfaces; CoClass(typeof(FileOpenDialogRCW))] internal interface FileOpenDialog : IFileOpenDialog { -} \ No newline at end of file +} diff --git a/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs index 2f76d7e805..e27a741ac4 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Guids; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs index 12f2955bad..12ef55dd95 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs index 732a52d25c..983b966261 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs index 61f666d288..3740df4958 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Guids; using ExternalLibraries.Pickers.Structures; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs b/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs index 59f836abdf..7c168475a4 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Guids; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs b/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs index 8bf3f168ff..186a51f8f9 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs b/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs index 990cb92fbf..2241197802 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs @@ -1,4 +1,4 @@ -using System.Runtime.CompilerServices; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; diff --git a/src/ExternalLibraries.FilePickers/Structures/COMDLG_FILTERSPEC.cs b/src/ExternalLibraries.FilePickers/Structures/COMDLG_FILTERSPEC.cs index 2fa3b3110e..aa5d8278c1 100644 --- a/src/ExternalLibraries.FilePickers/Structures/COMDLG_FILTERSPEC.cs +++ b/src/ExternalLibraries.FilePickers/Structures/COMDLG_FILTERSPEC.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Structures; diff --git a/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs b/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs index dbb1a5ab4d..3729e2841b 100644 --- a/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs +++ b/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs @@ -1,4 +1,4 @@ -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Structures; diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 4415200dfa..67b68b9ebf 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.Versioning; [assembly: AssemblyProduct("UniGetUI")] diff --git a/src/UniGetUI.Core.Classes.Tests/PersonTests.cs b/src/UniGetUI.Core.Classes.Tests/PersonTests.cs index 607dbeaac0..ef605b2626 100644 --- a/src/UniGetUI.Core.Classes.Tests/PersonTests.cs +++ b/src/UniGetUI.Core.Classes.Tests/PersonTests.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.Classes.Tests +namespace UniGetUI.Core.Classes.Tests { public class PersonTests { diff --git a/src/UniGetUI.Core.Classes.Tests/TaskRecyclerTests.cs b/src/UniGetUI.Core.Classes.Tests/TaskRecyclerTests.cs index d412fb8d72..0005138ccd 100644 --- a/src/UniGetUI.Core.Classes.Tests/TaskRecyclerTests.cs +++ b/src/UniGetUI.Core.Classes.Tests/TaskRecyclerTests.cs @@ -10,7 +10,7 @@ private int MySlowMethod1() private class TestClass { - public TestClass() {} + public TestClass() { } public string SlowMethod2() { @@ -38,7 +38,7 @@ public async Task TestTaskRecycler_Static_Int() var task1 = TaskRecycler.RunOrAttachAsync(MySlowMethod1); var task2 = TaskRecycler.RunOrAttachAsync(MySlowMethod1); int result1 = await task1; - int result2 = await task2; + int result2 = await task2; Assert.Equal(result1, result2); // The same static method should be cached, and therefore the return value should be the same, but different from previous runs diff --git a/src/UniGetUI.Core.Classes/IIndexableListItem.cs b/src/UniGetUI.Core.Classes/IIndexableListItem.cs index 76856aab66..5e7b20dee3 100644 --- a/src/UniGetUI.Core.Classes/IIndexableListItem.cs +++ b/src/UniGetUI.Core.Classes/IIndexableListItem.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.Classes +namespace UniGetUI.Core.Classes { public interface IIndexableListItem { diff --git a/src/UniGetUI.Core.Classes/ObservableQueue.cs b/src/UniGetUI.Core.Classes/ObservableQueue.cs index ebc57e53b0..54996e5525 100644 --- a/src/UniGetUI.Core.Classes/ObservableQueue.cs +++ b/src/UniGetUI.Core.Classes/ObservableQueue.cs @@ -18,7 +18,7 @@ public class EventArgs(T item) public new T Dequeue() { - T item = base.Dequeue(); + T item = base.Dequeue(); ItemDequeued?.Invoke(this, new EventArgs(item)); return item; } diff --git a/src/UniGetUI.Core.Classes/Person.cs b/src/UniGetUI.Core.Classes/Person.cs index 6e5996f4d0..3e95209cfd 100644 --- a/src/UniGetUI.Core.Classes/Person.cs +++ b/src/UniGetUI.Core.Classes/Person.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.Classes +namespace UniGetUI.Core.Classes { public readonly struct Person { diff --git a/src/UniGetUI.Core.Data.Tests/ContributorsTests.cs b/src/UniGetUI.Core.Data.Tests/ContributorsTests.cs index 9fd9925494..fbdc99839c 100644 --- a/src/UniGetUI.Core.Data.Tests/ContributorsTests.cs +++ b/src/UniGetUI.Core.Data.Tests/ContributorsTests.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.Data.Tests +namespace UniGetUI.Core.Data.Tests { public class ContributorsTests { diff --git a/src/UniGetUI.Core.Data.Tests/CoreTests.cs b/src/UniGetUI.Core.Data.Tests/CoreTests.cs index e38f662e74..f3a8d03b7b 100644 --- a/src/UniGetUI.Core.Data.Tests/CoreTests.cs +++ b/src/UniGetUI.Core.Data.Tests/CoreTests.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.Data.Tests +namespace UniGetUI.Core.Data.Tests { public class CoreTests { diff --git a/src/UniGetUI.Core.Data.Tests/LicensesTest.cs b/src/UniGetUI.Core.Data.Tests/LicensesTest.cs index ebb8c41e46..2fa4ec8b1c 100644 --- a/src/UniGetUI.Core.Data.Tests/LicensesTest.cs +++ b/src/UniGetUI.Core.Data.Tests/LicensesTest.cs @@ -35,4 +35,4 @@ public void EnsureHomepageUrlsExist() } } -} \ No newline at end of file +} diff --git a/src/UniGetUI.Core.Data/Contributors.cs b/src/UniGetUI.Core.Data/Contributors.cs index cd274d57be..d6aac52f5a 100644 --- a/src/UniGetUI.Core.Data/Contributors.cs +++ b/src/UniGetUI.Core.Data/Contributors.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.Data +namespace UniGetUI.Core.Data { public static class ContributorsData { diff --git a/src/UniGetUI.Core.Data/CoreData.cs b/src/UniGetUI.Core.Data/CoreData.cs index e20fd01e45..f848944dc9 100644 --- a/src/UniGetUI.Core.Data/CoreData.cs +++ b/src/UniGetUI.Core.Data/CoreData.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using UniGetUI.Core.Logging; namespace UniGetUI.Core.Data @@ -56,7 +56,8 @@ public static string UniGetUIDataDirectory Logger.Error(ex); } } - } else if (IS_PORTABLE is true) + } + else if (IS_PORTABLE is true) { return PORTABLE_PATH ?? throw new Exception("This shouldn't be possible"); } diff --git a/src/UniGetUI.Core.IconStore/IconCacheEngine.cs b/src/UniGetUI.Core.IconStore/IconCacheEngine.cs index 3444e2754f..c5310645c6 100644 --- a/src/UniGetUI.Core.IconStore/IconCacheEngine.cs +++ b/src/UniGetUI.Core.IconStore/IconCacheEngine.cs @@ -111,7 +111,7 @@ public static class IconCacheEngine var icon = _icon.Value; - if(icon.IsLocalPath) + if (icon.IsLocalPath) return icon.LocalPath; string iconLocation = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, PackageId); diff --git a/src/UniGetUI.Core.IconStore/Serializable.cs b/src/UniGetUI.Core.IconStore/Serializable.cs index 543fa263ce..23ec7b04f5 100644 --- a/src/UniGetUI.Core.IconStore/Serializable.cs +++ b/src/UniGetUI.Core.IconStore/Serializable.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Core.IconEngine +namespace UniGetUI.Core.IconEngine { internal struct IconScreenshotDatabase_v2 { diff --git a/src/UniGetUI.Core.LanguageEngine/LanguageData.cs b/src/UniGetUI.Core.LanguageEngine/LanguageData.cs index 07e6d10cc6..b9d67fb198 100644 --- a/src/UniGetUI.Core.LanguageEngine/LanguageData.cs +++ b/src/UniGetUI.Core.LanguageEngine/LanguageData.cs @@ -54,7 +54,8 @@ public static ReadOnlyDictionary TranslationPercentages private static ReadOnlyDictionary LoadTranslationPercentages() { - try { + try + { if (JsonNode.Parse(File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "TranslatedPercentages.json"))) is JsonObject val) { return new(val.ToDictionary(x => x.Key, x => (x.Value ?? ("404%" + x.Key)).ToString())); diff --git a/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs b/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs index 568f12031d..d04bc0f740 100644 --- a/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs +++ b/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs @@ -34,4 +34,4 @@ public async Task TestLogEntry() Assert.True(logEntry2.Time < logEntry3.Time); } } -} \ No newline at end of file +} diff --git a/src/UniGetUI.Core.SecureSettings/SecureGHTokenManager.cs b/src/UniGetUI.Core.SecureSettings/SecureGHTokenManager.cs index e66b7b3a1c..3aea676706 100644 --- a/src/UniGetUI.Core.SecureSettings/SecureGHTokenManager.cs +++ b/src/UniGetUI.Core.SecureSettings/SecureGHTokenManager.cs @@ -1,5 +1,5 @@ -using Windows.Security.Credentials; using UniGetUI.Core.Logging; +using Windows.Security.Credentials; namespace UniGetUI.Core.SecureSettings { diff --git a/src/UniGetUI.Core.Settings.Tests/SettingsTest.cs b/src/UniGetUI.Core.Settings.Tests/SettingsTest.cs index ede74dc344..df4beaf660 100644 --- a/src/UniGetUI.Core.Settings.Tests/SettingsTest.cs +++ b/src/UniGetUI.Core.Settings.Tests/SettingsTest.cs @@ -272,7 +272,7 @@ public static void EnsureAllKeysResolve() { foreach (Settings.K key in Enum.GetValues(typeof(Settings.K))) { - if(key is Settings.K.Unset) continue; + if (key is Settings.K.Unset) continue; Assert.NotEmpty(Settings.ResolveKey(key)); } } diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_Dictionaries.cs b/src/UniGetUI.Core.Settings/SettingsEngine_Dictionaries.cs index 6de0da2a4b..ab8f15a302 100644 --- a/src/UniGetUI.Core.Settings/SettingsEngine_Dictionaries.cs +++ b/src/UniGetUI.Core.Settings/SettingsEngine_Dictionaries.cs @@ -12,7 +12,7 @@ public static partial class Settings // Returns an empty dictionary if the setting doesn't exist and null if the types are invalid private static Dictionary _getDictionary(K key) where KeyT : notnull - { + { string setting = ResolveKey(key); try { diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs b/src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs index dc63aaaf02..bd5cd16137 100644 --- a/src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs +++ b/src/UniGetUI.Core.Settings/SettingsEngine_Extras.cs @@ -1,8 +1,8 @@ using System.Net; using System.Text.Json; using System.Text.Json.Serialization.Metadata; -using Windows.Security.Credentials; using UniGetUI.Core.Logging; +using Windows.Security.Credentials; namespace UniGetUI.Core.SettingsEngine; @@ -34,7 +34,7 @@ public static bool AreProgressNotificationsDisabled() string plainUrl = GetValue(K.ProxyURL); Uri.TryCreate(plainUrl, UriKind.RelativeOrAbsolute, out Uri? var); - if(Get(K.EnableProxy) && var is null) Logger.Warn($"Proxy setting {plainUrl} is not valid"); + if (Get(K.EnableProxy) && var is null) Logger.Warn($"Proxy setting {plainUrl} is not valid"); return var; } diff --git a/src/UniGetUI.Core.Settings/SettingsEngine_ImportExport.cs b/src/UniGetUI.Core.Settings/SettingsEngine_ImportExport.cs index 59ab0bda49..a7131aea96 100644 --- a/src/UniGetUI.Core.Settings/SettingsEngine_ImportExport.cs +++ b/src/UniGetUI.Core.Settings/SettingsEngine_ImportExport.cs @@ -15,7 +15,7 @@ public static void ImportFromFile_JSON(string path) { if (Path.GetDirectoryName(path) == CoreData.UniGetUIUserConfigurationDirectory) { - var tempLocation = Directory.CreateTempSubdirectory(); + var tempLocation = Directory.CreateTempSubdirectory(); var newPath = Path.Join(tempLocation.FullName, Path.GetFileName(path)); File.Copy(path, newPath); path = newPath; @@ -56,7 +56,7 @@ public static void ResetSettings() { try { - if(new[] {"TelemetryClientToken"}.Contains(entry.Split("\\")[^1])) + if (new[] { "TelemetryClientToken" }.Contains(entry.Split("\\")[^1])) continue; File.Delete(entry); diff --git a/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs b/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs index 54c953b16a..6f5651889b 100644 --- a/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs +++ b/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs @@ -117,14 +117,14 @@ public async Task TestFileSizeLoader(string uri, long expectedSize) [InlineData("1000.0", 1000, 0, 0, 0)] [InlineData("2.4", 2, 4, 0, 0)] [InlineData("33a.12-beta5", 33, 12, 5, 0)] - [InlineData("0", 0,0,0,0)] - [InlineData("", 0,0,0,0)] - [InlineData("dfgfdsgdfg", 0,0,0,0)] - [InlineData("-12", 12,0,0,0)] - [InlineData("4.0.0.1.0", 4,0,0,10)] - [InlineData("4.0.0.1.05", 4,0,0,105)] + [InlineData("0", 0, 0, 0, 0)] + [InlineData("", 0, 0, 0, 0)] + [InlineData("dfgfdsgdfg", 0, 0, 0, 0)] + [InlineData("-12", 12, 0, 0, 0)] + [InlineData("4.0.0.1.0", 4, 0, 0, 10)] + [InlineData("4.0.0.1.05", 4, 0, 0, 105)] [InlineData("2024.30.04.1223", 2024, 30, 4, 1223)] - [InlineData("0.0", 0,0,0,0)] + [InlineData("0.0", 0, 0, 0, 0)] public void TestGetVersionStringAsFloat(string version, int i1, int i2, int i3, int i4) { CoreTools.Version v = CoreTools.VersionStringToStruct(version); @@ -208,7 +208,7 @@ public void TestTextProgressbarGenerator(int length, int progress, string? extra [Theory] [InlineData(0, 1, "0 Bytes")] [InlineData(10, 1, "10 Bytes")] - [InlineData(1024*34, 0, "34 KB")] + [InlineData(1024 * 34, 0, "34 KB")] [InlineData(65322450, 3, "62.296 MB")] [InlineData(65322450000, 3, "60.836 GB")] [InlineData(65322450000000, 3, "59.410 TB")] diff --git a/src/UniGetUI.Core.Tools/DWMThreadHelper.cs b/src/UniGetUI.Core.Tools/DWMThreadHelper.cs index 752386dce9..e63f83524a 100644 --- a/src/UniGetUI.Core.Tools/DWMThreadHelper.cs +++ b/src/UniGetUI.Core.Tools/DWMThreadHelper.cs @@ -92,7 +92,7 @@ private static IntPtr GetThreadStartAdress(int threadId) IntPtr adress = 0x00; int status = NtQueryInformationThread(hThread, ThreadQuerySetWin32StartAddress, ref adress, Marshal.SizeOf(typeof(IntPtr)), out _); - if(status != 0) Logger.Warn($"NtQueryInformationThread returned non-zero status code 0x{(uint)status:X}"); + if (status != 0) Logger.Warn($"NtQueryInformationThread returned non-zero status code 0x{(uint)status:X}"); CloseHandle(hThread); return adress; } @@ -126,7 +126,7 @@ private static void ChangeState(bool suspend, IntPtr expectedAdress, ref bool Is { Logger.Error($"No thread matching {loggerName} with start adress {expectedAdress:X} was found. " + $"Best guess was {minId} with adress offset {LastDiff:X}"); - if(Debugger.IsAttached) Debugger.Break(); + if (Debugger.IsAttached) Debugger.Break(); return; } diff --git a/src/UniGetUI.Core.Tools/IntegrityTester.cs b/src/UniGetUI.Core.Tools/IntegrityTester.cs index acb204b92a..32ff15826a 100644 --- a/src/UniGetUI.Core.Tools/IntegrityTester.cs +++ b/src/UniGetUI.Core.Tools/IntegrityTester.cs @@ -144,4 +144,4 @@ public static string GetReadableReport(Result result) return Builder.ToString(); } -} \ No newline at end of file +} diff --git a/src/UniGetUI.Core.Tools/Tools.cs b/src/UniGetUI.Core.Tools/Tools.cs index a5d85eb602..f32ce6d589 100644 --- a/src/UniGetUI.Core.Tools/Tools.cs +++ b/src/UniGetUI.Core.Tools/Tools.cs @@ -4,13 +4,13 @@ using System.Security.Cryptography; using System.Security.Principal; using System.Text; -using Windows.Networking.Connectivity; using ABI.Windows.ApplicationModel.UserDataTasks; using UniGetUI.Core.Classes; using UniGetUI.Core.Data; using UniGetUI.Core.Language; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; +using Windows.Networking.Connectivity; namespace UniGetUI.Core.Tools { @@ -151,7 +151,7 @@ public static List WhichMultiple(string command, bool updateEnv = true) return []; } - Logger.Debug($"Command {command} was found on {lines[0]} (with {lines.Length-1} more occurrences)"); + Logger.Debug($"Command {command} was found on {lines[0]} (with {lines.Length - 1} more occurrences)"); return lines.ToList(); } catch @@ -164,7 +164,7 @@ public static List WhichMultiple(string command, bool updateEnv = true) public static Tuple Which(string command, bool updateEnv = true) { var paths = WhichMultiple(command, updateEnv); - return new(paths.Any(), paths.Any() ? paths[0]: ""); + return new(paths.Any(), paths.Any() ? paths[0] : ""); } /// @@ -306,7 +306,7 @@ public static Task GetFileNameAsync(Uri url) => Task.Run(() => GetFileName(url)); - public struct Version: IComparable + public struct Version : IComparable { public static readonly Version Null = new(-1, -1, -1, -1); @@ -759,7 +759,7 @@ public static async void FinalizeDangerousTask(Task t) { try { - await t.ConfigureAwait(false); + await t.ConfigureAwait(false); } catch (Exception ex) { diff --git a/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs b/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs index c597865397..4a88b1d02c 100644 --- a/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs +++ b/src/UniGetUI.Interface.BackgroundApi/BackgroundApi.cs @@ -1,9 +1,9 @@ +using System.Text; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Hosting; -using System.Text; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using UniGetUI.Core.Data; using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; @@ -91,7 +91,7 @@ public async Task Start() Logger.Info("Api running on http://localhost:7058"); } - private async Task V2_ShowPackage(HttpContext context) + private async Task V2_ShowPackage(HttpContext context) { var query = context.Request.Query; if (string.IsNullOrEmpty(query["pid"]) || string.IsNullOrEmpty(query["psource"])) diff --git a/src/UniGetUI.Interface.Enums/Enums.cs b/src/UniGetUI.Interface.Enums/Enums.cs index a805e5f951..997f542881 100644 --- a/src/UniGetUI.Interface.Enums/Enums.cs +++ b/src/UniGetUI.Interface.Enums/Enums.cs @@ -111,6 +111,6 @@ public struct BundleReport public bool IsEmpty = false; public Dictionary> Contents = new(); public BundleReport() - {} + { } } } diff --git a/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs b/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs index 0990646fb6..2038f96f96 100644 --- a/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs +++ b/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs @@ -86,7 +86,7 @@ public static async Task InitializeAsync() if (mask == 0x1) throw new OverflowException(); } - foreach (var setting in new []{"SP1", "SP2"}) + foreach (var setting in new[] { "SP1", "SP2" }) { bool enabled; if (setting == "SP1") enabled = File.Exists("ForceUniGetUIPortable"); @@ -164,8 +164,8 @@ private static async void PackageEndpoint(IPackage package, string endpoint, TEL request.Headers.Add("packageId", package.Id); request.Headers.Add("managerName", package.Manager.Name); request.Headers.Add("sourceName", package.Source.Name); - if(result is not null) request.Headers.Add("operationResult", result.ToString()); - if(eventSource is not null) request.Headers.Add("eventSource", eventSource); + if (result is not null) request.Headers.Add("operationResult", result.ToString()); + if (eventSource is not null) request.Headers.Add("eventSource", eventSource); HttpClient _httpClient = new(CoreTools.GenericHttpClientParameters); _httpClient.DefaultRequestHeaders.UserAgent.ParseAdd(CoreData.UserAgentString); diff --git a/src/UniGetUI.PAckageEngine.Interfaces/IManagerLogger.cs b/src/UniGetUI.PAckageEngine.Interfaces/IManagerLogger.cs index 09ec058aa9..1dc9f903bf 100644 --- a/src/UniGetUI.PAckageEngine.Interfaces/IManagerLogger.cs +++ b/src/UniGetUI.PAckageEngine.Interfaces/IManagerLogger.cs @@ -2,6 +2,7 @@ using UniGetUI.PackageEngine.Enums; namespace UniGetUI.PackageEngine.ManagerClasses.Classes; + public interface IManagerLogger { public IReadOnlyList Operations { get; } diff --git a/src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs b/src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs index 75bdc7df31..90fb8ebd7a 100644 --- a/src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs +++ b/src/UniGetUI.PackageEngine.Enums/OverridenInstallationOptions.cs @@ -1,4 +1,5 @@ namespace UniGetUI.PackageEngine.Structs; + public struct OverridenInstallationOptions { public string? Scope; diff --git a/src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs b/src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs index bc5db70d04..272cfa99fb 100644 --- a/src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs +++ b/src/UniGetUI.PackageEngine.Managers.Cargo/Cargo.cs @@ -5,14 +5,14 @@ using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; -using UniGetUI.PackageEngine.Classes.Manager; using UniGetUI.Interface.Enums; +using UniGetUI.PackageEngine.Classes.Manager; using UniGetUI.PackageEngine.Classes.Manager.Classes; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; +using UniGetUI.PackageEngine.ManagerClasses.Classes; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.ManagerClasses.Classes; namespace UniGetUI.PackageEngine.Managers.CargoManager; @@ -160,7 +160,7 @@ protected override void _loadManagerVersion(out string version) private IReadOnlyList GetPackages(LoggableTaskType taskType) { List Packages = []; - foreach(var match in TaskRecycler>.RunOrAttach(GetInstalledCommandOutput, 15)) + foreach (var match in TaskRecycler>.RunOrAttach(GetInstalledCommandOutput, 15)) { var id = match.Groups[1]?.Value?.Trim() ?? ""; var name = CoreTools.FormatAsName(id); diff --git a/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgDetailsHelper.cs index bb249cdf4e..9370daa39d 100644 --- a/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgDetailsHelper.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageEngine.ManagerClasses.Classes; namespace UniGetUI.PackageEngine.Managers.CargoManager; + internal sealed class CargoPkgDetailsHelper(Cargo manager) : BasePkgDetailsHelper(manager) { protected override void GetDetails_UnSafe(IPackageDetails details) @@ -34,7 +35,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details) details.HomepageUrl = new Uri(homepage); } - var keywords = manifest.crate.keywords is null ? [] : (string[]) manifest.crate.keywords.Clone(); + var keywords = manifest.crate.keywords is null ? [] : (string[])manifest.crate.keywords.Clone(); var categories = manifest.categories?.Select(c => c.category); details.Tags = [.. keywords, .. categories]; diff --git a/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgOperationHelper.cs index be055da6cd..6acd3eb304 100644 --- a/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Cargo/Helpers/CargoPkgOperationHelper.cs @@ -23,10 +23,10 @@ protected override IReadOnlyList _getOperationParameters(IPackage packag { parameters.Add("--no-confirm"); - if(options.SkipHashCheck) + if (options.SkipHashCheck) parameters.Add("--skip-signatures"); - if(options.CustomInstallLocation != "") + if (options.CustomInstallLocation != "") parameters.AddRange(["--install-path", options.CustomInstallLocation]); } diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs index ea3ee8ae7f..7f8a65b919 100644 --- a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs +++ b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Chocolatey.cs @@ -322,7 +322,7 @@ protected override void _performExtraLoadingSteps() { // If the user is running bundled chocolatey and chocolatey is not in path, add chocolatey to path if (!Settings.Get(Settings.K.UseSystemChocolatey) && !File.Exists("C:\\ProgramData\\Chocolatey\\bin\\choco.exe")) - /* && Settings.Get(Settings.K.ShownWelcomeWizard)) */ + /* && Settings.Get(Settings.K.ShownWelcomeWizard)) */ { string? path = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User); if (!path?.Contains(Status.ExecutablePath.Replace("\\choco.exe", "\\bin")) ?? false) diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyDetailsHelper.cs index a90ec78369..6be40452de 100644 --- a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyDetailsHelper.cs @@ -29,7 +29,7 @@ protected override IReadOnlyList GetInstallableVersions_UnSafe(IPackage } }; - IProcessTaskLogger logger = Manager.TaskLogger.CreateNew(LoggableTaskType.LoadPackageVersions, p); + IProcessTaskLogger logger = Manager.TaskLogger.CreateNew(LoggableTaskType.LoadPackageVersions, p); p.Start(); diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs index 86b962f272..a5c7eede38 100644 --- a/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Chocolatey/Helpers/ChocolateyPkgOperationHelper.cs @@ -5,6 +5,7 @@ using Architecture = UniGetUI.PackageEngine.Enums.Architecture; namespace UniGetUI.PackageEngine.Managers.ChocolateyManager; + internal sealed class ChocolateyPkgOperationHelper : BasePkgOperationHelper { public ChocolateyPkgOperationHelper(Chocolatey manager) : base(manager) { } diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/Helpers/DotNetPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/Helpers/DotNetPkgOperationHelper.cs index 944e03f0b5..b5a8256b9c 100644 --- a/src/UniGetUI.PackageEngine.Managers.Dotnet/Helpers/DotNetPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Dotnet/Helpers/DotNetPkgOperationHelper.cs @@ -5,6 +5,7 @@ using Architecture = UniGetUI.PackageEngine.Enums.Architecture; namespace UniGetUI.PackageEngine.Managers.DotNetManager; + internal sealed class DotNetPkgOperationHelper : BasePkgOperationHelper { public DotNetPkgOperationHelper(DotNet manager) : base(manager) { } diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs index 547bbd0646..1106565ce3 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs @@ -55,12 +55,12 @@ protected sealed override IReadOnlyList FindPackages_UnSafe(string quer } else { - sources = [ Properties.DefaultSource ]; + sources = [Properties.DefaultSource]; } bool canPrerelease = InstallOptionsFactory.LoadForManager(this).PreRelease; - foreach(IManagerSource source in sources) + foreach (IManagerSource source in sources) { try { diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsHelper.cs index 6a9faf4a71..c18a2548fa 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsHelper.cs @@ -113,15 +113,17 @@ protected override void GetDetails_UnSafe(IPackageDetails details) { foreach (var dep in match.Groups[1].ToString().Split('|')) { - if(string.IsNullOrEmpty(dep)) + if (string.IsNullOrEmpty(dep)) continue; else if (dep.StartsWith("::")) details.Dependencies.Add(new() { Name = dep.TrimStart(':'), Version = "", Mandatory = true }); else details.Dependencies.Add(new() - { - Name = dep.Split(':')[0], Version = dep.Split(':')[1].TrimEnd(':'), Mandatory = true - }); + { + Name = dep.Split(':')[0], + Version = dep.Split(':')[1].TrimEnd(':'), + Mandatory = true + }); } } diff --git a/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgDetailsHelper.cs index f21adf92e9..26d0b1488f 100644 --- a/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgDetailsHelper.cs @@ -65,7 +65,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details) HashSet addedDeps = new(); foreach (var rawDep in (contents?["dependencies"]?.AsObject() ?? [])) { - if(addedDeps.Contains(rawDep.Key)) continue; + if (addedDeps.Contains(rawDep.Key)) continue; addedDeps.Add(rawDep.Key); details.Dependencies.Add(new() @@ -78,7 +78,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details) foreach (var rawDep in (contents?["devDependencies"]?.AsObject() ?? [])) { - if(addedDeps.Contains(rawDep.Key)) continue; + if (addedDeps.Contains(rawDep.Key)) continue; addedDeps.Add(rawDep.Key); details.Dependencies.Add(new() @@ -91,7 +91,7 @@ protected override void GetDetails_UnSafe(IPackageDetails details) foreach (var rawDep in (contents?["peerDependencies"]?.AsObject() ?? [])) { - if(addedDeps.Contains(rawDep.Key)) continue; + if (addedDeps.Contains(rawDep.Key)) continue; addedDeps.Add(rawDep.Key); details.Dependencies.Add(new() @@ -159,7 +159,7 @@ protected override IReadOnlyList GetInstallableVersions_UnSafe(IPackage JsonArray? rawVersions = JsonNode.Parse(strContents) as JsonArray; List versions = []; - foreach(JsonNode? raw_ver in rawVersions ?? []) + foreach (JsonNode? raw_ver in rawVersions ?? []) { if (raw_ver is not null) versions.Add(raw_ver.ToString()); diff --git a/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgOperationHelper.cs index dbe1d18a29..06033917a6 100644 --- a/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Npm/Helpers/NpmPkgOperationHelper.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Managers.NpmManager; + internal sealed class NpmPkgOperationHelper : BasePkgOperationHelper { public NpmPkgOperationHelper(Npm manager) : base(manager) { } @@ -11,8 +12,9 @@ public NpmPkgOperationHelper(Npm manager) : base(manager) { } protected override IReadOnlyList _getOperationParameters(IPackage package, InstallOptions options, OperationType operation) { - List parameters = operation switch { - OperationType.Install => [Manager.Properties.InstallVerb, $"'{package.Id}@{(options.Version == string.Empty? package.VersionString: options.Version)}'"], + List parameters = operation switch + { + OperationType.Install => [Manager.Properties.InstallVerb, $"'{package.Id}@{(options.Version == string.Empty ? package.VersionString : options.Version)}'"], OperationType.Update => [Manager.Properties.UpdateVerb, $"'{package.Id}@{package.NewVersionString}'"], OperationType.Uninstall => [Manager.Properties.UninstallVerb, package.Id], _ => throw new InvalidDataException("Invalid package operation") diff --git a/src/UniGetUI.PackageEngine.Managers.Pip/Helpers/PipPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Pip/Helpers/PipPkgOperationHelper.cs index 5513e52fac..550078be8e 100644 --- a/src/UniGetUI.PackageEngine.Managers.Pip/Helpers/PipPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Pip/Helpers/PipPkgOperationHelper.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Managers.PipManager; + internal sealed class PipPkgOperationHelper : BasePkgOperationHelper { public PipPkgOperationHelper(Pip manager) : base(manager) { } diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell/Helpers/PowerShellPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell/Helpers/PowerShellPkgOperationHelper.cs index 73c5e0feb7..815134cdf5 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell/Helpers/PowerShellPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell/Helpers/PowerShellPkgOperationHelper.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Managers.PowerShellManager; + internal sealed class PowerShellPkgOperationHelper : BasePkgOperationHelper { public PowerShellPkgOperationHelper(PowerShell manager) : base(manager) { } diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs index f6d910280f..259cfb6512 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs @@ -120,7 +120,7 @@ protected override IReadOnlyList _getInstalledPackages_UnSafe() public override List FindCandidateExecutableFiles() { var candidates = CoreTools.WhichMultiple("powershell.exe"); - if(candidates.Count is 0) candidates.Add(CoreData.PowerShell5); + if (candidates.Count is 0) candidates.Add(CoreData.PowerShell5); return candidates; } diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell7/Helpers/PowerShell7PkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell7/Helpers/PowerShell7PkgOperationHelper.cs index 1f1b834ce8..72886b207a 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell7/Helpers/PowerShell7PkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell7/Helpers/PowerShell7PkgOperationHelper.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Managers.PowerShell7Manager; + internal sealed class PowerShell7PkgOperationHelper : BasePkgOperationHelper { public PowerShell7PkgOperationHelper(PowerShell7 manager) : base(manager) { } @@ -21,7 +22,7 @@ protected override IReadOnlyList _getOperationParameters(IPackage packag if (operation is OperationType.Install) { - if(options.Version != "") + if (options.Version != "") parameters.AddRange(["-Version", options.Version]); } else if (operation is OperationType.Update) diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell7/PowerShell7.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell7/PowerShell7.cs index 868c633141..2b8727bb52 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell7/PowerShell7.cs +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell7/PowerShell7.cs @@ -111,7 +111,7 @@ protected override IReadOnlyList _getInstalledPackages_UnSafe() Packages.Add(new Package(CoreTools.FormatAsName(elements[0]), elements[0], elements[1], SourcesHelper.Factory.GetSourceOrDefault(elements[2]), this, - new(env == "CurrentUser"? PackageScope.User : PackageScope.Machine))); + new(env == "CurrentUser" ? PackageScope.User : PackageScope.Machine))); } } diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgDetailsHelper.cs index 1c60dc8736..d40c6a3f29 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgDetailsHelper.cs @@ -171,17 +171,17 @@ private static void _getSuggests(IPackageDetails details, JsonObject? contents) { List innerDeps = []; - if(rawDep.Value is JsonValue value) innerDeps.Add(value.GetValue()); + if (rawDep.Value is JsonValue value) innerDeps.Add(value.GetValue()); else { foreach (var iDep in rawDep.Value?.AsArray() ?? []) { string? val = iDep?.GetValue(); - if(val is not null) innerDeps.Add(val); + if (val is not null) innerDeps.Add(val); } } - foreach(var val in innerDeps) + foreach (var val in innerDeps) details.Dependencies.Add(new() { Name = val, @@ -197,17 +197,17 @@ private static void _getDepends(IPackageDetails details, JsonObject? contents) List innerDeps = []; - if(node is JsonValue value) innerDeps.Add(value.GetValue()); + if (node is JsonValue value) innerDeps.Add(value.GetValue()); else { foreach (var iDep in node?.AsArray() ?? []) { string? val = iDep?.GetValue(); - if(val is not null) innerDeps.Add(val); + if (val is not null) innerDeps.Add(val); } } - foreach(var val in innerDeps) + foreach (var val in innerDeps) details.Dependencies.Add(new() { Name = val, diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgOperationHelper.cs index 64dbd9c2ce..257122bb47 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/Helpers/ScoopPkgOperationHelper.cs @@ -5,6 +5,7 @@ using Architecture = UniGetUI.PackageEngine.Enums.Architecture; namespace UniGetUI.PackageEngine.Managers.ScoopManager; + internal sealed class ScoopPkgOperationHelper : BasePkgOperationHelper { public ScoopPkgOperationHelper(Scoop manager) : base(manager) { } @@ -51,7 +52,7 @@ protected override IReadOnlyList _getOperationParameters(IPackage packag parameters.Add("--skip-hash-check"); } - if(operation is OperationType.Install) + if (operation is OperationType.Install) { parameters.AddRange(options.Architecture switch { diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs index 64102a201b..7f0eedabf1 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs @@ -408,7 +408,7 @@ protected override void _loadManagerVersion(out string version) protected override void _performExtraLoadingSteps() { - if(Settings.Get(Settings.K.EnableScoopCleanup)) + if (Settings.Get(Settings.K.EnableScoopCleanup)) { RunCleanup(); } diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgDetailsHelper.cs index e11e9d6618..e7e78f50c6 100644 --- a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgDetailsHelper.cs @@ -14,7 +14,7 @@ internal sealed class VcpkgPkgDetailsHelper : BasePkgDetailsHelper { public VcpkgPkgDetailsHelper(Vcpkg manager) : base(manager) { } - protected override void GetDetails_UnSafe(IPackageDetails details) + protected override void GetDetails_UnSafe(IPackageDetails details) { INativeTaskLogger logger = Manager.TaskLogger.CreateNew(LoggableTaskType.LoadPackageDetails); diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgOperationHelper.cs index 8c68363d50..782c6c5f6e 100644 --- a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgPkgOperationHelper.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Managers.VcpkgManager; + internal sealed class VcpkgPkgOperationHelper : BasePkgOperationHelper { public VcpkgPkgOperationHelper(Vcpkg manager) : base(manager) { } @@ -11,7 +12,8 @@ public VcpkgPkgOperationHelper(Vcpkg manager) : base(manager) { } protected override IReadOnlyList _getOperationParameters(IPackage package, InstallOptions options, OperationType operation) { - List parameters = operation switch { + List parameters = operation switch + { OperationType.Install => [Manager.Properties.InstallVerb, package.Id], OperationType.Update => [Manager.Properties.UpdateVerb, package.Id, "--no-dry-run"], OperationType.Uninstall => [Manager.Properties.UninstallVerb, package.Id], diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgSourceHelper.cs b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgSourceHelper.cs index 3b27bd21e1..1938de5ba4 100644 --- a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgSourceHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Helpers/VcpkgSourceHelper.cs @@ -25,9 +25,10 @@ protected override IReadOnlyList GetSources_UnSafe() { List Sources = []; - foreach (string Triplet in Vcpkg.GetSystemTriplets()) { - Sources.Add(new ManagerSource(Manager, Triplet, Vcpkg.URI_VCPKG_IO)); - } + foreach (string Triplet in Vcpkg.GetSystemTriplets()) + { + Sources.Add(new ManagerSource(Manager, Triplet, Vcpkg.URI_VCPKG_IO)); + } return Sources; } diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Vcpkg.cs b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Vcpkg.cs index 93131fab84..06c2a61a04 100644 --- a/src/UniGetUI.PackageEngine.Managers.Vcpkg/Vcpkg.cs +++ b/src/UniGetUI.PackageEngine.Managers.Vcpkg/Vcpkg.cs @@ -306,7 +306,7 @@ protected override void _loadManagerExecutableFile(out bool found, out string pa var (rootFound, _) = GetVcpkgRoot(); - if(!rootFound) Logger.Error("Vcpkg root was not found. Please define the %VCPKG_ROOT% environment variable or define it from UniGetUI Settings"); + if (!rootFound) Logger.Error("Vcpkg root was not found. Please define the %VCPKG_ROOT% environment variable or define it from UniGetUI Settings"); found = exeFound && rootFound; path = exePath; diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/BundledWinGetHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/BundledWinGetHelper.cs index a00cdd10de..c67429d8de 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/BundledWinGetHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/BundledWinGetHelper.cs @@ -492,7 +492,7 @@ public void GetPackageDetails_UnSafe(IPackageDetails details) details.Dependencies.Add(new() { Name = line.Split(' ')[0], - Version = line.Contains('[') ? line.Split('[')[1].TrimEnd(']'): "", + Version = line.Contains('[') ? line.Split('[')[1].TrimEnd(']') : "", Mandatory = true }); } diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/NativeWinGetHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/NativeWinGetHelper.cs index af91312158..85fad4b8ad 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/NativeWinGetHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/NativeWinGetHelper.cs @@ -437,7 +437,7 @@ public void GetPackageDetails_UnSafe(IPackageDetails details) details.Dependencies.Add(new() { Name = line.Split(' ')[0], - Version = line.Contains('[') ? line.Split('[')[1].TrimEnd(']'): "", + Version = line.Contains('[') ? line.Split('[')[1].TrimEnd(']') : "", Mandatory = true }); } diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/WinGetIconsHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/WinGetIconsHelper.cs index 8523ac33c0..c9f9cba51b 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/WinGetIconsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/ClientHelpers/WinGetIconsHelper.cs @@ -9,6 +9,7 @@ using UniGetUI.PackageEngine.Managers.WingetManager; namespace UniGetUI.PackageEngine.Managers.WinGet.ClientHelpers; + internal static class WinGetIconsHelper { private static readonly Dictionary __msstore_package_manifests = []; diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgDetailsHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgDetailsHelper.cs index 71ee33ab9d..22b39c2e52 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgDetailsHelper.cs @@ -25,11 +25,11 @@ protected override void GetDetails_UnSafe(IPackageDetails details) { if (package.Source is LocalWinGetSource localSource) { - if(localSource.Type is LocalWinGetSource.Type_t.MicrosftStore) + if (localSource.Type is LocalWinGetSource.Type_t.MicrosftStore) return WinGetIconsHelper.GetAppxPackageIcon(package); else if (localSource.Type is LocalWinGetSource.Type_t.LocalPC) - return WinGetIconsHelper.GetARPPackageIcon(package); + return WinGetIconsHelper.GetARPPackageIcon(package); return null; } diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs index a58dbb903e..980944cd1c 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs @@ -11,6 +11,7 @@ using InstallOptions = UniGetUI.PackageEngine.Serializable.InstallOptions; namespace UniGetUI.PackageEngine.Managers.WingetManager; + internal sealed class WinGetPkgOperationHelper : BasePkgOperationHelper { public static string GetIdNamePiece(IPackage package) @@ -41,7 +42,8 @@ protected override IReadOnlyList _getOperationParameters(IPackage packag parameters.AddRange(["--accept-source-agreements", "--disable-interactivity"]); // package.OverridenInstallationOptions.Scope is meaningless in WinGet packages. Default is unspecified, hence the _ => []. - parameters.AddRange((package.OverridenOptions.Scope ?? options.InstallationScope) switch { + parameters.AddRange((package.OverridenOptions.Scope ?? options.InstallationScope) switch + { PackageScope.User => ["--scope", "user"], PackageScope.Machine => ["--scope", "machine"], _ => [] @@ -70,7 +72,7 @@ protected override IReadOnlyList _getOperationParameters(IPackage packag } parameters.Add("--include-unknown"); - if(Settings.Get(Settings.K.WinGetForceLocationOnUpdate) && options.CustomInstallLocation != "") + if (Settings.Get(Settings.K.WinGetForceLocationOnUpdate) && options.CustomInstallLocation != "") parameters.AddRange(["--location", $"\"{options.CustomInstallLocation}\""]); } else if (operation is OperationType.Install) @@ -117,7 +119,7 @@ protected override IReadOnlyList _getOperationParameters(IPackage packag package.OverridenOptions.RunAsAdministrator = false; } - else if(installOptions?.Scope is PackageInstallerScope.System/* or PackageInstallerScope.Unknown*/) + else if (installOptions?.Scope is PackageInstallerScope.System/* or PackageInstallerScope.Unknown*/) { Logger.Info($"WinGet package {package.Id} is installed on a system-wide scope, forcing administrator rights..."); package.OverridenOptions.RunAsAdministrator = true; diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs index 3d58e96962..daa2ce97cb 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs @@ -1,8 +1,8 @@ using System.Diagnostics; +using System.Runtime.InteropServices; using System.Security.AccessControl; using System.Security.Principal; using System.Text; -using System.Runtime.InteropServices; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; @@ -265,7 +265,7 @@ protected override void _loadManagerVersion(out string version) version = $"{(IS_BUNDLED ? "Bundled" : "System")} WinGet (CLI) Version: {process.StandardOutput.ReadToEnd().Trim()}"; - if(IS_BUNDLED) version += "\nUsing bundled WinGet helper (CLI parsing)"; + if (IS_BUNDLED) version += "\nUsing bundled WinGet helper (CLI parsing)"; else version += "\nUsing Native WinGet helper (COM Api)"; string error = process.StandardError.ReadToEnd(); diff --git a/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs b/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs index 45366c932e..2b3c105680 100644 --- a/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs +++ b/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs @@ -74,13 +74,13 @@ public void Cancel() break; case OperationStatus.Running: Status = OperationStatus.Canceled; - while(OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; CancelRequested?.Invoke(this, EventArgs.Empty); Status = OperationStatus.Canceled; break; case OperationStatus.InQueue: Status = OperationStatus.Canceled; - while(OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; Status = OperationStatus.Canceled; break; case OperationStatus.Succeeded: @@ -149,7 +149,7 @@ public async Task MainThread() // END QUEUE HANDLER var result = await _runOperation(); - while (OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; if (result == OperationVeredict.Success) { @@ -215,7 +215,7 @@ private async Task _runOperation() // Process preoperations int i = 0, count = PreOperations.Count; - if(count > 0) Line("", LineType.VerboseDetails); + if (count > 0) Line("", LineType.VerboseDetails); foreach (var preReq in PreOperations) { i++; @@ -299,7 +299,7 @@ private async Task _runOperation() public void SkipQueue() { if (Status != OperationStatus.InQueue) return; - while(OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; SKIP_QUEUE = true; } @@ -309,7 +309,7 @@ public void RunNext() if (!OperationQueue.Contains(this)) return; FORCE_HOLD_QUEUE = true; - while(OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; OperationQueue.Insert(Math.Min(MAX_OPERATIONS, OperationQueue.Count), this); FORCE_HOLD_QUEUE = false; } @@ -320,7 +320,7 @@ public void BackOfTheQueue() if (!OperationQueue.Contains(this)) return; FORCE_HOLD_QUEUE = true; - while(OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; OperationQueue.Add(this); FORCE_HOLD_QUEUE = false; } @@ -344,6 +344,6 @@ public void Retry(string retryMode) public abstract Task GetOperationIcon(); public void Dispose() { - while(OperationQueue.Remove(this)); + while (OperationQueue.Remove(this)) ; } } diff --git a/src/UniGetUI.PackageEngine.Operations/AbstractOperation_Auxiliaries.cs b/src/UniGetUI.PackageEngine.Operations/AbstractOperation_Auxiliaries.cs index b41d60a12b..e23642587f 100644 --- a/src/UniGetUI.PackageEngine.Operations/AbstractOperation_Auxiliaries.cs +++ b/src/UniGetUI.PackageEngine.Operations/AbstractOperation_Auxiliaries.cs @@ -55,7 +55,7 @@ public class OperationMetadata public OperationMetadata() { - Identifier = new Random().NextInt64(1000000, 9999999).ToString(); + Identifier = new Random().NextInt64(1000000, 9999999).ToString(); } } diff --git a/src/UniGetUI.PackageEngine.Operations/AbstractProcessOperation.cs b/src/UniGetUI.PackageEngine.Operations/AbstractProcessOperation.cs index 13ed763699..f52fe3db1a 100644 --- a/src/UniGetUI.PackageEngine.Operations/AbstractProcessOperation.cs +++ b/src/UniGetUI.PackageEngine.Operations/AbstractProcessOperation.cs @@ -104,7 +104,7 @@ protected override async Task PerformOperation() try { process.BeginErrorReadLine(); } catch (Exception ex) { Logger.Error(ex); } - StringBuilder currentLine= new(); + StringBuilder currentLine = new(); char[] buffer = new char[1]; string? lastStringBeforeLF = null; diff --git a/src/UniGetUI.PackageEngine.Operations/DownloadOperation.cs b/src/UniGetUI.PackageEngine.Operations/DownloadOperation.cs index 26c2e5c1dc..4f6144b69a 100644 --- a/src/UniGetUI.PackageEngine.Operations/DownloadOperation.cs +++ b/src/UniGetUI.PackageEngine.Operations/DownloadOperation.cs @@ -4,6 +4,7 @@ using UniGetUI.PackageOperations; namespace UniGetUI.PackageEngine.Operations; + public class DownloadOperation : AbstractOperation { private readonly IPackage _package; @@ -14,7 +15,7 @@ public string DownloadLocation } private bool canceled; - public DownloadOperation(IPackage package, string downloadPath): base(true, null) + public DownloadOperation(IPackage package, string downloadPath) : base(true, null) { downloadLocation = downloadPath; _package = package; @@ -82,7 +83,7 @@ protected override async Task PerformOperation() using var contentStream = await response.Content.ReadAsStreamAsync(); using var fileStream = new FileStream(downloadLocation, FileMode.Create, FileAccess.Write, FileShare.None, 8192, true); - var buffer = new byte[4*1024*1024]; + var buffer = new byte[4 * 1024 * 1024]; long totalRead = 0; int bytesRead; diff --git a/src/UniGetUI.PackageEngine.Operations/KillProcessOperation.cs b/src/UniGetUI.PackageEngine.Operations/KillProcessOperation.cs index 6f9582f653..54678f6640 100644 --- a/src/UniGetUI.PackageEngine.Operations/KillProcessOperation.cs +++ b/src/UniGetUI.PackageEngine.Operations/KillProcessOperation.cs @@ -6,7 +6,7 @@ namespace UniGetUI.PackageOperations; -public class KillProcessOperation: AbstractOperation +public class KillProcessOperation : AbstractOperation { private string ProcessName; public KillProcessOperation(string procName) : base(false) @@ -33,13 +33,13 @@ protected override async Task PerformOperation() var procs = Process.GetProcessesByName(ProcessName.Replace(".exe", "")); foreach (var proc in procs) { - if(proc.HasExited) continue; + if (proc.HasExited) continue; Line($"Attempting to close process {ProcessName} with pid={proc.Id}...", LineType.VerboseDetails); proc.CloseMainWindow(); await Task.WhenAny(proc.WaitForExitAsync(), Task.Delay(1000)); if (!proc.HasExited) { - if(Settings.Get(Settings.K.KillProcessesThatRefuseToDie)) + if (Settings.Get(Settings.K.KillProcessesThatRefuseToDie)) { Line($"Timeout for process {ProcessName}, attempting to kill...", LineType.Information); proc.Kill(); diff --git a/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs b/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs index 2f0ec6af39..5a681c52b1 100644 --- a/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs +++ b/src/UniGetUI.PackageEngine.Operations/PackageOperations.cs @@ -135,7 +135,7 @@ public override Task GetOperationIcon() private static IReadOnlyList _getPreInstallOps(InstallOptions opts, OperationType role, IPackage package, AbstractOperation? preReq = null) { List l = new(); - if(preReq is not null) l.Add(new(preReq, true)); + if (preReq is not null) l.Add(new(preReq, true)); foreach (var process in opts.KillBeforeOperation) l.Add(new InnerOperation( @@ -231,7 +231,7 @@ protected override void Initialize() Metadata.Title = CoreTools.Translate("{package} Installation", new Dictionary { { "package", Package.Name } }); Metadata.Status = CoreTools.Translate("{0} is being installed", Package.Name); Metadata.SuccessTitle = CoreTools.Translate("Installation succeeded"); - Metadata.SuccessMessage = CoreTools.Translate("{package} was installed successfully", new Dictionary { { "package", Package.Name } }); + Metadata.SuccessMessage = CoreTools.Translate("{package} was installed successfully", new Dictionary { { "package", Package.Name } }); Metadata.FailureTitle = CoreTools.Translate("Installation failed", new Dictionary { { "package", Package.Name } }); Metadata.FailureMessage = CoreTools.Translate("{package} could not be installed", new Dictionary { { "package", Package.Name } }); @@ -289,7 +289,7 @@ protected override void Initialize() Metadata.Title = CoreTools.Translate("{package} Update", new Dictionary { { "package", Package.Name } }); Metadata.Status = CoreTools.Translate("{0} is being updated to version {1}", Package.Name, Package.NewVersionString); Metadata.SuccessTitle = CoreTools.Translate("Update succeeded"); - Metadata.SuccessMessage = CoreTools.Translate("{package} was updated successfully", new Dictionary { { "package", Package.Name } }); + Metadata.SuccessMessage = CoreTools.Translate("{package} was updated successfully", new Dictionary { { "package", Package.Name } }); Metadata.FailureTitle = CoreTools.Translate("Update failed", new Dictionary { { "package", Package.Name } }); Metadata.FailureMessage = CoreTools.Translate("{package} could not be updated", new Dictionary { { "package", Package.Name } }); @@ -336,7 +336,7 @@ protected override void Initialize() Metadata.Title = CoreTools.Translate("{package} Uninstall", new Dictionary { { "package", Package.Name } }); Metadata.Status = CoreTools.Translate("{0} is being uninstalled", Package.Name); Metadata.SuccessTitle = CoreTools.Translate("Uninstall succeeded"); - Metadata.SuccessMessage = CoreTools.Translate("{package} was uninstalled successfully", new Dictionary { { "package", Package.Name } }); + Metadata.SuccessMessage = CoreTools.Translate("{package} was uninstalled successfully", new Dictionary { { "package", Package.Name } }); Metadata.FailureTitle = CoreTools.Translate("Uninstall failed", new Dictionary { { "package", Package.Name } }); Metadata.FailureMessage = CoreTools.Translate("{package} could not be uninstalled", new Dictionary { { "package", Package.Name } }); } diff --git a/src/UniGetUI.PackageEngine.Operations/SourceOperations.cs b/src/UniGetUI.PackageEngine.Operations/SourceOperations.cs index a1a9cc4460..cb1f14886e 100644 --- a/src/UniGetUI.PackageEngine.Operations/SourceOperations.cs +++ b/src/UniGetUI.PackageEngine.Operations/SourceOperations.cs @@ -104,7 +104,7 @@ protected override void PrepareProcessStartInfo() process.StartInfo.Arguments = Source.Manager.Status.ExecutableCallArgs + " " + string.Join(" ", Source.Manager.SourcesHelper.GetAddSourceParameters(Source)); } - ApplyCapabilities(admin, false, false, null); + ApplyCapabilities(admin, false, false, null); } protected override Task GetProcessVeredict(int ReturnCode, List Output) @@ -118,7 +118,7 @@ protected override void Initialize() "with Manager=" + Source.Manager.Name; Metadata.Title = CoreTools.Translate("Adding source {source}", new Dictionary { { "source", Source.Name } }); - Metadata.Status = CoreTools.Translate("Adding source {source} to {manager}", new Dictionary { { "source", Source.Name }, { "manager", Source.Manager.Name } });; + Metadata.Status = CoreTools.Translate("Adding source {source} to {manager}", new Dictionary { { "source", Source.Name }, { "manager", Source.Manager.Name } }); ; Metadata.SuccessTitle = CoreTools.Translate("Source added successfully"); Metadata.SuccessMessage = CoreTools.Translate("The source {source} was added to {manager} successfully", new Dictionary { { "source", Source.Name }, { "manager", Source.Manager.Name } }); @@ -175,7 +175,7 @@ protected override void Initialize() Metadata.OperationInformation = "Starting remove source operation for source=" + Source.Name + "with Manager=" + Source.Manager.Name; Metadata.Title = CoreTools.Translate("Removing source {source}", new Dictionary { { "source", Source.Name } }); - Metadata.Status = CoreTools.Translate("Removing source {source} from {manager}", new Dictionary { { "source", Source.Name }, { "manager", Source.Manager.Name } });; + Metadata.Status = CoreTools.Translate("Removing source {source} from {manager}", new Dictionary { { "source", Source.Name }, { "manager", Source.Manager.Name } }); ; Metadata.SuccessTitle = CoreTools.Translate("Source removed successfully"); Metadata.SuccessMessage = CoreTools.Translate("The source {source} was removed from {manager} successfully", new Dictionary { { "source", Source.Name }, { "manager", Source.Manager.Name } }); diff --git a/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs b/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs index 5df649111b..ae1f9e2592 100644 --- a/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs +++ b/src/UniGetUI.PackageEngine.PackageEngine/PEInterface.cs @@ -9,8 +9,8 @@ using UniGetUI.PackageEngine.Managers.PowerShell7Manager; using UniGetUI.PackageEngine.Managers.PowerShellManager; using UniGetUI.PackageEngine.Managers.ScoopManager; -using UniGetUI.PackageEngine.Managers.WingetManager; using UniGetUI.PackageEngine.Managers.VcpkgManager; +using UniGetUI.PackageEngine.Managers.WingetManager; using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.PackageEngine.PackageLoader; @@ -75,7 +75,7 @@ public static void LoadManagers() public class PackageBundlesLoader_I : PackageBundlesLoader { - public PackageBundlesLoader_I(IReadOnlyList managers): base(managers) + public PackageBundlesLoader_I(IReadOnlyList managers) : base(managers) { } diff --git a/src/UniGetUI.PackageEngine.PackageLoader/DiscoverablePackagesLoader.cs b/src/UniGetUI.PackageEngine.PackageLoader/DiscoverablePackagesLoader.cs index 1622ad34e9..af344894c2 100644 --- a/src/UniGetUI.PackageEngine.PackageLoader/DiscoverablePackagesLoader.cs +++ b/src/UniGetUI.PackageEngine.PackageLoader/DiscoverablePackagesLoader.cs @@ -51,7 +51,7 @@ protected override IReadOnlyList LoadPackagesFromManager(IPackageManag return []; } - return manager.FindPackages(text); + return manager.FindPackages(text); } protected override Task WhenAddingPackage(IPackage package) diff --git a/src/UniGetUI.PackageEngine.PackageLoader/PackageBundlesLoader.cs b/src/UniGetUI.PackageEngine.PackageLoader/PackageBundlesLoader.cs index f1f1c84c20..1503dcbb5f 100644 --- a/src/UniGetUI.PackageEngine.PackageLoader/PackageBundlesLoader.cs +++ b/src/UniGetUI.PackageEngine.PackageLoader/PackageBundlesLoader.cs @@ -50,7 +50,7 @@ protected override Task WhenAddingPackage(IPackage package) public void RemoveRange(IReadOnlyList packages) { - foreach(IPackage package in packages) + foreach (IPackage package in packages) { if (!Contains(package)) continue; PackageReference.Remove(HashPackage(package), out IPackage? _); diff --git a/src/UniGetUI.PackageEngine.PackageLoader/UpgradablePackagesLoader.cs b/src/UniGetUI.PackageEngine.PackageLoader/UpgradablePackagesLoader.cs index d859886c5c..86129968d6 100644 --- a/src/UniGetUI.PackageEngine.PackageLoader/UpgradablePackagesLoader.cs +++ b/src/UniGetUI.PackageEngine.PackageLoader/UpgradablePackagesLoader.cs @@ -60,7 +60,7 @@ protected override Task WhenAddingPackage(IPackage package) { package.GetAvailablePackage()?.SetTag(PackageTag.IsUpgradable); - foreach(var p in package.GetInstalledPackages()) + foreach (var p in package.GetInstalledPackages()) p.SetTag(PackageTag.IsUpgradable); return Task.CompletedTask; diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/BasePkgDetailsHelper.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/BasePkgDetailsHelper.cs index 56bd585988..f913afe001 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/BasePkgDetailsHelper.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Helpers/BasePkgDetailsHelper.cs @@ -79,7 +79,8 @@ public IReadOnlyList GetVersions(IPackage package) if (iconUrl is not null) return new CacheableIcon(new Uri(iconUrl)); return null; - } catch (Exception e) + } + catch (Exception e) { Logger.Error($"Error when loading the package icon for the package {package.Id} on manager " + Manager.Name); Logger.Error(e); diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs index 328e704cb4..5f1e007b0b 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs @@ -162,11 +162,11 @@ public Tuple GetExecutableFile() if (candidates.Count == 0) { // No paths were found - return new (false, ""); + return new(false, ""); } // If custom package manager paths are DISABLED, get the first one (as old UniGetUI did) and return it. - if(!SecureSettings.Get(SecureSettings.K.AllowCustomManagerPaths)) + if (!SecureSettings.Get(SecureSettings.K.AllowCustomManagerPaths)) { return new(true, candidates[0]); } diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs index 81b93483d8..5cfe023721 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Classes/DesktopShortcutsDatabase.cs @@ -183,7 +183,7 @@ public static void HandleNewShortcuts(IReadOnlyList PreviousShortCutList { // If a shortcut has not been detected yet, and it // existed before an operation started, then do nothing. - if(PreviousShortcuts.Contains(shortcut)) + if (PreviousShortcuts.Contains(shortcut)) continue; if (DeleteUnknownShortcuts) diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs index 9f151da4d3..427ba11536 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs @@ -172,7 +172,7 @@ public virtual Uri GetIconUrl() { CacheableIcon? icon = TaskRecycler.RunOrAttach(Manager.DetailsHelper.GetIcon, this); string? path = IconCacheEngine.GetCacheOrDownloadIcon(icon, Manager.Name, CoreTools.MakeValidFileName(Id)); - return path is null? null: new Uri("file:///" + path); + return path is null ? null : new Uri("file:///" + path); } catch (Exception ex) { @@ -192,7 +192,7 @@ public virtual async Task AddToIgnoredUpdatesAsync(string version = "*") try { await Task.Run(() => IgnoredUpdatesDatabase.Add(_ignoredId, version)); - foreach(var p in GetInstalledPackages()) + foreach (var p in GetInstalledPackages()) p.SetTag(PackageTag.Pinned); } catch (Exception ex) @@ -207,7 +207,7 @@ public virtual async Task RemoveFromIgnoredUpdatesAsync() try { await Task.Run(() => IgnoredUpdatesDatabase.Remove(_ignoredId)); - foreach(var p in GetInstalledPackages()) + foreach (var p in GetInstalledPackages()) p.SetTag(PackageTag.Default); } catch (Exception ex) @@ -286,7 +286,7 @@ public virtual bool NewerVersionIsInstalled() return true; } } - + return false; } diff --git a/src/UniGetUI.PackageEngine.Serializable.Tests/TestDuplicateUpdateDetection.cs b/src/UniGetUI.PackageEngine.Serializable.Tests/TestDuplicateUpdateDetection.cs index 9733381654..6ace676c9f 100644 --- a/src/UniGetUI.PackageEngine.Serializable.Tests/TestDuplicateUpdateDetection.cs +++ b/src/UniGetUI.PackageEngine.Serializable.Tests/TestDuplicateUpdateDetection.cs @@ -185,7 +185,7 @@ public void SimulateDuplicateDetection_MultipleIdenticalPackages_ShouldHaveSameH Assert.Equal(hash1, hash2); Assert.Equal(hash2, hash3); Assert.Equal(hash1, hash3); - + // In the actual implementation, the second and third calls would find // an existing operation with matching hash and skip creating duplicates } diff --git a/src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializablePackage.cs b/src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializablePackage.cs index bd2ef2c968..105ac2bfc6 100644 --- a/src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializablePackage.cs +++ b/src/UniGetUI.PackageEngine.Serializable.Tests/TestSerializablePackage.cs @@ -92,7 +92,7 @@ public void FromJson(string JSON, string id, string name, string version, string Assert.Equal(source, o2.Source); Assert.Equal(version, o2.Version); TestInstallOptions.AssertAreEqual(new() { SkipHashCheck = skipHash }, o2.InstallationOptions); - TestSerializableUpdatesOptions.AreEqual(new(){IgnoredVersion = ignoredVer}, o2.Updates); + TestSerializableUpdatesOptions.AreEqual(new() { IgnoredVersion = ignoredVer }, o2.Updates); } internal static void AreEqual(SerializablePackage o1, SerializablePackage o2) diff --git a/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs b/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs index eff09655c1..f6702449c3 100644 --- a/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs +++ b/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs @@ -5,7 +5,7 @@ namespace UniGetUI.PackageEngine.Serializable { - public class InstallOptions: SerializableComponent + public class InstallOptions : SerializableComponent { private const string SKIP_HASH = "SkipHashCheck"; private const string INTERACTIVE = "InteractiveInstallation"; @@ -136,7 +136,7 @@ public override void LoadFromJson(JsonNode data) // Handle case where setting has not been migrated yet to have three different entries for CustomParameters if (this.CustomParameters_Install.Count is 0 && - this.CustomParameters_Update.Count is 0 && + this.CustomParameters_Update.Count is 0 && this.CustomParameters_Uninstall.Count is 0 && ((data as JsonObject)?.ContainsKey("CustomParameters") ?? false)) { diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableBundle.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableBundle.cs index c08a5ccd2d..d801642289 100644 --- a/src/UniGetUI.PackageEngine.Serializable/SerializableBundle.cs +++ b/src/UniGetUI.PackageEngine.Serializable/SerializableBundle.cs @@ -1,10 +1,10 @@ using System.Text.Json.Nodes; -using UniGetUI.PackageEngine.Serializable; using UniGetUI.Core.Data; +using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Classes.Serializable { - public class SerializableBundle: SerializableComponent + public class SerializableBundle : SerializableComponent { public const double ExpectedVersion = 3; public const string IncompatMessage = "Incompatible packages cannot be installed from UniGetUI, " + @@ -23,10 +23,10 @@ public override SerializableBundle Copy() var _packages = new List(); var _incompatPackages = new List(); - foreach(var package in this.packages) + foreach (var package in this.packages) _packages.Add(package.Copy()); - foreach(var incompatPackage in this.incompatible_packages) + foreach (var incompatPackage in this.incompatible_packages) _incompatPackages.Add(incompatPackage.Copy()); return new() diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableComponent.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableComponent.cs index e66cfe1781..831e17fcf7 100644 --- a/src/UniGetUI.PackageEngine.Serializable/SerializableComponent.cs +++ b/src/UniGetUI.PackageEngine.Serializable/SerializableComponent.cs @@ -4,7 +4,7 @@ namespace UniGetUI.PackageEngine.Serializable; -public abstract class SerializableComponent where T: class +public abstract class SerializableComponent where T : class { /// /// Creates a deep copy of the object diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableIncompatiblePackage.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableIncompatiblePackage.cs index bdd4f2adda..0588c67895 100644 --- a/src/UniGetUI.PackageEngine.Serializable/SerializableIncompatiblePackage.cs +++ b/src/UniGetUI.PackageEngine.Serializable/SerializableIncompatiblePackage.cs @@ -1,10 +1,10 @@ -using System.Text.Json.Nodes; +using System.Text.Json.Nodes; using UniGetUI.Core.Data; using UniGetUI.PackageEngine.Serializable; namespace UniGetUI.PackageEngine.Classes.Serializable { - public class SerializableIncompatiblePackage: SerializableComponent + public class SerializableIncompatiblePackage : SerializableComponent { public string Id { get; set; } = ""; public string Name { get; set; } = ""; @@ -15,7 +15,10 @@ public override SerializableIncompatiblePackage Copy() { return new() { - Id = this.Id, Name = this.Name, Version = this.Version, Source = this.Source, + Id = this.Id, + Name = this.Name, + Version = this.Version, + Source = this.Source, }; } @@ -41,7 +44,7 @@ public SerializableIncompatiblePackage(JsonNode data) : base(data) { } - public SerializableIncompatiblePackage(): base() + public SerializableIncompatiblePackage() : base() { } } diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializablePackage.cs b/src/UniGetUI.PackageEngine.Serializable/SerializablePackage.cs index 6a6bfd4d93..9b2b3ecd00 100644 --- a/src/UniGetUI.PackageEngine.Serializable/SerializablePackage.cs +++ b/src/UniGetUI.PackageEngine.Serializable/SerializablePackage.cs @@ -4,7 +4,7 @@ namespace UniGetUI.PackageEngine.Classes.Serializable { - public class SerializablePackage: SerializableComponent + public class SerializablePackage : SerializableComponent { public string Id { get; set; } = ""; public string Name { get; set; } = ""; diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableUpdatesOptions.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableUpdatesOptions.cs index 30171dd91f..ef8144727f 100644 --- a/src/UniGetUI.PackageEngine.Serializable/SerializableUpdatesOptions.cs +++ b/src/UniGetUI.PackageEngine.Serializable/SerializableUpdatesOptions.cs @@ -4,7 +4,7 @@ namespace UniGetUI.PackageEngine.Classes.Serializable { - public class SerializableUpdatesOptions: SerializableComponent + public class SerializableUpdatesOptions : SerializableComponent { public bool UpdatesIgnored { get; set; } public string IgnoredVersion { get; set; } = ""; @@ -23,8 +23,8 @@ public override void LoadFromJson(JsonNode data) public override JsonObject AsJsonNode() { JsonObject obj = new(); - if(UpdatesIgnored is not false) obj.Add(nameof(UpdatesIgnored), UpdatesIgnored); - if(IgnoredVersion.Any()) obj.Add(nameof(IgnoredVersion), IgnoredVersion); + if (UpdatesIgnored is not false) obj.Add(nameof(UpdatesIgnored), UpdatesIgnored); + if (IgnoredVersion.Any()) obj.Add(nameof(IgnoredVersion), IgnoredVersion); return obj; } diff --git a/src/UniGetUI/App.xaml.cs b/src/UniGetUI/App.xaml.cs index b317d2e21c..2d145ad34b 100644 --- a/src/UniGetUI/App.xaml.cs +++ b/src/UniGetUI/App.xaml.cs @@ -1,25 +1,25 @@ using System.Diagnostics; using System.Text.RegularExpressions; -using Windows.ApplicationModel.Activation; using CommunityToolkit.WinUI.Helpers; using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.Windows.AppLifecycle; +using Microsoft.Windows.AppNotifications; using UniGetUI.Core.Data; using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.SettingsEngine.SecureSettings; using UniGetUI.Core.Tools; using UniGetUI.Interface; +using UniGetUI.Interface.Telemetry; using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Classes.Manager.Classes; -using Microsoft.Windows.AppLifecycle; -using Microsoft.Windows.AppNotifications; -using UniGetUI.Core.SettingsEngine.SecureSettings; -using UniGetUI.Interface.Telemetry; using UniGetUI.PackageEngine.Interfaces; -using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs; using UniGetUI.Pages.DialogPages; +using Windows.ApplicationModel.Activation; +using LaunchActivatedEventArgs = Microsoft.UI.Xaml.LaunchActivatedEventArgs; namespace UniGetUI { @@ -165,7 +165,7 @@ private void RegisterErrorHandling() } catch (Exception ex) { - if(Debugger.IsAttached) Debugger.Break(); + if (Debugger.IsAttached) Debugger.Break(); Logger.Error(ex); } diff --git a/src/UniGetUI/AppOperationHelper.cs b/src/UniGetUI/AppOperationHelper.cs index 52a2bc7f8a..303fcd9b41 100644 --- a/src/UniGetUI/AppOperationHelper.cs +++ b/src/UniGetUI/AppOperationHelper.cs @@ -1,23 +1,23 @@ using System.Collections.Concurrent; using System.Collections.ObjectModel; -using Windows.Storage; -using Windows.Storage.Pickers; using Microsoft.UI.Xaml.Controls; using UniGetUI.Controls.OperationWidgets; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.Interface; +using UniGetUI.Interface.Enums; using UniGetUI.Interface.Telemetry; +using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.Managers.PowerShellManager; using UniGetUI.PackageEngine.Operations; using UniGetUI.PackageEngine.PackageClasses; +using UniGetUI.PackageEngine.PackageLoader; using UniGetUI.PackageOperations; using UniGetUI.Pages.DialogPages; -using UniGetUI.Interface.Enums; -using UniGetUI.PackageEngine; -using UniGetUI.PackageEngine.PackageLoader; +using Windows.Storage; +using Windows.Storage.Pickers; namespace UniGetUI; @@ -41,7 +41,7 @@ public static void Remove(OperationControl control) public static void Remove(AbstractOperation op) { - foreach(var control in _operationList.Where(x => x.Operation == op).ToArray()) + foreach (var control in _operationList.Where(x => x.Operation == op).ToArray()) { _operationList.Remove(control); } @@ -65,7 +65,9 @@ public static void Remove(AbstractOperation op) if (details.InstallerUrl is null) { DialogHelper.HideLoadingDialog(loadingId); - var dialog = new ContentDialog { Title = CoreTools.Translate("Download failed"), + var dialog = new ContentDialog + { + Title = CoreTools.Translate("Download failed"), Content = CoreTools.Translate("No applicable installer was found for the package {0}", package.Name), PrimaryButtonText = CoreTools.Translate("Ok"), DefaultButton = ContentDialogButton.Primary, diff --git a/src/UniGetUI/AutoUpdater.cs b/src/UniGetUI/AutoUpdater.cs index 7544256344..5ee53bc3e6 100644 --- a/src/UniGetUI/AutoUpdater.cs +++ b/src/UniGetUI/AutoUpdater.cs @@ -4,9 +4,9 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; using System.Text.Json; -using Microsoft.Win32; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.Win32; using Microsoft.Windows.AppNotifications; using Microsoft.Windows.AppNotifications.Builder; using UniGetUI.Core.Data; diff --git a/src/UniGetUI/CLIHandler.cs b/src/UniGetUI/CLIHandler.cs index b6999209ad..dffec1c60c 100644 --- a/src/UniGetUI/CLIHandler.cs +++ b/src/UniGetUI/CLIHandler.cs @@ -51,7 +51,7 @@ public static int ImportSettings() if (filePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater --import-settings was not found - if (filePos +1 >= args.Count) + if (filePos + 1 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The file parameter does not exist (import settings requires "--import-settings file") var file = args[filePos + 1].Trim('"').Trim('\''); @@ -78,7 +78,7 @@ public static int ExportSettings() if (filePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater --export-settings was not found - if (filePos +1 >= args.Count) + if (filePos + 1 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The file parameter does not exist (export settings requires "--export-settings file") var file = args[filePos + 1].Trim('"').Trim('\''); @@ -103,7 +103,7 @@ public static int EnableSetting() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater --export-settings was not found - if (basePos +1 >= args.Count) + if (basePos + 1 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The file parameter does not exist (export settings requires "--export-settings file") var setting = args[basePos + 1].Trim('"').Trim('\''); @@ -130,7 +130,7 @@ public static int DisableSetting() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater --export-settings was not found - if (basePos +1 >= args.Count) + if (basePos + 1 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The file parameter does not exist (export settings requires "--export-settings file") var setting = args[basePos + 1].Trim('"').Trim('\''); @@ -156,7 +156,7 @@ public static int SetSettingsValue() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater --export-settings was not found - if (basePos +2 >= args.Count) + if (basePos + 2 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The file parameter does not exist (export settings requires "--export-settings file") var setting = args[basePos + 1].Trim('"').Trim('\''); @@ -250,7 +250,7 @@ public static int EnableSecureSetting() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater was not found - if (basePos +1 >= args.Count) + if (basePos + 1 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The file parameter does not exist (export settings requires "--export-settings file") var setting = args[basePos + 1].Trim('"').Trim('\''); @@ -277,7 +277,7 @@ public static int DisableSecureSetting() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater was not found - if (basePos +1 >= args.Count) + if (basePos + 1 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The first positional argument does not exist var setting = args[basePos + 1].Trim('"').Trim('\''); @@ -304,7 +304,7 @@ public static int EnableSecureSettingForUser() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater was not found - if (basePos +2 >= args.Count) + if (basePos + 2 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The required parameters do not exist var user = args[basePos + 1].Trim('"').Trim('\''); @@ -328,7 +328,7 @@ public static int DisableSecureSettingForUser() if (basePos < 0) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The base paramater was not found - if (basePos +2 >= args.Count) + if (basePos + 2 >= args.Count) return (int)HRESULT.STATUS_INVALID_PARAMETER; // The required parameters do not exist var user = args[basePos + 1].Trim('"').Trim('\''); diff --git a/src/UniGetUI/Controls/CustomNavViewItem.cs b/src/UniGetUI/Controls/CustomNavViewItem.cs index 3788f57bcb..b30a3ccadd 100644 --- a/src/UniGetUI/Controls/CustomNavViewItem.cs +++ b/src/UniGetUI/Controls/CustomNavViewItem.cs @@ -6,6 +6,7 @@ using UniGetUI.Interface.Widgets; namespace UniGetUI.Controls; + internal partial class CustomNavViewItem : NavigationViewItem { int _iconSize = 28; @@ -88,7 +89,7 @@ public CustomNavViewItem() public async Task increaseMargins() { - for(int i = (int)base.Icon.Margin.Left; i < 6; i += 2) + for (int i = (int)base.Icon.Margin.Left; i < 6; i += 2) { base.Icon.Margin = new Thickness(i); await Task.Delay(15); diff --git a/src/UniGetUI/Controls/DialogCloseButton.xaml.cs b/src/UniGetUI/Controls/DialogCloseButton.xaml.cs index 68f3ce6ee1..30647aba6a 100644 --- a/src/UniGetUI/Controls/DialogCloseButton.xaml.cs +++ b/src/UniGetUI/Controls/DialogCloseButton.xaml.cs @@ -5,6 +5,7 @@ // and more about our project templates, see: http://aka.ms/winui-project-info. namespace UniGetUI.Interface.Widgets; + public sealed partial class DialogCloseButton : UserControl { public event EventHandler? Click; diff --git a/src/UniGetUI/Controls/MenuForPackage.cs b/src/UniGetUI/Controls/MenuForPackage.cs index 5be99bb2ba..6a8b8f977f 100644 --- a/src/UniGetUI/Controls/MenuForPackage.cs +++ b/src/UniGetUI/Controls/MenuForPackage.cs @@ -84,12 +84,12 @@ public void LoadText() // The invisible U+200E character here is used to prevent the text from being // trimmed in the TabViewItem header, adding a little bit of padding at the end. if (line1 != "") text += CoreTools.Translate(line1) + " ‎‎ "; - if (line2 != "") text += (text.Length> 0?"\n":"") + CoreTools.Translate(line2) + " ‎ "; + if (line2 != "") text += (text.Length > 0 ? "\n" : "") + CoreTools.Translate(line2) + " ‎ "; Header = text; } } - public partial class BetterFlyout: Flyout + public partial class BetterFlyout : Flyout { public BetterFlyout() : base() { diff --git a/src/UniGetUI/Controls/OperationWidgets/OperationBadge.cs b/src/UniGetUI/Controls/OperationWidgets/OperationBadge.cs index dc59452a17..0d514a405d 100644 --- a/src/UniGetUI/Controls/OperationWidgets/OperationBadge.cs +++ b/src/UniGetUI/Controls/OperationWidgets/OperationBadge.cs @@ -1,6 +1,7 @@ using UniGetUI.Interface.Enums; namespace UniGetUI.Controls.OperationWidgets; + public class OperationBadge { public string Tooltip; diff --git a/src/UniGetUI/Controls/OperationWidgets/OperationControl.cs b/src/UniGetUI/Controls/OperationWidgets/OperationControl.cs index 397393388b..50794e3af9 100644 --- a/src/UniGetUI/Controls/OperationWidgets/OperationControl.cs +++ b/src/UniGetUI/Controls/OperationWidgets/OperationControl.cs @@ -1,7 +1,10 @@ +using System.Collections.ObjectModel; using System.ComponentModel; +using System.Diagnostics; using System.Runtime.CompilerServices; -using Windows.UI; +using CommunityToolkit.WinUI; using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Microsoft.Windows.AppNotifications; using Microsoft.Windows.AppNotifications.Builder; @@ -9,23 +12,20 @@ using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; using UniGetUI.Interface.Enums; +using UniGetUI.Interface.Telemetry; +using UniGetUI.Interface.Widgets; +using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Classes.Packages.Classes; using UniGetUI.PackageEngine.Enums; -using UniGetUI.PackageOperations; -using UniGetUI.Pages.DialogPages; -using CommunityToolkit.WinUI; -using Microsoft.UI.Xaml.Controls; -using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine.Operations; -using System.Collections.ObjectModel; -using System.Diagnostics; -using UniGetUI.Interface.Telemetry; -using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.PackageLoader; +using UniGetUI.PackageOperations; +using UniGetUI.Pages.DialogPages; +using Windows.UI; namespace UniGetUI.Controls.OperationWidgets; -public partial class OperationControl: INotifyPropertyChanged +public partial class OperationControl : INotifyPropertyChanged { public AbstractOperation Operation; public BetterMenu OpMenu; @@ -88,7 +88,7 @@ public OperationControl(AbstractOperation operation) }; _title = Operation.Metadata.Title; - _liveLine = operation.GetOutput().Any()? operation.GetOutput()[operation.GetOutput().Count - 1].Item1 : CoreTools.Translate("Please wait..."); + _liveLine = operation.GetOutput().Any() ? operation.GetOutput()[operation.GetOutput().Count - 1].Item1 : CoreTools.Translate("Please wait..."); _buttonText = ""; OnOperationStatusChanged(this, operation.Status); _ = LoadIcon(); @@ -172,7 +172,7 @@ private async Task _onOperationFinished() } // Handle newly created shortcuts - if(Settings.Get(Settings.K.AskToDeleteNewDesktopShortcuts) + if (Settings.Get(Settings.K.AskToDeleteNewDesktopShortcuts) && !MainApp.Operations.AreThereRunningOperations() && DesktopShortcutsDatabase.GetUnknownShortcuts().Any()) { @@ -264,7 +264,7 @@ public void LoadMenu() var normalOptions = GetOperationOptions(); if (normalOptions.Count != 0) { - foreach(var item in normalOptions) + foreach (var item in normalOptions) { OpMenu.Items.Add(item); } @@ -274,15 +274,15 @@ public void LoadMenu() if (Operation.Status is OperationStatus.InQueue) { - var skipQueue = new BetterMenuItem { Text = CoreTools.Translate("Run now"), Icon = new FontIcon {Glyph = "\uE768"} }; + var skipQueue = new BetterMenuItem { Text = CoreTools.Translate("Run now"), Icon = new FontIcon { Glyph = "\uE768" } }; skipQueue.Click += (_, _) => Operation.SkipQueue(); OpMenu.Items.Add(skipQueue); - var putNext = new BetterMenuItem { Text = CoreTools.Translate("Run next"), Icon = new FontIcon {Glyph = "\uEB9D"} }; + var putNext = new BetterMenuItem { Text = CoreTools.Translate("Run next"), Icon = new FontIcon { Glyph = "\uEB9D" } }; putNext.Click += (_, _) => Operation.RunNext(); OpMenu.Items.Add(putNext); - var putLast = new BetterMenuItem { Text = CoreTools.Translate("Run last"), Icon = new FontIcon {Glyph = "\uEB9E"} }; + var putLast = new BetterMenuItem { Text = CoreTools.Translate("Run last"), Icon = new FontIcon { Glyph = "\uEB9E" } }; putLast.Click += (_, _) => Operation.BackOfTheQueue(); OpMenu.Items.Add(putLast); @@ -308,7 +308,7 @@ public void LoadMenu() { OpMenu.Items.Add(new MenuFlyoutSeparator()); - foreach(var item in extraRetry) + foreach (var item in extraRetry) { OpMenu.Items.Add(item); } @@ -332,7 +332,7 @@ public void Close() MainApp.Instance.MainWindow.UpdateSystemTrayStatus(); MainApp.Operations._operationList.Remove(this); - while(AbstractOperation.OperationQueue.Remove(Operation)); + while (AbstractOperation.OperationQueue.Remove(Operation)) ; } private string _buttonText; @@ -483,7 +483,8 @@ public List GetRetryOptions(Action callback) if (Operation is SourceOperation sourceOp && !sourceOp.ForceAsAdministrator) { - var adminButton = new BetterMenuItem { + var adminButton = new BetterMenuItem + { Text = CoreTools.Translate("Retry as administrator"), IconName = IconType.UAC, }; @@ -498,7 +499,8 @@ public List GetRetryOptions(Action callback) { if (!packageOp.Options.RunAsAdministrator && packageOp.Package.Manager.Capabilities.CanRunAsAdmin) { - var adminButton = new BetterMenuItem { + var adminButton = new BetterMenuItem + { Text = CoreTools.Translate("Retry as administrator"), IconName = IconType.UAC, }; @@ -513,7 +515,8 @@ public List GetRetryOptions(Action callback) if (!packageOp.Options.InteractiveInstallation && packageOp.Package.Manager.Capabilities.CanRunInteractively) { - var interactiveButton = new BetterMenuItem { + var interactiveButton = new BetterMenuItem + { Text = CoreTools.Translate("Retry interactively"), IconName = IconType.Interactive, }; @@ -528,7 +531,8 @@ public List GetRetryOptions(Action callback) if (!packageOp.Options.SkipHashCheck && packageOp.Package.Manager.Capabilities.CanSkipIntegrityChecks) { var skiphashButton = - new BetterMenuItem { + new BetterMenuItem + { Text = CoreTools.Translate("Retry skipping integrity checks"), IconName = IconType.Checksum, }; @@ -600,7 +604,8 @@ public List GetOperationOptions() var optionsMenu = new List(); if (Operation is PackageOperation packageOp) { - var details = new BetterMenuItem { + var details = new BetterMenuItem + { Text = CoreTools.Translate("Package details"), IconName = IconType.Info_Round, IsEnabled = !packageOp.Package.Source.IsVirtualManager @@ -624,7 +629,8 @@ public List GetOperationOptions() optionsMenu.Add(installationSettings); string? location = packageOp.Package.Manager.DetailsHelper.GetInstallLocation(packageOp.Package); - var openLocation = new BetterMenuItem { + var openLocation = new BetterMenuItem + { Text = CoreTools.Translate("Open install location"), IconName = IconType.OpenFolder, }; @@ -635,7 +641,8 @@ public List GetOperationOptions() else if (Operation is DownloadOperation downloadOp) { - var launchInstaller = new BetterMenuItem { + var launchInstaller = new BetterMenuItem + { Text = CoreTools.Translate("Open"), IconName = IconType.Launch, }; @@ -643,7 +650,8 @@ public List GetOperationOptions() launchInstaller.IsEnabled = downloadOp.Status is OperationStatus.Succeeded; optionsMenu.Add(launchInstaller); - var showFileInExplorer = new BetterMenuItem { + var showFileInExplorer = new BetterMenuItem + { Text = CoreTools.Translate("Show in explorer"), IconName = IconType.OpenFolder, }; diff --git a/src/UniGetUI/Controls/PackageItemContainer.cs b/src/UniGetUI/Controls/PackageItemContainer.cs index de8a78ce22..988d9a59b8 100644 --- a/src/UniGetUI/Controls/PackageItemContainer.cs +++ b/src/UniGetUI/Controls/PackageItemContainer.cs @@ -1,4 +1,4 @@ -using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls; using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.PackageClasses; diff --git a/src/UniGetUI/Controls/PackageWrapper.cs b/src/UniGetUI/Controls/PackageWrapper.cs index ca9edc465b..beb5185b68 100644 --- a/src/UniGetUI/Controls/PackageWrapper.cs +++ b/src/UniGetUI/Controls/PackageWrapper.cs @@ -78,7 +78,7 @@ public PackageWrapper(IPackage package, AbstractPackagesPage page) UpdatePackageIcon(); VersionComboString = package.IsUpgradable ? $"{package.VersionString} -> {package.NewVersionString}" : package.VersionString; - if(package.Name.ToLower() != package.Id.ToLower()) + if (package.Name.ToLower() != package.Id.ToLower()) ExtendedTooltip = $"{package.Name} ({package.Id} from {package.Source.AsString_DisplayName})"; else ExtendedTooltip = $"{package.Name} (from {package.Source.AsString_DisplayName})"; diff --git a/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs b/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs index 09846f75a3..3abc01373f 100644 --- a/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs +++ b/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs @@ -22,12 +22,13 @@ public sealed partial class CheckboxButtonCard : SettingsCard private Settings.K setting_name = Settings.K.Unset; public Settings.K SettingName { - set { + set + { setting_name = value; IS_INVERTED = Settings.ResolveKey(value).StartsWith("Disable"); _checkbox.IsOn = Settings.Get(setting_name) ^ IS_INVERTED ^ ForceInversion; _textblock.Opacity = _checkbox.IsOn ? 1 : 0.7; - Button.IsEnabled = (_checkbox.IsOn) || _buttonAlwaysOn ; + Button.IsEnabled = (_checkbox.IsOn) || _buttonAlwaysOn; } } @@ -56,7 +57,7 @@ public bool ButtonAlwaysOn set { _buttonAlwaysOn = value; - Button.IsEnabled = (_checkbox.IsOn) || _buttonAlwaysOn ; + Button.IsEnabled = (_checkbox.IsOn) || _buttonAlwaysOn; } } @@ -69,13 +70,13 @@ public CheckboxButtonCard() }; _checkbox = new ToggleSwitch() { - Margin = new Thickness(0, 0, 8, 0), + Margin = new Thickness(0, 0, 8, 0), OnContent = new TextBlock() { Text = CoreTools.Translate("Enabled") }, OffContent = new TextBlock() { Text = CoreTools.Translate("Disabled") }, }; _textblock = new TextBlock() { - Margin = new Thickness(2,0,0,0), + Margin = new Thickness(2, 0, 0, 0), VerticalAlignment = VerticalAlignment.Center, TextWrapping = TextWrapping.Wrap, Style = (Style)Application.Current.Resources["BaseTextBlockStyle"], diff --git a/src/UniGetUI/Controls/SettingsWidgets/CheckboxCard.cs b/src/UniGetUI/Controls/SettingsWidgets/CheckboxCard.cs index 51fd5a4ae8..6bcf51a88e 100644 --- a/src/UniGetUI/Controls/SettingsWidgets/CheckboxCard.cs +++ b/src/UniGetUI/Controls/SettingsWidgets/CheckboxCard.cs @@ -112,17 +112,20 @@ public partial class CheckboxCard_Dict : CheckboxCard private bool _disableStateChangedEvent = false; private string _keyName = ""; - public string KeyName { set + public string KeyName { - _keyName = value; - if (_dictName != Settings.K.Unset && _keyName.Any()) + set { - _disableStateChangedEvent = true; - _checkbox.IsOn = Settings.GetDictionaryItem(_dictName, _keyName) ^ IS_INVERTED ^ ForceInversion; - _textblock.Opacity = _checkbox.IsOn ? 1 : 0.7; - _disableStateChangedEvent = false; + _keyName = value; + if (_dictName != Settings.K.Unset && _keyName.Any()) + { + _disableStateChangedEvent = true; + _checkbox.IsOn = Settings.GetDictionaryItem(_dictName, _keyName) ^ IS_INVERTED ^ ForceInversion; + _textblock.Opacity = _checkbox.IsOn ? 1 : 0.7; + _disableStateChangedEvent = false; + } } - } } + } public Settings.K DictionaryName { diff --git a/src/UniGetUI/Controls/SettingsWidgets/SecureCheckboxCard.cs b/src/UniGetUI/Controls/SettingsWidgets/SecureCheckboxCard.cs index d8f66c42b3..fb292db516 100644 --- a/src/UniGetUI/Controls/SettingsWidgets/SecureCheckboxCard.cs +++ b/src/UniGetUI/Controls/SettingsWidgets/SecureCheckboxCard.cs @@ -74,7 +74,7 @@ public SecureCheckboxCard() OffContent = new TextBlock() { Text = CoreTools.Translate("Disabled") }, }; - _loading = new ProgressRing() { IsIndeterminate = true, Visibility = Visibility.Collapsed}; + _loading = new ProgressRing() { IsIndeterminate = true, Visibility = Visibility.Collapsed }; _textblock = new TextBlock() { VerticalAlignment = VerticalAlignment.Center, diff --git a/src/UniGetUI/Controls/SettingsWidgets/TextboxCard.cs b/src/UniGetUI/Controls/SettingsWidgets/TextboxCard.cs index bb6b4cce5b..340cf42143 100644 --- a/src/UniGetUI/Controls/SettingsWidgets/TextboxCard.cs +++ b/src/UniGetUI/Controls/SettingsWidgets/TextboxCard.cs @@ -17,7 +17,8 @@ public sealed partial class TextboxCard : SettingsCard private Settings.K setting_name = Settings.K.Unset; public Settings.K SettingName { - set { + set + { setting_name = value; _textbox.Text = Settings.GetValue(setting_name); _textbox.TextChanged += (_, _) => SaveValue(); diff --git a/src/UniGetUI/CrashHandler.cs b/src/UniGetUI/CrashHandler.cs index e7da71ac82..3f37fd594e 100644 --- a/src/UniGetUI/CrashHandler.cs +++ b/src/UniGetUI/CrashHandler.cs @@ -36,7 +36,7 @@ private static void _reportMissingFiles(out bool showDetailedReport) + "\nPress NO to close this prompt." + "\nPress CANCEL to get more details about the crash."; - var msgboxResult = MessageBox(IntPtr.Zero, errorMessage, title, MB_ICONSTOP | MB_YESNOCANCEL); + var msgboxResult = MessageBox(IntPtr.Zero, errorMessage, title, MB_ICONSTOP | MB_YESNOCANCEL); if (msgboxResult is IDYES) { Process.Start(installerPath, "/silent /NoDeployInstaller"); @@ -52,7 +52,7 @@ private static void _reportMissingFiles(out bool showDetailedReport) + "\n\nPress OK to close this prompt." + "\nPress CANCEL to get more details about the crash."; - var msgboxResult = MessageBox(IntPtr.Zero, errorMessage, title, MB_ICONSTOP | MB_OKCANCEL); + var msgboxResult = MessageBox(IntPtr.Zero, errorMessage, title, MB_ICONSTOP | MB_OKCANCEL); if (msgboxResult is IDOK) showDetailedReport = false; else showDetailedReport = true; // msgboxResult is IDCANCEL } @@ -106,7 +106,7 @@ string GetExceptionData(Exception e) } string r = b.ToString(); - return r.Any()? r: "No extra data was provided"; + return r.Any() ? r : "No extra data was provided"; } catch (Exception ex) { @@ -123,7 +123,7 @@ string GetExceptionData(Exception e) catch (Exception ex) { iReport = "Failed to compute integrity report: "; - iReport += ex.GetType() + ": " + ex.Message; + iReport += ex.GetType() + ": " + ex.Message; } @@ -175,12 +175,13 @@ Inner exception details (depth level: {{i}}) { Error_String += $"\n\n\nNo inner exceptions found"; } - } catch + } + catch { // ignore } - Console.WriteLine(Error_String); + Console.WriteLine(Error_String); string ErrorUrl = $"https://www.marticliment.com/error-report/" + $"?appName=UniGetUI" + diff --git a/src/UniGetUI/MainWindow.xaml.cs b/src/UniGetUI/MainWindow.xaml.cs index f57e016e9b..8b2aeba801 100644 --- a/src/UniGetUI/MainWindow.xaml.cs +++ b/src/UniGetUI/MainWindow.xaml.cs @@ -1,32 +1,32 @@ extern alias DrawingCommon; +using System.Diagnostics; using System.Runtime.InteropServices; using System.Text.RegularExpressions; using System.Web; using H.NotifyIcon; +using H.NotifyIcon.EfficiencyMode; using Microsoft.UI; using Microsoft.UI.Windowing; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; using Microsoft.Win32; +using Microsoft.Windows.AppNotifications; +using UniGetUI.Core.Classes; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Classes.Manager.Classes; using UniGetUI.PackageEngine.Interfaces; -using Windows.ApplicationModel.DataTransfer; -using H.NotifyIcon.EfficiencyMode; -using Microsoft.Windows.AppNotifications; -using UniGetUI.Core.Classes; -using UniGetUI.Interface.Enums; using UniGetUI.PackageEngine.PackageClasses; +using UniGetUI.PackageEngine.PackageLoader; using UniGetUI.Pages.DialogPages; -using WindowExtensions = H.NotifyIcon.WindowExtensions; -using System.Diagnostics; +using Windows.ApplicationModel.DataTransfer; using Windows.UI.Text.Core; -using UniGetUI.PackageEngine.PackageLoader; +using WindowExtensions = H.NotifyIcon.WindowExtensions; namespace UniGetUI.Interface { @@ -194,7 +194,7 @@ private void AddToSubtitle(string line) _currentSubtitle += line; _currentSubtitlePxLength = _currentSubtitle.Length * 4; Title = "UniGetUI - " + _currentSubtitle; - TitleBar.Subtitle = subtitleCollapsed is true? "": _currentSubtitle; + TitleBar.Subtitle = subtitleCollapsed is true ? "" : _currentSubtitle; } private void ClearSubtitle() @@ -534,7 +534,7 @@ private void LoadTrayMenu() UpdateSystemTrayStatus(); } - private string LastTrayIcon = ""; + private string LastTrayIcon = ""; public void UpdateSystemTrayStatus() { try @@ -648,7 +648,7 @@ public void SwitchToInterface() Activated += (_, e) => { - if(e.WindowActivationState is WindowActivationState.CodeActivated or WindowActivationState.PointerActivated) + if (e.WindowActivationState is WindowActivationState.CodeActivated or WindowActivationState.PointerActivated) MainContentFrame.Content = NavigationPage; }; @@ -874,7 +874,7 @@ private void TitleBar_PaneToggleRequested(TitleBar sender, object args) if (NavigationPage is null) return; - if(this.AppWindow.Size.Width >= 1600) + if (this.AppWindow.Size.Width >= 1600) { Settings.Set(Settings.K.CollapseNavMenuOnWideScreen, NavigationPage.NavView.IsPaneOpen); } @@ -892,7 +892,7 @@ private void TitleBar_PaneToggleRequested(TitleBar sender, object args) private const int MAX_SEARCHBOX_W = 400; private void TitleBar_SizeChanged(object sender, SizeChangedEventArgs e) { - if(TitleBar.ActualWidth <= DYNAMIC_SEARCHBOX_LIMIT) + if (TitleBar.ActualWidth <= DYNAMIC_SEARCHBOX_LIMIT) { GlobalSearchBox.Width = Math.Max(MIN_SEARCHBOX_W, MAX_SEARCHBOX_W - (DYNAMIC_SEARCHBOX_LIMIT - TitleBar.ActualWidth)); } diff --git a/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs b/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs index 373c9bf633..e1b644adbb 100644 --- a/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs +++ b/src/UniGetUI/Pages/DialogPages/DesktopShortcuts.xaml.cs @@ -4,10 +4,10 @@ using System.Runtime.CompilerServices; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using UniGetUI.PackageEngine.Classes.Packages.Classes; -using UniGetUI.Pages.DialogPages; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Classes.Packages.Classes; +using UniGetUI.Pages.DialogPages; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -112,7 +112,7 @@ public void SaveChanges() { foreach (var shortcut in Shortcuts) { - DesktopShortcutsDatabase.AddToDatabase(shortcut.Path, shortcut.IsDeletable? DesktopShortcutsDatabase.Status.Delete: DesktopShortcutsDatabase.Status.Maintain); + DesktopShortcutsDatabase.AddToDatabase(shortcut.Path, shortcut.IsDeletable ? DesktopShortcutsDatabase.Status.Delete : DesktopShortcutsDatabase.Status.Maintain); DesktopShortcutsDatabase.RemoveFromUnknownShortcuts(shortcut.Path); if (shortcut.IsDeletable && File.Exists(shortcut.Path)) @@ -139,7 +139,7 @@ public partial class ShortcutEntry : INotifyPropertyChanged public bool IsDeletable { - get => _deletable; + get => _deletable; set { _deletable = value; diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs index 80d0557e99..d50136c56e 100644 --- a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs +++ b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs @@ -1,5 +1,4 @@ using System.Diagnostics; -using Windows.UI; using Microsoft.UI; using Microsoft.UI.Text; using Microsoft.UI.Xaml; @@ -18,6 +17,7 @@ using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Classes.Packages.Classes; using UniGetUI.PackageEngine.PackageLoader; +using Windows.UI; namespace UniGetUI.Pages.DialogPages; @@ -199,7 +199,7 @@ public static async Task ManageIgnoredUpdates() await ShowDialogAsync(dialog); } - public static async Task ManageDesktopShortcuts(IReadOnlyList? NewShortucts = null) + public static async Task ManageDesktopShortcuts(IReadOnlyList? NewShortucts = null) { ContentDialog dialog = DialogFactory.Create_AsWindow(true); @@ -482,7 +482,7 @@ public static void ShowTelemetryBanner() Settings.Set(Settings.K.ShownTelemetryBanner, true); }; - StackPanel btns = new() { Margin = new Thickness(4,0,4,0), Spacing = 4, Orientation = Orientation.Horizontal }; + StackPanel btns = new() { Margin = new Thickness(4, 0, 4, 0), Spacing = 4, Orientation = Orientation.Horizontal }; btns.Children.Add(AcceptBtn); btns.Children.Add(SettingsBtn); @@ -540,8 +540,8 @@ public static async Task HowToAddPackagesToBundle() dialog.CloseButtonText = CoreTools.Translate("Close"); dialog.DefaultButton = ContentDialogButton.None; var result = await ShowDialogAsync(dialog); - if(result is ContentDialogResult.Primary) Window.NavigationPage.NavigateTo(PageType.Discover); - else if(result is ContentDialogResult.Secondary) Window.NavigationPage.NavigateTo(PageType.Installed); + if (result is ContentDialogResult.Primary) Window.NavigationPage.NavigateTo(PageType.Discover); + else if (result is ContentDialogResult.Secondary) Window.NavigationPage.NavigateTo(PageType.Installed); } public static void ShowDismissableBalloon(string title, string message) @@ -561,7 +561,7 @@ public static void ShowDismissableBalloon(string title, string message) dialog.IsPrimaryButtonEnabled = false; RadioButtons buttons = new RadioButtons(); - foreach(var name in availableBackups) buttons.Items.Add(name); + foreach (var name in availableBackups) buttons.Items.Add(name); buttons.SelectionChanged += (_, _) => dialog.IsPrimaryButtonEnabled = true; dialog.Content = new StackPanel() @@ -583,7 +583,7 @@ public static void ShowDismissableBalloon(string title, string message) } }; - if(await ShowDialogAsync(dialog) is ContentDialogResult.Primary) + if (await ShowDialogAsync(dialog) is ContentDialogResult.Primary) return buttons.SelectedItem.ToString() ?? null; return null; diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Infrastructure.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Infrastructure.cs index fe74af19c0..2cb06ffa5c 100644 --- a/src/UniGetUI/Pages/DialogPages/DialogHelper_Infrastructure.cs +++ b/src/UniGetUI/Pages/DialogPages/DialogHelper_Infrastructure.cs @@ -1,7 +1,5 @@ using System.Diagnostics; using System.Runtime.InteropServices; -using Windows.UI; -using Windows.UI.Text; using Microsoft.UI; using Microsoft.UI.Text; using Microsoft.UI.Windowing; @@ -20,6 +18,8 @@ using UniGetUI.Interface.Enums; using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Classes.Packages.Classes; +using Windows.UI; +using Windows.UI.Text; namespace UniGetUI.Pages.DialogPages; @@ -52,7 +52,7 @@ public static ContentDialog Create_AsWindow(bool hasTitle, bool hasButtons = fal else if (Window.NavigationPage.ActualWidth >= tresholdW + 200) maxW = 300; else maxW = Window.NavigationPage.ActualWidth - (tresholdW - 100); - if (Window.NavigationPage.ActualHeight < tresholdH) maxH = (hasTitle? 104: 64) + (hasButtons? 80: 0); + if (Window.NavigationPage.ActualHeight < tresholdH) maxH = (hasTitle ? 104 : 64) + (hasButtons ? 80 : 0); else if (Window.NavigationPage.ActualHeight >= tresholdH + 200) maxH = (hasTitle ? 320 : 280) + (hasButtons ? 80 : 0); else maxH = Window.NavigationPage.ActualHeight - (tresholdH - (hasTitle ? 120 : 80)) + (hasButtons ? 80 : 0); @@ -91,7 +91,7 @@ public interface IDataTransferManagerInterop IntPtr GetForWindow([In] IntPtr appWindow, [In] ref Guid riid); void ShowShareUIForWindow(IntPtr appWindow); } - public static readonly Guid _dtm_iid = new(0xa5caee9b,0x8708,0x49d1,0x8d,0x36,0x67,0xd2,0x5a,0x8d,0xa0,0x0c); + public static readonly Guid _dtm_iid = new(0xa5caee9b, 0x8708, 0x49d1, 0x8d, 0x36, 0x67, 0xd2, 0x5a, 0x8d, 0xa0, 0x0c); } private static readonly List _loadingDialogQueue = new(); diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Packages.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Packages.cs index 936af460b1..3021c377a4 100644 --- a/src/UniGetUI/Pages/DialogPages/DialogHelper_Packages.cs +++ b/src/UniGetUI/Pages/DialogPages/DialogHelper_Packages.cs @@ -1,6 +1,4 @@ using System.Web; -using Windows.ApplicationModel.DataTransfer; -using Windows.UI.Text; using ABI.Microsoft.UI.Text; using Microsoft.UI; using Microsoft.UI.Xaml; @@ -19,6 +17,8 @@ using UniGetUI.PackageEngine.PackageLoader; using UniGetUI.PackageEngine.Serializable; using UniGetUI.Pages.SettingsPages.GeneralPages; +using Windows.ApplicationModel.DataTransfer; +using Windows.UI.Text; namespace UniGetUI.Pages.DialogPages; @@ -224,7 +224,7 @@ public static async Task ShowBundleSecurityReport(Dictionary { + a.Click += (_, _) => + { dialog.Hide(); Window.NavigationPage.OpenSettingsPage(typeof(Administrator)); }; @@ -353,9 +354,9 @@ public static async Task AskLoseChangesAndCreateBundle() RichTextBlock rtb = new(); var p = new Paragraph(); rtb.Blocks.Add(p); - p.Inlines.Add(new Run {Text = CoreTools.Translate("Are you sure you want to create a new package bundle? ")}); + p.Inlines.Add(new Run { Text = CoreTools.Translate("Are you sure you want to create a new package bundle? ") }); p.Inlines.Add(new LineBreak()); - p.Inlines.Add(new Run {Text = CoreTools.Translate("Any unsaved changes will be lost"), FontWeight = new FontWeight(600)}); + p.Inlines.Add(new Run { Text = CoreTools.Translate("Any unsaved changes will be lost"), FontWeight = new FontWeight(600) }); ContentDialog dialog = DialogFactory.Create(); dialog.Title = CoreTools.Translate("Warning!"); diff --git a/src/UniGetUI/Pages/DialogPages/IgnoredUpdates.xaml.cs b/src/UniGetUI/Pages/DialogPages/IgnoredUpdates.xaml.cs index 65baf27936..674c0187f4 100644 --- a/src/UniGetUI/Pages/DialogPages/IgnoredUpdates.xaml.cs +++ b/src/UniGetUI/Pages/DialogPages/IgnoredUpdates.xaml.cs @@ -43,7 +43,7 @@ private void UpdateData() var rawIgnoredPackages = IgnoredUpdatesDatabase.GetDatabase(); - foreach (var(ignoredId, version) in rawIgnoredPackages) + foreach (var (ignoredId, version) in rawIgnoredPackages) { IPackageManager manager = PEInterface.WinGet; // Manager by default if (ManagerNameReference.ContainsKey(ignoredId.Split("\\")[0])) @@ -117,7 +117,7 @@ public IgnoredPackageEntry(string id, string version, IPackageManager manager, O } else if (CurrentVersion != "Unknown") { - NewVersion = CoreTools.Translate("Up to date") + $" ({CurrentVersion})";; + NewVersion = CoreTools.Translate("Up to date") + $" ({CurrentVersion})"; ; } else { diff --git a/src/UniGetUI/Pages/DialogPages/InstallOptions_Manager.xaml.cs b/src/UniGetUI/Pages/DialogPages/InstallOptions_Manager.xaml.cs index b662f1138e..eb6be9adc9 100644 --- a/src/UniGetUI/Pages/DialogPages/InstallOptions_Manager.xaml.cs +++ b/src/UniGetUI/Pages/DialogPages/InstallOptions_Manager.xaml.cs @@ -117,7 +117,7 @@ private async Task LoadOptions() } // Install location - if(Manager.Capabilities.SupportsCustomLocations) + if (Manager.Capabilities.SupportsCustomLocations) { SelectDir.IsEnabled = true; if (options.CustomInstallLocation.Any()) @@ -191,7 +191,7 @@ private async Task SaveOptions() // Location options.CustomInstallLocation = ""; - if(CustomInstallLocation.Text != DefaultLocationLabel && Manager.Capabilities.SupportsCustomLocations) + if (CustomInstallLocation.Text != DefaultLocationLabel && Manager.Capabilities.SupportsCustomLocations) { options.CustomInstallLocation = CustomInstallLocation.Text; } diff --git a/src/UniGetUI/Pages/DialogPages/InstallOptions_Package.xaml.cs b/src/UniGetUI/Pages/DialogPages/InstallOptions_Package.xaml.cs index 979c87ce2f..95545a607d 100644 --- a/src/UniGetUI/Pages/DialogPages/InstallOptions_Package.xaml.cs +++ b/src/UniGetUI/Pages/DialogPages/InstallOptions_Package.xaml.cs @@ -117,7 +117,7 @@ async Task LoadImage() VersionComboBox.SelectionChanged += (_, _) => { IgnoreUpdatesCheckbox.IsChecked = - !(new [] + !(new[] { CoreTools.Translate("Latest"), CoreTools.Translate("PreRelease"), @@ -165,7 +165,7 @@ async Task LoadImage() } } - foreach(var p in Options.KillBeforeOperation) + foreach (var p in Options.KillBeforeOperation) { ProcessesToKill.Add(new(p)); } @@ -201,12 +201,12 @@ private async Task _loadProcesses() _runningProcesses.Clear(); foreach (var name in processNames) { - if(name.Any()) _runningProcesses.Add(new(name + ".exe")); + if (name.Any()) _runningProcesses.Add(new(name + ".exe")); } } private void EnableDisableControls(OperationType operation) { - if(FollowGlobalOptionsSwitch.IsOn) + if (FollowGlobalOptionsSwitch.IsOn) { OptionsPanel0.Opacity = 0.3; SettingsSwitchPresenter.Opacity = 0.3; @@ -229,7 +229,7 @@ operation is not OperationType.Uninstall && Package.Manager.Capabilities.CanSkipIntegrityChecks; UninstallPreviousOnUpdate.IsEnabled = Package.Manager.Capabilities.CanUninstallPreviousVersionsAfterUpdate; - UninstallPreviousOnUpdate.Visibility = Package.Manager.Capabilities.CanUninstallPreviousVersionsAfterUpdate? Visibility.Visible: Visibility.Collapsed; + UninstallPreviousOnUpdate.Visibility = Package.Manager.Capabilities.CanUninstallPreviousVersionsAfterUpdate ? Visibility.Visible : Visibility.Collapsed; ArchitectureComboBox.IsEnabled = operation is not OperationType.Uninstall @@ -344,7 +344,7 @@ public async Task GetUpdatedOptions(bool updateDetachedOptions = options.AbortOnPreUninstallFail = AbortUniFailedCheck.IsChecked ?? true; options.KillBeforeOperation.Clear(); - foreach(var p in ProcessesToKill) options.KillBeforeOperation.Add(p.Name); + foreach (var p in ProcessesToKill) options.KillBeforeOperation.Add(p.Name); if (VersionComboBox.SelectedValue.ToString() != CoreTools.Translate("PreRelease") && VersionComboBox.SelectedValue.ToString() != CoreTools.Translate("Latest")) { @@ -423,7 +423,7 @@ private async Task GenerateCommand() private void LayoutGrid_SizeChanged(object sender, SizeChangedEventArgs e) { - if(LayoutGrid.ActualSize.Y > 1 && LayoutGrid.ActualSize.Y < double.PositiveInfinity) MaxHeight = LayoutGrid.ActualSize.Y; + if (LayoutGrid.ActualSize.Y > 1 && LayoutGrid.ActualSize.Y < double.PositiveInfinity) MaxHeight = LayoutGrid.ActualSize.Y; } private void UnlockSettingsButton_Click(object sender, RoutedEventArgs e) @@ -446,7 +446,7 @@ private void GoToSecureSettings_Click(object sender, RoutedEventArgs e) private void KillProcessesBox_TokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args) { args.Item = _runningProcesses.FirstOrDefault((item) => item.Name.Contains(args.TokenText)); - if(args.Item is null) + if (args.Item is null) { string text = args.TokenText; if (!text.EndsWith(".exe")) text += ".exe"; diff --git a/src/UniGetUI/Pages/DialogPages/PackageDetailsPage.xaml.cs b/src/UniGetUI/Pages/DialogPages/PackageDetailsPage.xaml.cs index 73267e0277..57c87dfcb2 100644 --- a/src/UniGetUI/Pages/DialogPages/PackageDetailsPage.xaml.cs +++ b/src/UniGetUI/Pages/DialogPages/PackageDetailsPage.xaml.cs @@ -1,21 +1,21 @@ using System.Collections.ObjectModel; -using Windows.UI; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Documents; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; -using Microsoft.UI.Xaml.Documents; -using Windows.UI.Text; +using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; +using UniGetUI.Interface.Telemetry; +using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.Interface.Enums; -using UniGetUI.Interface.Telemetry; -using UniGetUI.Interface.Widgets; -using UniGetUI.Core.Logging; using UniGetUI.Pages.DialogPages; +using Windows.UI; +using Windows.UI.Text; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -240,7 +240,8 @@ public void SetUpActionButtonAsUpdate() ExtendedActionsMenu.Items.Add(new MenuFlyoutSeparator()); var Uninstall = new BetterMenuItem { - Text = CoreTools.Translate("Uninstall"), IconName = IconType.Delete + Text = CoreTools.Translate("Uninstall"), + IconName = IconType.Delete }; Uninstall.Click += (_, _) => _ = DoAction(InstalledPackage, OperationType.Uninstall); ExtendedActionsMenu.Items.Add(Uninstall); @@ -300,7 +301,8 @@ public void SetUpActionButtonAsUninstall() ExtendedActionsMenu.Items.Add(new MenuFlyoutSeparator()); var Reinstall = new BetterMenuItem { - Text = CoreTools.Translate("Reinstall"), IconName = IconType.Download + Text = CoreTools.Translate("Reinstall"), + IconName = IconType.Download }; Reinstall.Click += (_, _) => _ = DoAction(Package, OperationType.Install); ExtendedActionsMenu.Items.Add(Reinstall); @@ -394,7 +396,7 @@ public async Task LoadInformation() DependenciesParagraph.Inlines.Add(new Run() { Text = $"  • {dep.Name}", - FontStyle = dep.Mandatory? FontStyle.Normal : FontStyle.Italic, + FontStyle = dep.Mandatory ? FontStyle.Normal : FontStyle.Italic, FontWeight = new FontWeight(600) }); @@ -405,12 +407,12 @@ public async Task LoadInformation() DependenciesParagraph.Inlines.Add(new Run() { Text = line, - FontStyle = dep.Mandatory? FontStyle.Normal : FontStyle.Italic, + FontStyle = dep.Mandatory ? FontStyle.Normal : FontStyle.Italic, }); DependenciesParagraph.Inlines.Add(new LineBreak()); } - if(DependenciesParagraph.Inlines.Any() && DependenciesParagraph.Inlines.Last() is LineBreak) - DependenciesParagraph.Inlines.RemoveAt(DependenciesParagraph.Inlines.Count-1); + if (DependenciesParagraph.Inlines.Any() && DependenciesParagraph.Inlines.Last() is LineBreak) + DependenciesParagraph.Inlines.RemoveAt(DependenciesParagraph.Inlines.Count - 1); } else { diff --git a/src/UniGetUI/Pages/HelpPage.xaml.cs b/src/UniGetUI/Pages/HelpPage.xaml.cs index dd05bfe1d7..13acc99c1c 100644 --- a/src/UniGetUI/Pages/HelpPage.xaml.cs +++ b/src/UniGetUI/Pages/HelpPage.xaml.cs @@ -76,7 +76,7 @@ private void BackButton_Click(object sender, RoutedEventArgs e) private void RightButton_Click(object sender, RoutedEventArgs e) { - if (Initialized && webView is not null && webView.CanGoForward) + if (Initialized && webView is not null && webView.CanGoForward) { webView.GoForward(); } diff --git a/src/UniGetUI/Pages/LogPages/OperationHistoryPage.cs b/src/UniGetUI/Pages/LogPages/OperationHistoryPage.cs index 7cb581e7f4..2f8c950481 100644 --- a/src/UniGetUI/Pages/LogPages/OperationHistoryPage.cs +++ b/src/UniGetUI/Pages/LogPages/OperationHistoryPage.cs @@ -1,4 +1,4 @@ -using Microsoft.UI.Xaml.Documents; +using Microsoft.UI.Xaml.Documents; using UniGetUI.Core.SettingsEngine; namespace UniGetUI.Interface.Pages.LogPage diff --git a/src/UniGetUI/Pages/LogPages/UniGetUILogPage.cs b/src/UniGetUI/Pages/LogPages/UniGetUILogPage.cs index 7135094bc9..3ee148d294 100644 --- a/src/UniGetUI/Pages/LogPages/UniGetUILogPage.cs +++ b/src/UniGetUI/Pages/LogPages/UniGetUILogPage.cs @@ -81,7 +81,8 @@ public override void LoadLog(bool isReload = false) { p.Inlines.Add(new Run { Text = new string(' ', date_length) + line + "\n", Foreground = color }); } - } ((Run)p.Inlines[^1]).Text = ((Run)p.Inlines[^1]).Text.TrimEnd(); + } + ((Run)p.Inlines[^1]).Text = ((Run)p.Inlines[^1]).Text.TrimEnd(); LogTextBox.Blocks.Add(p); } if (isReload) MainScroller.ScrollToVerticalOffset(MainScroller.ScrollableHeight); diff --git a/src/UniGetUI/Pages/MainView.xaml.cs b/src/UniGetUI/Pages/MainView.xaml.cs index 4543af9fab..8c7c70d768 100644 --- a/src/UniGetUI/Pages/MainView.xaml.cs +++ b/src/UniGetUI/Pages/MainView.xaml.cs @@ -1,8 +1,8 @@ -using Windows.System; using Microsoft.UI.Input; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; +using UniGetUI.Controls; using UniGetUI.Core.Data; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; @@ -10,16 +10,16 @@ using UniGetUI.Interface.Pages; using UniGetUI.Interface.Pages.LogPage; using UniGetUI.Interface.SoftwarePages; -using Windows.UI.Core; -using UniGetUI.PackageEngine.Interfaces; -using UniGetUI.Pages.DialogPages; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.PackageOperations; -using UniGetUI.Pages.SettingsPages; -using UniGetUI.Controls; using UniGetUI.PackageEngine; +using UniGetUI.PackageEngine.Enums; +using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.PackageLoader; +using UniGetUI.PackageOperations; +using UniGetUI.Pages.DialogPages; using UniGetUI.Pages.PageInterfaces; +using UniGetUI.Pages.SettingsPages; +using Windows.System; +using Windows.UI.Core; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -114,7 +114,7 @@ public MainView(AutoSuggestBox mainTextBlock) /* * Connect different loaders and UI Sections to bundles page */ - foreach(var pair in new Dictionary + foreach (var pair in new Dictionary { { DiscoverNavBtn, DiscoverablePackagesLoader.Instance }, { UpdatesNavBtn, UpgradablePackagesLoader.Instance }, @@ -149,7 +149,7 @@ public MainView(AutoSuggestBox mainTextBlock) if (CoreTools.IsAdministrator() && !Settings.Get(Settings.K.AlreadyWarnedAboutAdmin)) { Settings.Set(Settings.K.AlreadyWarnedAboutAdmin, true); - _= DialogHelper.WarnAboutAdminRights(); + _ = DialogHelper.WarnAboutAdminRights(); } UpdateOperationsLayout(); @@ -282,7 +282,7 @@ public void NavigateTo(PageType NewPage_t, bool toHistory = true) CurrentPage_t = NewPage_t; (oldPage as IEnterLeaveListener)?.OnLeave(); - if(oldPage is ISearchBoxPage oldSPage) + if (oldPage is ISearchBoxPage oldSPage) { MainTextBlock.TextChanged -= oldSPage.SearchBox_TextChanged; MainTextBlock.QuerySubmitted -= oldSPage.SearchBox_QuerySubmitted; @@ -324,7 +324,7 @@ public void NavigateBack() else { NavigateTo(NavigationHistory.Last(), toHistory: false); - NavigationHistory.RemoveAt(NavigationHistory.Count-1); + NavigationHistory.RemoveAt(NavigationHistory.Count - 1); CanGoBackChanged?.Invoke( this, NavigationHistory.Any() || ((ContentFrame.Content as IInnerNavigationPage)?.CanGoBack() ?? false)); @@ -482,7 +482,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi if (_lastNavItemSelectionWasAuto) return; - if(args.SelectedItem is CustomNavViewItem item && item.Tag is not PageType.Null) + if (args.SelectedItem is CustomNavViewItem item && item.Tag is not PageType.Null) { NavigateTo(item.Tag); } diff --git a/src/UniGetUI/Pages/PageInterfaces/IKeyboardShortcutListener.cs b/src/UniGetUI/Pages/PageInterfaces/IKeyboardShortcutListener.cs index d01a80480a..85eb3606fc 100644 --- a/src/UniGetUI/Pages/PageInterfaces/IKeyboardShortcutListener.cs +++ b/src/UniGetUI/Pages/PageInterfaces/IKeyboardShortcutListener.cs @@ -1,4 +1,4 @@ -namespace UniGetUI.Interface.Pages +namespace UniGetUI.Interface.Pages { /// /// Any object that can perform any of the following listed actions should diff --git a/src/UniGetUI/Pages/PageInterfaces/ISearchBoxPage.cs b/src/UniGetUI/Pages/PageInterfaces/ISearchBoxPage.cs index 95b9d4dcac..fb7bc9426c 100644 --- a/src/UniGetUI/Pages/PageInterfaces/ISearchBoxPage.cs +++ b/src/UniGetUI/Pages/PageInterfaces/ISearchBoxPage.cs @@ -3,6 +3,7 @@ using Microsoft.UI.Xaml.Input; namespace UniGetUI.Pages.PageInterfaces; + internal interface ISearchBoxPage { public string QueryBackup { get; set; } diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs index b7e9957aeb..d1d69d6de8 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Administrator.xaml.cs @@ -26,7 +26,7 @@ public Administrator() CoreTools.Translate("The following settings may pose a security risk, hence they are disabled by default.") + " " + CoreTools.Translate("Enable the settings below if and only if you fully understand what they do, and the implications they may have.") + "\n\n" + CoreTools.Translate("The settings will list, in their descriptions, the potential security issues they may have.") + " "; - + AllowCustomManagerPaths.StateChanged += (_, _) => RestartRequired?.Invoke(this, EventArgs.Empty); // The following settings may pose a security risk, hence they are disabled by default. Enable them ONLY if you undertsand what you are doing. Some of those settings will show a UAC prompt before being enabled." diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs index f4d5cc1e50..063058c6e6 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/General.xaml.cs @@ -1,10 +1,10 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using UniGetUI.Core.Tools; -using UniGetUI.Pages.DialogPages; -using UniGetUI.Core.Logging; using UniGetUI.Core.Language; +using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; +using UniGetUI.Pages.DialogPages; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs index f89a5a1550..27243ccc05 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Interface_P.xaml.cs @@ -1,10 +1,10 @@ +using System.Diagnostics; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Navigation; -using UniGetUI.Core.Tools; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; -using System.Diagnostics; +using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Internet.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Internet.xaml.cs index 0f1cbadf36..c9155b62f6 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Internet.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Internet.xaml.cs @@ -58,12 +58,12 @@ public Internet() { CornerRadius = new CornerRadius(4), Padding = new Thickness(2), - Background = level is ProxySupport.No? ERROR_BG: (level is ProxySupport.Partially? WARN_BG: SUCCESS_BG), + Background = level is ProxySupport.No ? ERROR_BG : (level is ProxySupport.Partially ? WARN_BG : SUCCESS_BG), BorderBrush = BORDER_FG, BorderThickness = new Thickness(1), Child = new TextBlock() { - Text = (level is ProxySupport.No ? no : (level is ProxySupport.Partially ? part: yes)), + Text = (level is ProxySupport.No ? no : (level is ProxySupport.Partially ? part : yes)), TextAlignment = TextAlignment.Center, Foreground = TEXT_FG } diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs index 45ca0d5765..9b4d659618 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Notifications.xaml.cs @@ -1,8 +1,8 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Navigation; -using UniGetUI.Core.Tools; using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs index b43233f97f..fd36e54ee4 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Operations.xaml.cs @@ -1,8 +1,8 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using UniGetUI.Core.Tools; -using UniGetUI.Pages.DialogPages; using UniGetUI.PackageOperations; +using UniGetUI.Pages.DialogPages; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Updates.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Updates.xaml.cs index 4ef08b97eb..3dae8fc0cf 100644 --- a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Updates.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Updates.xaml.cs @@ -1,6 +1,6 @@ +using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using UniGetUI.Core.Tools; -using Microsoft.UI.Xaml; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs b/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs index 0fa7a5e54d..d42547da1d 100644 --- a/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/ManagersPages/ManagersHomepage.xaml.cs @@ -1,15 +1,15 @@ -using Windows.UI.Text; +using CommunityToolkit.WinUI; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Navigation; +using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; using UniGetUI.Interface.Widgets; -using UniGetUI.Pages.SettingsPages.GeneralPages; using UniGetUI.PackageEngine; -using UniGetUI.Core.SettingsEngine; using UniGetUI.Pages.DialogPages; -using CommunityToolkit.WinUI; +using UniGetUI.Pages.SettingsPages.GeneralPages; +using Windows.UI.Text; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -36,7 +36,7 @@ public ManagersHomepage() this.InitializeComponent(); bool first = true; - foreach(var manager in PEInterface.Managers) + foreach (var manager in PEInterface.Managers) { var button = new SettingsPageButton() { @@ -46,7 +46,7 @@ public ManagersHomepage() Padding = new Thickness(16, 2, 16, 2) }; button.CornerRadius = first ? new CornerRadius(8, 8, 0, 0) : new CornerRadius(0); - button.BorderThickness = first ? new Thickness(1) : new Thickness(1,0,1,1); + button.BorderThickness = first ? new Thickness(1) : new Thickness(1, 0, 1, 1); button.Click += (_, _) => NavigationRequested?.Invoke(this, manager.GetType()); var statusIcon = new FontIcon() { FontSize = 12, VerticalAlignment = VerticalAlignment.Center }; @@ -106,7 +106,8 @@ void loadStatusBadge() var status = new StackPanel() { Orientation = Orientation.Horizontal, - Spacing = 4, HorizontalAlignment = HorizontalAlignment.Center, + Spacing = 4, + HorizontalAlignment = HorizontalAlignment.Center, Children = { statusIcon, statusText } }; statusBorder.Child = status; @@ -128,7 +129,7 @@ void loadStatusBadge() protected override void OnNavigatedTo(NavigationEventArgs e) { _isLoadingToggles = true; - for(int i = 0; i < managerControls.Count; i++) + for (int i = 0; i < managerControls.Count; i++) { var toggle = (ToggleSwitch)((StackPanel)managerControls[i].Content).Children.First(); toggle.IsOn = !Settings.GetDictionaryItem(Settings.K.DisabledManagers, PEInterface.Managers[i].Name); diff --git a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs index 310eb6901d..f3a5586d8d 100644 --- a/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/ManagersPages/PackageManager.xaml.cs @@ -1,28 +1,28 @@ +using System.Diagnostics; +using CommunityToolkit.WinUI.Controls; +using ExternalLibraries.Clipboard; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Navigation; +using UniGetUI.Core.Data; +using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.SettingsEngine.SecureSettings; using UniGetUI.Core.Tools; -using UniGetUI.PackageEngine.Interfaces; -using System.Diagnostics; -using UniGetUI.PackageEngine.Managers.WingetManager; +using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine; +using UniGetUI.PackageEngine.Interfaces; +using UniGetUI.PackageEngine.Managers.CargoManager; using UniGetUI.PackageEngine.Managers.ChocolateyManager; -using UniGetUI.PackageEngine.Managers.ScoopManager; +using UniGetUI.PackageEngine.Managers.DotNetManager; using UniGetUI.PackageEngine.Managers.NpmManager; using UniGetUI.PackageEngine.Managers.PipManager; -using UniGetUI.PackageEngine.Managers.PowerShellManager; using UniGetUI.PackageEngine.Managers.PowerShell7Manager; -using UniGetUI.PackageEngine.Managers.CargoManager; +using UniGetUI.PackageEngine.Managers.PowerShellManager; +using UniGetUI.PackageEngine.Managers.ScoopManager; using UniGetUI.PackageEngine.Managers.VcpkgManager; -using UniGetUI.PackageEngine.Managers.DotNetManager; -using ExternalLibraries.Clipboard; -using CommunityToolkit.WinUI.Controls; -using UniGetUI.Interface.Widgets; -using UniGetUI.Core.Data; -using UniGetUI.Pages.DialogPages; -using UniGetUI.Core.SettingsEngine; -using UniGetUI.Core.SettingsEngine.SecureSettings; +using UniGetUI.PackageEngine.Managers.WingetManager; using UniGetUI.PackageEngine.PackageLoader; +using UniGetUI.Pages.DialogPages; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -112,7 +112,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) { Margin = new(4, 24, 4, 8), FontWeight = new Windows.UI.Text.FontWeight(600), - Text=CoreTools.Translate("Advanced options") + Text = CoreTools.Translate("Advanced options") }); } @@ -195,7 +195,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) else if (Manager is Scoop) { - DisableNotifsCard.CornerRadius = new CornerRadius(8,8,0,0); + DisableNotifsCard.CornerRadius = new CornerRadius(8, 8, 0, 0); DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(DisableNotifsCard); @@ -257,7 +257,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) else if (Manager is Chocolatey) { - DisableNotifsCard.CornerRadius = new CornerRadius(8,8,0,0); + DisableNotifsCard.CornerRadius = new CornerRadius(8, 8, 0, 0); DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(DisableNotifsCard); @@ -275,7 +275,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e) else if (Manager is Vcpkg) { - DisableNotifsCard.CornerRadius = new CornerRadius(8,8,0,0); + DisableNotifsCard.CornerRadius = new CornerRadius(8, 8, 0, 0); DisableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0); ExtraControls.Children.Add(DisableNotifsCard); @@ -386,7 +386,7 @@ void ApplyManagerState(bool ShowVersion = false) // Load executable selection ExecutableComboBox.SelectionChanged -= ExecutableComboBox_SelectionChanged; ExecutableComboBox.Items.Clear(); - foreach(var path in Manager.FindCandidateExecutableFiles()) + foreach (var path in Manager.FindCandidateExecutableFiles()) { ExecutableComboBox.Items.Add(path); } @@ -394,7 +394,7 @@ void ApplyManagerState(bool ShowVersion = false) if (string.IsNullOrEmpty(selectedValue)) { var exe = Manager.GetExecutableFile(); - selectedValue = exe.Item1? exe.Item2: ""; + selectedValue = exe.Item1 ? exe.Item2 : ""; } ExecutableComboBox.SelectedValue = selectedValue; diff --git a/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs b/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs index c1361c6af5..b25463e9df 100644 --- a/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs +++ b/src/UniGetUI/Pages/SettingsPages/SettingsBasePage.xaml.cs @@ -1,12 +1,12 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media.Animation; using Microsoft.UI.Xaml.Navigation; using UniGetUI.Core.Tools; -using Microsoft.UI.Xaml.Media.Animation; -using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.Pages.SettingsPages.GeneralPages; using UniGetUI.Interface.Pages; using UniGetUI.PackageEngine.Interfaces; +using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.Pages.SettingsPages.GeneralPages; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -27,7 +27,7 @@ public SettingsBasePage(bool isManagers) { if (MainNavigationFrame.Content is ManagersHomepage or SettingsHomepage) MainApp.Instance.MainWindow.GoBack(); else if (MainNavigationFrame.CanGoBack) MainNavigationFrame.GoBack(); - else MainNavigationFrame.Navigate(isManagers? typeof(ManagersHomepage): typeof(SettingsHomepage), null, new DrillInNavigationTransitionInfo()); + else MainNavigationFrame.Navigate(isManagers ? typeof(ManagersHomepage) : typeof(SettingsHomepage), null, new DrillInNavigationTransitionInfo()); }; MainNavigationFrame.Navigated += MainNavigationFrame_Navigated; MainNavigationFrame.Navigating += MainNavigationFrame_Navigating; @@ -80,17 +80,17 @@ private void Page_RestartRequired(object? sender, EventArgs e) private void Page_NavigationRequested(object? sender, Type e) { - if(e == typeof(ManagersHomepage)) + if (e == typeof(ManagersHomepage)) { MainApp.Instance.MainWindow.NavigationPage.NavigateTo(Interface.PageType.Managers); } - if(e.IsSubclassOf(typeof(PackageManager))) + if (e.IsSubclassOf(typeof(PackageManager))) { - MainNavigationFrame.Navigate(typeof(PackageManagerPage), e, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight} ); + MainNavigationFrame.Navigate(typeof(PackageManagerPage), e, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight }); } else { - MainNavigationFrame.Navigate(e, null, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight} ); + MainNavigationFrame.Navigate(e, null, new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight }); } } diff --git a/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs b/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs index 490b6747d4..47525e1c52 100644 --- a/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs +++ b/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs @@ -2,30 +2,30 @@ using System.Collections.ObjectModel; using System.Diagnostics; using System.Globalization; +using CommunityToolkit.WinUI; +using Microsoft.UI; using Microsoft.UI.Input; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; +using UniGetUI.Interface.Pages; +using UniGetUI.Interface.Telemetry; using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.PackageEngine.PackageLoader; +using UniGetUI.Pages.DialogPages; +using UniGetUI.Pages.PageInterfaces; using Windows.System; +using Windows.UI; using Windows.UI.Core; -using CommunityToolkit.WinUI; -using UniGetUI.Interface.Pages; -using UniGetUI.Interface.Telemetry; -using UniGetUI.Pages.DialogPages; using DispatcherQueuePriority = Microsoft.UI.Dispatching.DispatcherQueuePriority; -using Microsoft.UI; -using Microsoft.UI.Xaml.Media; -using Windows.UI; -using Microsoft.UI.Xaml.Controls.Primitives; -using UniGetUI.Interface.Enums; -using UniGetUI.Pages.PageInterfaces; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -140,7 +140,7 @@ protected IPackage? SelectedItem { get { - if(CurrentPackageList.SelectedItem is PackageWrapper w) + if (CurrentPackageList.SelectedItem is PackageWrapper w) return w.Package; var fp = FilteredPackages.GetCheckedPackages(); @@ -432,7 +432,7 @@ private void Loader_PackagesChanged(object? sender, PackagesChangedEvent package else { // Reset internal package cache, and update from loader - foreach(var wrapper in WrappedPackages) wrapper.Dispose(); + foreach (var wrapper in WrappedPackages) wrapper.Dispose(); WrappedPackages.Clear(); ClearSourcesList(); foreach (var package in Loader.Packages) @@ -859,9 +859,9 @@ public void FilterPackages(bool forceQueryUpdate = false) foreach (var match in LastQueryResult) { - if (visibleSources.Contains(match.Package.Source) || - (!match.Package.Manager.Capabilities.SupportsCustomSources && - visibleManagers.Contains(match.Package.Manager))) + if (visibleSources.Contains(match.Package.Source) || + (!match.Package.Manager.Capabilities.SupportsCustomSources && + visibleManagers.Contains(match.Package.Manager))) { matchingList_selectedSources.Add(match); } @@ -962,7 +962,7 @@ string GetSubtitleText() /// The information with which to sort the packages public void SortPackagesBy(ObservablePackageCollection.Sorter sorter) { - if(sorter == FilteredPackages.CurrentSorter) FilteredPackages.Descending = !FilteredPackages.Descending; + if (sorter == FilteredPackages.CurrentSorter) FilteredPackages.Descending = !FilteredPackages.Descending; FilteredPackages.SetSorter(sorter); FilteredPackages.Sort(); UpdateSortingMenu(); @@ -1013,7 +1013,7 @@ protected void ShowDetailsForPackage(IPackage? package, TEL_InstallReferral refe if (package is null) return; - if(package.Source.IsVirtualManager || package is InvalidImportedPackage) + if (package.Source.IsVirtualManager || package is InvalidImportedPackage) { DialogHelper.ShowDismissableBalloon( CoreTools.Translate("Something went wrong"), @@ -1062,7 +1062,8 @@ protected async Task ShowInstallationOptionsForPackage(IPackage? package) private void SidepanelWidth_SizeChanged(object sender, SizeChangedEventArgs e) { int rawWidth = (int)e.NewSize.Width; - if (rawWidth == (int)(e.NewSize.Width / 10) || rawWidth == 25) { + if (rawWidth == (int)(e.NewSize.Width / 10) || rawWidth == 25) + { return; } @@ -1110,7 +1111,7 @@ public async Task ShowContextMenu(PackageWrapper wrapper) { CurrentPackageList.Select(wrapper.Index); await Task.Delay(20); - if(_lastContextMenuButtonTapped is not null) + if (_lastContextMenuButtonTapped is not null) (CurrentPackageList.ContextFlyout as BetterMenu)?.ShowAt(_lastContextMenuButtonTapped, new FlyoutShowOptions { Placement = FlyoutPlacementMode.RightEdgeAlignedTop }); WhenShowingContextMenu(wrapper.Package); } @@ -1163,7 +1164,7 @@ private async Task ForceRedrawByScroll() private void ToggleFiltersButton_Click(object sender, RoutedEventArgs e) { - if(FilteringPanel.DisplayMode is SplitViewDisplayMode.Inline) + if (FilteringPanel.DisplayMode is SplitViewDisplayMode.Inline) { Settings.SetDictionaryItem(Settings.K.HideToggleFilters, PAGE_NAME, !ToggleFiltersButton.IsChecked ?? false); } diff --git a/src/UniGetUI/Pages/SoftwarePages/DiscoverSoftwarePage.cs b/src/UniGetUI/Pages/SoftwarePages/DiscoverSoftwarePage.cs index bb18944e7d..e909d92c72 100644 --- a/src/UniGetUI/Pages/SoftwarePages/DiscoverSoftwarePage.cs +++ b/src/UniGetUI/Pages/SoftwarePages/DiscoverSoftwarePage.cs @@ -1,19 +1,19 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Input; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.Interface.Enums; +using UniGetUI.Interface.Telemetry; using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.Interfaces; using UniGetUI.PackageEngine.PackageLoader; +using UniGetUI.Pages.DialogPages; using Windows.System; using Windows.UI.Text; -using Microsoft.UI.Xaml.Controls.Primitives; -using UniGetUI.Interface.Telemetry; -using UniGetUI.Pages.DialogPages; -using Microsoft.UI.Xaml.Input; namespace UniGetUI.Interface.SoftwarePages { diff --git a/src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs b/src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs index a3df50ffd8..ca59040d2a 100644 --- a/src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs +++ b/src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs @@ -1,4 +1,3 @@ -using Windows.UI.Text; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; @@ -16,6 +15,7 @@ using UniGetUI.PackageEngine.PackageLoader; using UniGetUI.Pages.DialogPages; using UniGetUI.Services; +using Windows.UI.Text; namespace UniGetUI.Interface.SoftwarePages { @@ -90,7 +90,7 @@ public override BetterMenu GenerateContextMenu() Text = CoreTools.AutoTranslated("Open install location"), IconName = IconType.Launch, }; - MenuOpenInstallLocation.Click += (_, _) => OpenPackageInstallLocation(SelectedItem);; + MenuOpenInstallLocation.Click += (_, _) => OpenPackageInstallLocation(SelectedItem); ; menu.Items.Add(MenuOpenInstallLocation); menu.Items.Add(new MenuFlyoutSeparator()); @@ -343,7 +343,7 @@ private async Task _whenShowingContextMenu(IPackage package) MenuIgnoreUpdates.IsEnabled = false; // Will be set on the lines below; MenuSharePackage.IsEnabled = !IS_LOCAL; MenuPackageDetails.IsEnabled = !IS_LOCAL; - MenuDownloadInstaller.IsEnabled = !IS_LOCAL && package.Manager.Capabilities.CanDownloadInstaller;; + MenuDownloadInstaller.IsEnabled = !IS_LOCAL && package.Manager.Capabilities.CanDownloadInstaller; ; MenuOpenInstallLocation.IsEnabled = package.Manager.DetailsHelper.GetInstallLocation(package) is not null; if (!IS_LOCAL) diff --git a/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs b/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs index d0e40598cb..a99d37e4d0 100644 --- a/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs +++ b/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs @@ -2,7 +2,6 @@ using System.Text.Json; using System.Text.Json.Nodes; using System.Xml.Serialization; -using Windows.UI.Text; using ExternalLibraries.Pickers; using Microsoft.UI.Text; using Microsoft.UI.Xaml; @@ -24,6 +23,7 @@ using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.PackageEngine.PackageLoader; using UniGetUI.Pages.DialogPages; +using Windows.UI.Text; namespace UniGetUI.Interface.SoftwarePages { @@ -283,7 +283,7 @@ public override void GenerateToolBar() IReadOnlyList GetCheckedNonInstalledPackages() { - if(Settings.Get(Settings.K.InstallInstalledPackagesBundlesPage)) + if (Settings.Get(Settings.K.InstallInstalledPackagesBundlesPage)) return FilteredPackages.GetCheckedPackages().ToList(); else return FilteredPackages.GetCheckedPackages().Where(p => p.Tag is not PackageTag.AlreadyInstalled).ToList(); @@ -439,7 +439,7 @@ public async Task OpenFromString(string payload, BundleFormatType format, string TelemetryHandler.ImportBundle(format); HasUnsavedChanges = false; - if ((int)(open_version*10) != (int)(SerializableBundle.ExpectedVersion*10)) + if ((int)(open_version * 10) != (int)(SerializableBundle.ExpectedVersion * 10)) { // Check only up to first decimal digit, prevent floating point precision error. Logger.Warn($"The loaded bundle \"{source}\" is based on schema version {open_version}, " + $"while this UniGetUI build expects version {SerializableBundle.ExpectedVersion}." + @@ -534,9 +534,9 @@ public async Task SaveFile() DialogHelper.HideLoadingDialog(loadingId); - DialogHelper.ShowDismissableBalloon( - CoreTools.Translate("Success!"), - CoreTools.Translate("The bundle was created successfully on {0}", file)); + DialogHelper.ShowDismissableBalloon( + CoreTools.Translate("Success!"), + CoreTools.Translate("The bundle was created successfully on {0}", file)); await CoreTools.ShowFileOnExplorer(file); HasUnsavedChanges = false; @@ -637,21 +637,21 @@ static int Comparison(IPackage x, IPackage y) report.IsEmpty = false; if (!report.Contents.ContainsKey(pkg.Id)) report.Contents[pkg.Id] = new(); report.Contents[pkg.Id].Add(new($"Custom install arguments: [{string.Join(", ", opts.CustomParameters_Install)}]", AllowCLIParameters)); - if(!AllowCLIParameters) opts.CustomParameters_Install.Clear(); + if (!AllowCLIParameters) opts.CustomParameters_Install.Clear(); } if (opts.CustomParameters_Update.Where(x => x.Any()).Any()) { report.IsEmpty = false; if (!report.Contents.ContainsKey(pkg.Id)) report.Contents[pkg.Id] = new(); report.Contents[pkg.Id].Add(new($"Custom update arguments: [{string.Join(", ", opts.CustomParameters_Update)}]", AllowCLIParameters)); - if(!AllowCLIParameters) opts.CustomParameters_Update.Clear(); + if (!AllowCLIParameters) opts.CustomParameters_Update.Clear(); } if (opts.CustomParameters_Uninstall.Where(x => x.Any()).Any()) { report.IsEmpty = false; if (!report.Contents.ContainsKey(pkg.Id)) report.Contents[pkg.Id] = new(); report.Contents[pkg.Id].Add(new($"Custom uninstall arguments: [{string.Join(", ", opts.CustomParameters_Uninstall)}]", AllowCLIParameters)); - if(!AllowCLIParameters) opts.CustomParameters_Uninstall.Clear(); + if (!AllowCLIParameters) opts.CustomParameters_Uninstall.Clear(); } if (opts.PreInstallCommand.Any()) @@ -782,7 +782,7 @@ public async Task CreateBatchScript() var exeName = package.Manager.Properties.ExecutableFriendlyName; var param = package.Manager.OperationHelper.GetParameters(package, package.installation_options, OperationType.Install); - commands.Add($"{exeName} {string.Join(' ',param)}"); + commands.Add($"{exeName} {string.Join(' ', param)}"); if (package.installation_options.PostInstallCommand != "") { // Add post-operation diff --git a/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs b/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs index daff3f196b..e298b50646 100644 --- a/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs +++ b/src/UniGetUI/Pages/SoftwarePages/SoftwareUpdatesPage.cs @@ -1,5 +1,3 @@ -using Windows.Networking.Connectivity; -using Windows.UI.Text; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; @@ -17,9 +15,11 @@ using UniGetUI.PackageEngine.Classes.Packages.Classes; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.Interfaces; +using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.PackageEngine.PackageLoader; using UniGetUI.Pages.DialogPages; -using UniGetUI.PackageEngine.PackageClasses; +using Windows.Networking.Connectivity; +using Windows.UI.Text; namespace UniGetUI.Interface.SoftwarePages { @@ -171,7 +171,8 @@ public override BetterMenu GenerateContextMenu() { Text = menuTime.StringRepresentation(), }; - menuItem.Click += (_, _) => { + menuItem.Click += (_, _) => + { if (SelectedItem != null) { SelectedItem.AddToIgnoredUpdatesAsync("<" + menuTime.GetDateFromNow()); @@ -337,11 +338,11 @@ protected override async void WhenPackagesLoaded(ReloadReason reason) try { List upgradablePackages = []; - foreach (IPackage package in Loader.Packages) - { - if (package.Tag is not PackageTag.OnQueue and not PackageTag.BeingProcessed) - upgradablePackages.Add(package); - } + foreach (IPackage package in Loader.Packages) + { + if (package.Tag is not PackageTag.OnQueue and not PackageTag.BeingProcessed) + upgradablePackages.Add(package); + } if (upgradablePackages.Count == 0) return; @@ -375,7 +376,7 @@ protected override async void WhenPackagesLoaded(ReloadReason reason) } else { - foreach(var package in upgradablePackages) + foreach (var package in upgradablePackages) { if ((await InstallOptionsFactory.LoadApplicableAsync(package)).AutoUpdatePackage) { @@ -452,7 +453,7 @@ static async Task ShowAvailableUpdatesNotification(IReadOnlyList upgra .AddText(CoreTools.Translate("Updates found!")) .AddText(CoreTools.Translate("{0} packages can be updated", upgradablePackages.Count)) .SetAttributionText(attribution) - // Believe it or not, the `'` character is broken + // Believe it or not, the `'` character is broken .AddButton(new AppNotificationButton(CoreTools.Translate("Open UniGetUI").Replace("'", "´")) .AddArgument("action", NotificationArguments.ShowOnUpdatesTab) ) @@ -531,7 +532,7 @@ static async Task ShowUpgradingPackagesNotification(IReadOnlyList upgr private void MenuInstall_Invoked(object sender, RoutedEventArgs e) => _ = MainApp.Operations.Update(SelectedItem); - private void MenuSkipHash_Invoked(object sender, RoutedEventArgs e) + private void MenuSkipHash_Invoked(object sender, RoutedEventArgs e) => _ = MainApp.Operations.Update(SelectedItem, no_integrity: true); private void MenuInteractive_Invoked(object sender, RoutedEventArgs e) diff --git a/src/UniGetUI/Services/BackgroundLoginApi.cs b/src/UniGetUI/Services/BackgroundLoginApi.cs index 6c59b0ed65..386cf80d2c 100644 --- a/src/UniGetUI/Services/BackgroundLoginApi.cs +++ b/src/UniGetUI/Services/BackgroundLoginApi.cs @@ -6,7 +6,7 @@ namespace UniGetUI.Services; -public class GHAuthApiRunner: IDisposable +public class GHAuthApiRunner : IDisposable { public event EventHandler? OnLogin; private IHost? _host; diff --git a/src/UniGetUI/Services/GitHubAuthService.cs b/src/UniGetUI/Services/GitHubAuthService.cs index 9945a0c2e7..bc0d318c13 100644 --- a/src/UniGetUI/Services/GitHubAuthService.cs +++ b/src/UniGetUI/Services/GitHubAuthService.cs @@ -5,8 +5,8 @@ using UniGetUI.Core.Logging; using UniGetUI.Core.SecureSettings; using UniGetUI.Core.SettingsEngine; -using Windows.System; using UniGetUI.Interface; +using Windows.System; namespace UniGetUI.Services { diff --git a/src/UniGetUI/Services/UserAvatar.cs b/src/UniGetUI/Services/UserAvatar.cs index 93bf49bf3e..376c4485b9 100644 --- a/src/UniGetUI/Services/UserAvatar.cs +++ b/src/UniGetUI/Services/UserAvatar.cs @@ -1,4 +1,3 @@ -using Windows.UI; using Microsoft.UI; using Microsoft.UI.Input; using Microsoft.UI.Xaml; @@ -12,10 +11,11 @@ using UniGetUI.Interface.Widgets; using UniGetUI.Pages.DialogPages; using UniGetUI.Pages.SettingsPages.GeneralPages; +using Windows.UI; namespace UniGetUI.Services { - public partial class PointButton: Button + public partial class PointButton : Button { public PointButton() { @@ -23,7 +23,7 @@ public PointButton() } } - public partial class UserAvatar: UserControl + public partial class UserAvatar : UserControl { public UserAvatar() { @@ -243,7 +243,7 @@ private async Task GenerateLogoutControl() { HorizontalAlignment = HorizontalAlignment.Stretch, Content = CoreTools.Translate("Log out"), - Background = new SolidColorBrush(ActualTheme is ElementTheme.Dark? Colors.DarkRed: Colors.PaleVioletRed), + Background = new SolidColorBrush(ActualTheme is ElementTheme.Dark ? Colors.DarkRed : Colors.PaleVioletRed), BorderThickness = new(0) }; loginButton.Click += LogoutButton_Click; diff --git a/src/WindowsPackageManager.Interop/Exceptions/WinGetConfigurationException.cs b/src/WindowsPackageManager.Interop/Exceptions/WinGetConfigurationException.cs index 4d7269bc5e..f70c091cac 100644 --- a/src/WindowsPackageManager.Interop/Exceptions/WinGetConfigurationException.cs +++ b/src/WindowsPackageManager.Interop/Exceptions/WinGetConfigurationException.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT License. namespace WindowsPackageManager.Interop; diff --git a/src/WindowsPackageManager.Interop/WindowsPackageManager/ClassModel.cs b/src/WindowsPackageManager.Interop/WindowsPackageManager/ClassModel.cs index de3672cb5b..9bdc1b71f3 100644 --- a/src/WindowsPackageManager.Interop/WindowsPackageManager/ClassModel.cs +++ b/src/WindowsPackageManager.Interop/WindowsPackageManager/ClassModel.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT License. namespace WindowsPackageManager.Interop; diff --git a/src/WindowsPackageManager.Interop/WindowsPackageManager/ClsidContext.cs b/src/WindowsPackageManager.Interop/WindowsPackageManager/ClsidContext.cs index 93425c1f24..fab200549b 100644 --- a/src/WindowsPackageManager.Interop/WindowsPackageManager/ClsidContext.cs +++ b/src/WindowsPackageManager.Interop/WindowsPackageManager/ClsidContext.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. +// Copyright (c) Microsoft Corporation. // Licensed under the MIT License. namespace WindowsPackageManager.Interop;