From 0224b92b0d2e688262556e01712b37256319e371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Climent?= Date: Mon, 3 Jun 2024 14:32:03 +0200 Subject: [PATCH] Run code cleanup --- .../Classes/FileOpenDialogRCW.cs | 4 +- .../Classes/FileSaveDialogRCW.cs | 4 +- .../Classes/Helper.cs | 6 +- .../Enums/FOS.cs | 4 +- .../FileOpenPicker.cs | 4 +- .../FileSavePicker.cs | 4 +- .../FolderPicker.cs | 3 +- .../Interfaces/FileOpenDialog.cs | 4 +- .../Interfaces/FileSaveDialog.cs | 4 +- .../Interfaces/IFileDialog.cs | 7 +-- .../Interfaces/IFileDialogEvents.cs | 6 +- .../Interfaces/IFileOpenDialog.cs | 6 +- .../Interfaces/IModalWindow.cs | 3 +- .../Interfaces/IShellItem.cs | 5 +- .../Interfaces/IShellItemArray.cs | 7 +-- .../Structures/PROPERTYKEY.cs | 3 +- .../PersonTests.cs | 4 +- .../SingletonBaseTest.cs | 10 ++-- .../SortableObservableCollectionTests.cs | 6 +- src/UniGetUI.Core.Classes/SingletonBase.cs | 8 +-- src/UniGetUI.Core.Data.Tests/CoreTests.cs | 10 ++-- src/UniGetUI.Core.Data/CoreData.cs | 8 +-- .../IconCacheEngineTests.cs | 43 ++++++------- .../IconDatabaseTests.cs | 10 ++-- .../IconCacheEngine.cs | 37 ++++-------- src/UniGetUI.Core.IconStore/IconDatabase.cs | 4 +- .../LanguageDataTests.cs | 7 +-- .../LanguageEngineTests.cs | 16 ++--- .../LanguageData.cs | 9 ++- .../LanguageEngine.cs | 2 +- .../LogEntryTests.cs | 10 ++-- .../LoggerTests.cs | 6 +- src/UniGetUI.Core.Tools.Tests/ToolsTests.cs | 15 +++-- src/UniGetUI.Core.Tools/Tools.cs | 13 ++-- .../ChocolateySourceProvider.cs | 7 +-- .../DotNet.cs | 22 ++----- .../BaseNuGet.cs | 27 +++------ .../BaseNuGetDetailsProvider.cs | 28 +++------ .../Internal/PackageManifestLoader.cs | 14 ++--- .../Npm.cs | 7 +-- .../NpmPackageDetailsProvider.cs | 7 +-- .../Pip.cs | 6 +- .../PipPackageDetailsProvider.cs | 7 +-- .../PowerShell.cs | 14 +---- .../Scoop.cs | 22 ++----- .../ScoopPackageDetailsProvider.cs | 8 +-- .../ScoopSourceProvider.cs | 7 +-- .../WinGet.cs | 15 +---- .../WinGetHelpers.cs | 13 +--- .../WinGetPackageDetailsProvider.cs | 60 ++++++++----------- .../WinGetSourceProvider.cs | 9 +-- .../BasePackageDetailsProvider.cs | 16 ++--- .../BaseProviders/BaseSourceProvider.cs | 9 +-- .../Manager/Classes/ManagerCapabilities.cs | 5 -- .../Manager/Classes/ManagerProperties.cs | 7 +-- .../Manager/Classes/ManagerSource.cs | 7 +-- .../Manager/Classes/ManagerSourceFactory.cs | 7 +-- .../Manager/Classes/ManagerStatus.cs | 8 +-- .../Interfaces/IPackageDetailsProvider.cs | 9 +-- .../Manager/Interfaces/ISourceProvider.cs | 7 +-- .../Manager/PackageManager.cs | 7 +-- .../Packages/InstallationOptions.cs | 11 +--- .../Packages/Package.cs | 18 ++---- .../Packages/PackageDetails.cs | 9 +-- .../Packages/PackageFactory.cs | 13 ++-- src/UniGetUI/App.xaml.cs | 38 ++++-------- src/UniGetUI/EntryPoint.cs | 8 +-- src/UniGetUI/Interface/BackgroundApi.cs | 6 -- .../Interface/Dialogs/AboutUniGetUI.xaml.cs | 2 - .../Interface/Dialogs/IgnoredUpdates.xaml.cs | 11 +--- .../Interface/Dialogs/InstallOptions.xaml.cs | 10 +--- .../Interface/Dialogs/ReleaseNotes.xaml.cs | 3 - src/UniGetUI/Interface/MainView.xaml.cs | 31 ++++------ .../Pages/AboutPages/AboutUniGetUI.xaml.cs | 2 - .../Pages/AboutPages/Contributors.xaml.cs | 5 +- .../AboutPages/ThirdPartyLicenses.xaml.cs | 2 - .../Pages/AboutPages/Translators.xaml.cs | 7 +-- src/UniGetUI/Interface/Pages/HelpPage.xaml.cs | 3 - src/UniGetUI/Interface/Pages/LogPage.xaml.cs | 29 ++++----- .../Pages/PackageDetailsPage.xaml.cs | 32 ++++------ .../Interface/Pages/SettingsPage.xaml.cs | 14 ++--- .../AbstractPackagesPage.xaml.cs | 24 +++----- .../SoftwarePages/NewDiscoverSoftwarePage.cs | 25 ++++---- .../SoftwarePages/NewInstalledPackagesPage.cs | 37 +++++------- .../SoftwarePages/NewSoftwareUpdatesPage.cs | 40 ++++++------- .../SoftwarePages/PackageBundle.xaml.cs | 42 ++++++------- .../Interface/Widgets/Announcer.xaml.cs | 4 +- src/UniGetUI/Interface/Widgets/ButtonCard.cs | 3 - .../Interface/Widgets/CheckboxCard.cs | 3 - .../Interface/Widgets/ComboboxCard.cs | 3 - src/UniGetUI/Interface/Widgets/LocalIcon.cs | 3 - .../Interface/Widgets/MenuForPackage.cs | 6 +- .../Interface/Widgets/NavButton.xaml.cs | 4 -- .../Interface/Widgets/SettingsEntry.cs | 2 - .../Interface/Widgets/SourceManager.xaml.cs | 14 ++--- src/UniGetUI/Interface/Widgets/TextboxCard.cs | 3 - .../Widgets/TranslatedTextBlock.xaml.cs | 2 - .../PackageEngine/Classes/ImportExport.cs | 11 +--- .../Operations/OperationControl.xaml.cs | 12 +--- .../Operations/PackageOperations.cs | 14 +---- .../Operations/SourceOperations.cs | 13 +--- 101 files changed, 364 insertions(+), 802 deletions(-) diff --git a/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs b/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs index b54f8c31b..1c5f883ae 100644 --- a/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs +++ b/src/ExternalLibraries.FilePickers/Classes/FileOpenDialogRCW.cs @@ -1,5 +1,5 @@ -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Guids; +using ExternalLibraries.Pickers.Guids; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Classes; diff --git a/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs b/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs index 96a69092f..40a15914e 100644 --- a/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs +++ b/src/ExternalLibraries.FilePickers/Classes/FileSaveDialogRCW.cs @@ -1,5 +1,5 @@ -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Guids; +using ExternalLibraries.Pickers.Guids; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Classes; diff --git a/src/ExternalLibraries.FilePickers/Classes/Helper.cs b/src/ExternalLibraries.FilePickers/Classes/Helper.cs index e71cbf16f..937bc6ad7 100644 --- a/src/ExternalLibraries.FilePickers/Classes/Helper.cs +++ b/src/ExternalLibraries.FilePickers/Classes/Helper.cs @@ -1,9 +1,7 @@ -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Enums; +using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Interfaces; using ExternalLibraries.Pickers.Structures; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Classes; diff --git a/src/ExternalLibraries.FilePickers/Enums/FOS.cs b/src/ExternalLibraries.FilePickers/Enums/FOS.cs index abfb4aaee..5504ea162 100644 --- a/src/ExternalLibraries.FilePickers/Enums/FOS.cs +++ b/src/ExternalLibraries.FilePickers/Enums/FOS.cs @@ -1,6 +1,4 @@ -using System; - -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/FileOpenPicker.cs b/src/ExternalLibraries.FilePickers/FileOpenPicker.cs index 766104a39..0f86c05da 100644 --- a/src/ExternalLibraries.FilePickers/FileOpenPicker.cs +++ b/src/ExternalLibraries.FilePickers/FileOpenPicker.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -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 77cde3134..4f68bcf5a 100644 --- a/src/ExternalLibraries.FilePickers/FileSavePicker.cs +++ b/src/ExternalLibraries.FilePickers/FileSavePicker.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -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 bfd302ab9..0642f9e2a 100644 --- a/src/ExternalLibraries.FilePickers/FolderPicker.cs +++ b/src/ExternalLibraries.FilePickers/FolderPicker.cs @@ -1,5 +1,4 @@ -using System; -using ExternalLibraries.Pickers.Classes; +using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Enums; namespace ExternalLibraries.Pickers; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs index 9cddb1024..019c7fdc3 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/FileOpenDialog.cs @@ -1,6 +1,6 @@ -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Classes; +using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Guids; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs index 2f76d7e80..2d0c13e43 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/FileSaveDialog.cs @@ -1,6 +1,6 @@ -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Classes; +using ExternalLibraries.Pickers.Classes; using ExternalLibraries.Pickers.Guids; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs index 0f353f9a5..cf174c172 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialog.cs @@ -1,9 +1,8 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Enums; +using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; using ExternalLibraries.Pickers.Structures; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs index 732a52d25..c126331cb 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IFileDialogEvents.cs @@ -1,7 +1,7 @@ -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Enums; +using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs b/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs index 61f666d28..d3fa50f96 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IFileOpenDialog.cs @@ -1,7 +1,7 @@ -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Guids; +using ExternalLibraries.Pickers.Guids; using ExternalLibraries.Pickers.Structures; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs b/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs index 5745b0e79..a1898c881 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IModalWindow.cs @@ -1,7 +1,6 @@ -using System; +using ExternalLibraries.Pickers.Guids; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Guids; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs b/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs index 64ccf5604..cc57899f2 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IShellItem.cs @@ -1,8 +1,7 @@ -using System; +using ExternalLibraries.Pickers.Enums; +using ExternalLibraries.Pickers.Guids; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Enums; -using ExternalLibraries.Pickers.Guids; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs b/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs index 038492d43..aca6f5307 100644 --- a/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs +++ b/src/ExternalLibraries.FilePickers/Interfaces/IShellItemArray.cs @@ -1,9 +1,8 @@ -using System; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using ExternalLibraries.Pickers.Enums; +using ExternalLibraries.Pickers.Enums; using ExternalLibraries.Pickers.Guids; using ExternalLibraries.Pickers.Structures; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Interfaces; diff --git a/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs b/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs index a062a7ef2..dbb1a5ab4 100644 --- a/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs +++ b/src/ExternalLibraries.FilePickers/Structures/PROPERTYKEY.cs @@ -1,5 +1,4 @@ -using System; -using System.Runtime.InteropServices; +using System.Runtime.InteropServices; namespace ExternalLibraries.Pickers.Structures; diff --git a/src/UniGetUI.Core.Classes.Tests/PersonTests.cs b/src/UniGetUI.Core.Classes.Tests/PersonTests.cs index 4c9782c67..504c5f607 100644 --- a/src/UniGetUI.Core.Classes.Tests/PersonTests.cs +++ b/src/UniGetUI.Core.Classes.Tests/PersonTests.cs @@ -1,6 +1,4 @@ -using Xunit; - -namespace UniGetUI.Core.Classes.Tests +namespace UniGetUI.Core.Classes.Tests { public class PersonTests { diff --git a/src/UniGetUI.Core.Classes.Tests/SingletonBaseTest.cs b/src/UniGetUI.Core.Classes.Tests/SingletonBaseTest.cs index 591e135fe..c9e87b9c5 100644 --- a/src/UniGetUI.Core.Classes.Tests/SingletonBaseTest.cs +++ b/src/UniGetUI.Core.Classes.Tests/SingletonBaseTest.cs @@ -1,6 +1,4 @@ -using Xunit; - -namespace UniGetUI.Core.Classes.Tests +namespace UniGetUI.Core.Classes.Tests { public class SingletonBaseTest { @@ -19,16 +17,16 @@ private class InheritedClass2 : SingletonBase [Fact] public void TestSingletonClass() { - var Type1Instance1 = InheritedClass1.Instance; + InheritedClass1 Type1Instance1 = InheritedClass1.Instance; Type1Instance1.Attribute1 = 1; - var Type1Instance2 = InheritedClass1.Instance; + InheritedClass1 Type1Instance2 = InheritedClass1.Instance; Type1Instance2.Attribute1 = 3; Assert.Equal(Type1Instance1.Attribute1, Type1Instance2.Attribute1); Assert.Equal(Type1Instance1, Type1Instance2); - var Type2Instance1 = new InheritedClass2(); + InheritedClass2 Type2Instance1 = new(); Type2Instance1.Attribute1 = 2; Assert.NotEqual(Type1Instance1.Attribute1, Type2Instance1.Attribute1); diff --git a/src/UniGetUI.Core.Classes.Tests/SortableObservableCollectionTests.cs b/src/UniGetUI.Core.Classes.Tests/SortableObservableCollectionTests.cs index 5a7ec4e3e..b6da59a2c 100644 --- a/src/UniGetUI.Core.Classes.Tests/SortableObservableCollectionTests.cs +++ b/src/UniGetUI.Core.Classes.Tests/SortableObservableCollectionTests.cs @@ -1,5 +1,3 @@ -using Xunit; - namespace UniGetUI.Core.Classes.Tests { public class SortableObservableCollectionTests @@ -8,8 +6,8 @@ public class SortableObservableCollectionTests public void TestSortableCollection() { int EventTriggeredCount = 0; - - var SortableCollection = new SortableObservableCollection(); + + SortableObservableCollection SortableCollection = new(); SortableCollection.CollectionChanged += (s, e) => { EventTriggeredCount++; }; SortableCollection.SortingSelector = (s) => { return s; }; SortableCollection.Add(1); diff --git a/src/UniGetUI.Core.Classes/SingletonBase.cs b/src/UniGetUI.Core.Classes/SingletonBase.cs index d17cc337b..cc7f96290 100644 --- a/src/UniGetUI.Core.Classes/SingletonBase.cs +++ b/src/UniGetUI.Core.Classes/SingletonBase.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace UniGetUI.Core.Classes +namespace UniGetUI.Core.Classes { public abstract class SingletonBase where T : SingletonBase { diff --git a/src/UniGetUI.Core.Data.Tests/CoreTests.cs b/src/UniGetUI.Core.Data.Tests/CoreTests.cs index 8e199959e..8f3c41ee4 100644 --- a/src/UniGetUI.Core.Data.Tests/CoreTests.cs +++ b/src/UniGetUI.Core.Data.Tests/CoreTests.cs @@ -25,13 +25,13 @@ public void CheckOtherAttributes() Assert.NotEmpty(CoreData.VersionName); Assert.NotEqual(0, CoreData.VersionNumber); Assert.True(File.Exists(CoreData.IgnoredUpdatesDatabaseFile), "The Ignored Updates database file does not exist, but it should have been created automatically."); - - var notif_1 = CoreData.VolatileNotificationIdCounter; - var notif_2 = CoreData.VolatileNotificationIdCounter; + + int notif_1 = CoreData.VolatileNotificationIdCounter; + int notif_2 = CoreData.VolatileNotificationIdCounter; Assert.NotEqual(notif_1, notif_2); - var notif_3 = CoreData.UpdatesAvailableNotificationId; - var notif_4 = CoreData.UpdatesAvailableNotificationId; + int notif_3 = CoreData.UpdatesAvailableNotificationId; + int notif_4 = CoreData.UpdatesAvailableNotificationId; Assert.True(notif_3 == notif_4, "The UpdatesAvailableNotificationId must be always the same"); Assert.NotEqual(0, CoreData.UpdatesAvailableNotificationId); diff --git a/src/UniGetUI.Core.Data/CoreData.cs b/src/UniGetUI.Core.Data/CoreData.cs index 8d72ebc88..38e30f441 100644 --- a/src/UniGetUI.Core.Data/CoreData.cs +++ b/src/UniGetUI.Core.Data/CoreData.cs @@ -1,8 +1,4 @@ -using System.Linq.Expressions; -using System.Reflection.Metadata.Ecma335; -using UniGetUI.Core.Logging; -using Windows.Storage.Search; -using Windows.System.Diagnostics; +using UniGetUI.Core.Logging; namespace UniGetUI.Core.Data { @@ -31,7 +27,7 @@ public static string UniGetUIInstallationOptionsDirectory { get { - var path = Path.Join(UniGetUIDataDirectory, "InstallationOptions"); + string path = Path.Join(UniGetUIDataDirectory, "InstallationOptions"); if(!Directory.Exists(path)) Directory.CreateDirectory(path); return path; } diff --git a/src/UniGetUI.Core.IconEngine.Tests/IconCacheEngineTests.cs b/src/UniGetUI.Core.IconEngine.Tests/IconCacheEngineTests.cs index 4e171f9f6..acfb023e4 100644 --- a/src/UniGetUI.Core.IconEngine.Tests/IconCacheEngineTests.cs +++ b/src/UniGetUI.Core.IconEngine.Tests/IconCacheEngineTests.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.Core.Data; -using UniGetUI.Core.Tools; +using UniGetUI.Core.Data; namespace UniGetUI.Core.IconEngine.Tests { @@ -18,19 +11,19 @@ public static class IconCacheEngineTests public static async Task TestCacheEngineForSha256(string url, byte[] data, string managerName, string packageId) { string extension = url.Split(".")[^1]; - var expectedFile = Path.Join(CoreData.UniGetUICacheDirectory_Icons, managerName, packageId + "." + extension); + string expectedFile = Path.Join(CoreData.UniGetUICacheDirectory_Icons, managerName, packageId + "." + extension); if(File.Exists(expectedFile)) File.Delete(expectedFile); - CacheableIcon icon = new CacheableIcon(new Uri(url), data); - var path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); + CacheableIcon icon = new(new Uri(url), data); + string path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); Assert.Equal(expectedFile, path); Assert.True(File.Exists(path)); - var oldModificationDate = File.GetLastWriteTime(path); + DateTime oldModificationDate = File.GetLastWriteTime(path); icon = new CacheableIcon(new Uri(url.Replace("icon", "nonexistingicon")), data); path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); - var newModificationDate = File.GetLastWriteTime(path); + DateTime newModificationDate = File.GetLastWriteTime(path); Assert.Equal(oldModificationDate, newModificationDate); Assert.Equal(expectedFile, path); @@ -42,19 +35,19 @@ public static async Task TestCacheEngineForSha256(string url, byte[] data, strin public static async Task TestCacheEngineForPackageVersion(string url, string version, string managerName, string packageId) { string extension = url.Split(".")[^1]; - var expectedFile = Path.Join(CoreData.UniGetUICacheDirectory_Icons, managerName, packageId + "." + extension); + string expectedFile = Path.Join(CoreData.UniGetUICacheDirectory_Icons, managerName, packageId + "." + extension); if (File.Exists(expectedFile)) File.Delete(expectedFile); - CacheableIcon icon = new CacheableIcon(new Uri(url), version); - var path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); + CacheableIcon icon = new(new Uri(url), version); + string path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); Assert.Equal(expectedFile, path); Assert.True(File.Exists(path)); - var oldModificationDate = File.GetLastWriteTime(path); + DateTime oldModificationDate = File.GetLastWriteTime(path); icon = new CacheableIcon(new Uri(url), version); path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); - var newModificationDate = File.GetLastWriteTime(path); + DateTime newModificationDate = File.GetLastWriteTime(path); Assert.Equal(oldModificationDate, newModificationDate); Assert.Equal(expectedFile, path); @@ -62,7 +55,7 @@ public static async Task TestCacheEngineForPackageVersion(string url, string ver icon = new CacheableIcon(new Uri(url), version+"-beta0"); path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); - var newNewModificationDate = File.GetLastWriteTime(path); + DateTime newNewModificationDate = File.GetLastWriteTime(path); Assert.NotEqual(oldModificationDate, newNewModificationDate); Assert.Equal(expectedFile, path); @@ -75,19 +68,19 @@ public static async Task TestCacheEngineForPackageVersion(string url, string ver public static async Task TestCacheEngineForPackageSize(string url, long size, string managerName, string packageId) { string extension = url.Split(".")[^1]; - var expectedFile = Path.Join(CoreData.UniGetUICacheDirectory_Icons, managerName, packageId + "." + extension); + string expectedFile = Path.Join(CoreData.UniGetUICacheDirectory_Icons, managerName, packageId + "." + extension); if (File.Exists(expectedFile)) File.Delete(expectedFile); - CacheableIcon icon = new CacheableIcon(new Uri(url), size); - var path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); + CacheableIcon icon = new(new Uri(url), size); + string path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); Assert.Equal(expectedFile, path); Assert.True(File.Exists(path)); - var oldModificationDate = File.GetLastWriteTime(path); + DateTime oldModificationDate = File.GetLastWriteTime(path); icon = new CacheableIcon(new Uri(url), size); path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); - var newModificationDate = File.GetLastWriteTime(path); + DateTime newModificationDate = File.GetLastWriteTime(path); Assert.Equal(oldModificationDate, newModificationDate); Assert.Equal(expectedFile, path); @@ -95,7 +88,7 @@ public static async Task TestCacheEngineForPackageSize(string url, long size, st icon = new CacheableIcon(new Uri(url), size+1); path = await IconCacheEngine.DownloadIconOrCache(icon, managerName, packageId); - var newNewModificationDate = File.GetLastWriteTime(path); + DateTime newNewModificationDate = File.GetLastWriteTime(path); Assert.NotEqual(oldModificationDate, newNewModificationDate); Assert.Equal(expectedFile, path); diff --git a/src/UniGetUI.Core.IconEngine.Tests/IconDatabaseTests.cs b/src/UniGetUI.Core.IconEngine.Tests/IconDatabaseTests.cs index aa32765c8..d7fc37839 100644 --- a/src/UniGetUI.Core.IconEngine.Tests/IconDatabaseTests.cs +++ b/src/UniGetUI.Core.IconEngine.Tests/IconDatabaseTests.cs @@ -12,7 +12,7 @@ public async Task LoadIconsAndScreenshotsDatabaseTest() await iconStore.LoadIconAndScreenshotsDatabaseAsync(); - var iconCount = iconStore.GetIconCount(); + IconDatabase.IconCount iconCount = iconStore.GetIconCount(); Assert.NotEqual(0, iconCount.PackagesWithIconCount); Assert.NotEqual(0, iconCount.PackagesWithScreenshotCount); Assert.NotEqual(0, iconCount.TotalScreenshotCount); @@ -23,10 +23,10 @@ public async Task TestGetExistingIconAndImagesAsync() { await iconStore.LoadIconAndScreenshotsDatabaseAsync(); - var icon = iconStore.GetIconUrlForId("__test_entry_DO_NOT_EDIT_PLEASE"); + string icon = iconStore.GetIconUrlForId("__test_entry_DO_NOT_EDIT_PLEASE"); Assert.Equal("https://this.is.a.test/url/used_for/automated_unit_testing.png", icon); - var screenshots = iconStore.GetScreenshotsUrlForId("__test_entry_DO_NOT_EDIT_PLEASE"); + string[] screenshots = iconStore.GetScreenshotsUrlForId("__test_entry_DO_NOT_EDIT_PLEASE"); Assert.Equal(3, screenshots.Length); Assert.Equal("https://image_number.com/1.png", screenshots[0]); Assert.Equal("https://image_number.com/2.png", screenshots[1]); @@ -38,10 +38,10 @@ public async Task TestGetNonExistingIconAndImagesAsync() { await iconStore.LoadIconAndScreenshotsDatabaseAsync(); - var nonexistent_icon = iconStore.GetIconUrlForId("__test_entry_THIS_ICON_DOES_NOT_EXTST"); + string nonexistent_icon = iconStore.GetIconUrlForId("__test_entry_THIS_ICON_DOES_NOT_EXTST"); Assert.Empty(nonexistent_icon); - var nonexistent_screenshots = iconStore.GetScreenshotsUrlForId("__test_entry_THIS_ICON_DOES_NOT_EXTST"); + string[] nonexistent_screenshots = iconStore.GetScreenshotsUrlForId("__test_entry_THIS_ICON_DOES_NOT_EXTST"); Assert.Empty(nonexistent_screenshots); } } diff --git a/src/UniGetUI.Core.IconStore/IconCacheEngine.cs b/src/UniGetUI.Core.IconStore/IconCacheEngine.cs index 579336097..b88727fbc 100644 --- a/src/UniGetUI.Core.IconStore/IconCacheEngine.cs +++ b/src/UniGetUI.Core.IconStore/IconCacheEngine.cs @@ -1,18 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection.PortableExecutable; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; +using System.Security.Cryptography; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; -using Windows.Foundation.Collections; namespace UniGetUI.Core.IconEngine { @@ -75,7 +64,7 @@ public static async Task DownloadIconOrCache(CacheableIcon? _icon, strin if (_icon is null) return ""; CacheableIcon icon = _icon ?? new CacheableIcon(); - var extension = icon.Url.AbsolutePath.Substring(icon.Url.AbsolutePath.LastIndexOf('.'))[1..]; + string extension = icon.Url.AbsolutePath.Substring(icon.Url.AbsolutePath.LastIndexOf('.'))[1..]; if (extension.Length > 6) { @@ -83,14 +72,14 @@ public static async Task DownloadIconOrCache(CacheableIcon? _icon, strin extension = "png"; } - var FilePath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, $"{PackageId}.{extension}"); - var VersionPath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, $"{PackageId}.{extension}.version"); - var UriPath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, $"{PackageId}.{extension}.uri"); - var FileDirectory = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName); + string FilePath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, $"{PackageId}.{extension}"); + string VersionPath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, $"{PackageId}.{extension}.version"); + string UriPath = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName, $"{PackageId}.{extension}.uri"); + string FileDirectory = Path.Join(CoreData.UniGetUICacheDirectory_Icons, ManagerName); if (!Directory.Exists(FileDirectory)) Directory.CreateDirectory(FileDirectory); - var FileExists = File.Exists(FilePath); + bool FileExists = File.Exists(FilePath); bool IsFileValid = false; if(FileExists) switch (icon.VerificationMethod) @@ -123,7 +112,7 @@ public static async Task DownloadIconOrCache(CacheableIcon? _icon, strin { if(File.Exists(VersionPath)) { - var localVersion = File.ReadAllText(VersionPath); + string localVersion = File.ReadAllText(VersionPath); IsFileValid = (localVersion == icon.Version); } } @@ -138,7 +127,7 @@ public static async Task DownloadIconOrCache(CacheableIcon? _icon, strin { if (File.Exists(UriPath)) { - var localVersion = File.ReadAllText(UriPath); + string localVersion = File.ReadAllText(UriPath); IsFileValid = (localVersion == icon.Url.ToString()); } } @@ -157,12 +146,12 @@ public static async Task DownloadIconOrCache(CacheableIcon? _icon, strin Logger.Debug($"Icon for package {PackageId} on manager {ManagerName} with Uri={icon.Url} has been determined to be {(IsFileValid? "VALID": "INVALID")} through verification method {icon.VerificationMethod}"); if(!IsFileValid) - using (var client = new HttpClient()) + using (HttpClient client = new()) { if(File.Exists(FilePath)) File.Delete(FilePath); HttpResponseMessage response = await client.GetAsync(icon.Url); response.EnsureSuccessStatusCode(); - using (var stream = await response.Content.ReadAsStreamAsync()) + using (Stream stream = await response.Content.ReadAsStreamAsync()) using(FileStream fileStream = File.Create(FilePath)) await stream.CopyToAsync(fileStream); if (icon.VerificationMethod == CachedIconVerificationMethod.PackageVersion) @@ -179,8 +168,8 @@ public static async Task DownloadIconOrCache(CacheableIcon? _icon, strin private static async Task CalculateFileHashAsync(string filePath) { - using (var stream = File.OpenRead(filePath)) - using (var sha256 = SHA256.Create()) + using (FileStream stream = File.OpenRead(filePath)) + using (SHA256 sha256 = SHA256.Create()) return await sha256.ComputeHashAsync(stream); } } diff --git a/src/UniGetUI.Core.IconStore/IconDatabase.cs b/src/UniGetUI.Core.IconStore/IconDatabase.cs index c8bad1e86..23ccfae60 100644 --- a/src/UniGetUI.Core.IconStore/IconDatabase.cs +++ b/src/UniGetUI.Core.IconStore/IconDatabase.cs @@ -1,6 +1,4 @@ -using System.ComponentModel; -using System.Diagnostics; -using System.Text.Json; +using System.Text.Json; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; diff --git a/src/UniGetUI.Core.Language.Tests/LanguageDataTests.cs b/src/UniGetUI.Core.Language.Tests/LanguageDataTests.cs index 622aa2e1f..0a763e14f 100644 --- a/src/UniGetUI.Core.Language.Tests/LanguageDataTests.cs +++ b/src/UniGetUI.Core.Language.Tests/LanguageDataTests.cs @@ -1,4 +1,3 @@ -using System.Text.Json.Nodes; using UniGetUI.Core.Classes; namespace UniGetUI.Core.Language.Tests @@ -36,9 +35,9 @@ public void LanguageReferenceTest(string key, string value) [Fact] public void TranslatedPercentageNotEmptyTests() - { - var TranslatedPercent = LanguageData.TranslationPercentages; - foreach (var key in TranslatedPercent.Keys) + { + System.Collections.ObjectModel.ReadOnlyDictionary TranslatedPercent = LanguageData.TranslationPercentages; + foreach (string key in TranslatedPercent.Keys) { Assert.True(LanguageData.LanguageReference.ContainsKey(key), $"The language key {key} was not found on LanguageReference"); Assert.False(LanguageData.TranslationPercentages[key].Contains("404%"), $"Somehow the key {key} has no value"); diff --git a/src/UniGetUI.Core.Language.Tests/LanguageEngineTests.cs b/src/UniGetUI.Core.Language.Tests/LanguageEngineTests.cs index 667202706..1ed1be4ec 100644 --- a/src/UniGetUI.Core.Language.Tests/LanguageEngineTests.cs +++ b/src/UniGetUI.Core.Language.Tests/LanguageEngineTests.cs @@ -10,7 +10,7 @@ public class LanguageEngineTests [InlineData("es", "Respaldar paquetes instalados")] public void TestLoadingLanguage(string language, string translation) { - var engine = new LanguageEngine(); + LanguageEngine engine = new(); engine.LoadLanguage(language); Assert.Equal(translation, engine.Translate("Backup installed packages")); @@ -20,10 +20,10 @@ public void TestLoadingLanguage(string language, string translation) public void TestLoadingLanguageForNonExistentKey() { //arrange - var engine = new LanguageEngine(); + LanguageEngine engine = new(); engine.LoadLanguage("es"); //act - var NONEXISTENT_KEY = "This is a nonexistent key thay should be returned as-is"; + string NONEXISTENT_KEY = "This is a nonexistent key thay should be returned as-is"; //assert Assert.Equal(NONEXISTENT_KEY, engine.Translate(NONEXISTENT_KEY)); } @@ -33,7 +33,7 @@ public void TestLoadingLanguageForNonExistentKey() [InlineData("ca", "Registre del UniGetUI", "UniGetUI (abans WingetUI)")] public void TestUniGetUIRefactoring(string language, string uniGetUILogTranslation, string uniGetUITranslation) { - var engine = new LanguageEngine(); + LanguageEngine engine = new(); engine.LoadLanguage(language); Assert.Equal(uniGetUILogTranslation, engine.Translate("WingetUI Log")); @@ -44,7 +44,7 @@ public void TestUniGetUIRefactoring(string language, string uniGetUILogTranslati [Fact] public void LocalFallbackTest() { - var engine = new LanguageEngine(); + LanguageEngine engine = new(); engine.LoadLanguage("random-nonexistent-language"); Assert.Equal("en", engine.Translate("locale")); } @@ -52,7 +52,7 @@ public void LocalFallbackTest() [Fact] public void TestStaticallyLoadedLanguages() { - var engine = new LanguageEngine(); + LanguageEngine engine = new(); engine.LoadLanguage("ca"); engine.LoadStaticTranslation(); Assert.Equal("Usuari | Local", CommonTranslations.ScopeNames[PackageScope.Local]); @@ -65,11 +65,11 @@ public void TestStaticallyLoadedLanguages() [Fact] public async Task TestDownloadUpdatedTranslationsAsync() { - var expected_file = Path.Join(CoreData.UniGetUICacheDirectory_Lang, "lang_ca.json"); + string expected_file = Path.Join(CoreData.UniGetUICacheDirectory_Lang, "lang_ca.json"); if (File.Exists(expected_file)) File.Delete(expected_file); - var engine = new LanguageEngine(); + LanguageEngine engine = new(); engine.LoadLanguage("ca"); await engine.DownloadUpdatedLanguageFile("ca"); diff --git a/src/UniGetUI.Core.LanguageEngine/LanguageData.cs b/src/UniGetUI.Core.LanguageEngine/LanguageData.cs index f05952ea4..f0170de8a 100644 --- a/src/UniGetUI.Core.LanguageEngine/LanguageData.cs +++ b/src/UniGetUI.Core.LanguageEngine/LanguageData.cs @@ -1,11 +1,10 @@ -using System; +using System.Collections.ObjectModel; using System.Runtime.InteropServices; using System.Text.Json.Nodes; +using UniGetUI.Core.Classes; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.PackageEngine.Enums; -using UniGetUI.Core.Classes; -using System.Collections.ObjectModel; namespace UniGetUI.Core.Language { @@ -68,13 +67,13 @@ private static ReadOnlyDictionary LoadLanguageReference() private static Person[] LoadLanguageTranslatorList() { - var JsonContents = File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "Translators.json")); + string JsonContents = File.ReadAllText(Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Data", "Translators.json")); JsonObject? TranslatorsInfo = JsonNode.Parse(JsonContents) as JsonObject; if (TranslatorsInfo == null) return []; List result = new(); - foreach (var langKey in TranslatorsInfo) + foreach (KeyValuePair langKey in TranslatorsInfo) { if (!LanguageReference.ContainsKey(langKey.Key)) { diff --git a/src/UniGetUI.Core.LanguageEngine/LanguageEngine.cs b/src/UniGetUI.Core.LanguageEngine/LanguageEngine.cs index e7a514577..42a0f9f89 100644 --- a/src/UniGetUI.Core.LanguageEngine/LanguageEngine.cs +++ b/src/UniGetUI.Core.LanguageEngine/LanguageEngine.cs @@ -62,7 +62,7 @@ public Dictionary LoadLanguageFile(string LangKey, bool ForceBun LangFileToLoad = Path.Join(CoreData.UniGetUIExecutableDirectory, "Assets", "Languages", "lang_" + LangKey + ".json"); } - var __LangDict = (JsonNode.Parse(File.ReadAllText(LangFileToLoad)) as JsonObject)?.ToDictionary(x => x.Key, x => x.Value != null ? x.Value.ToString() : ""); + Dictionary? __LangDict = (JsonNode.Parse(File.ReadAllText(LangFileToLoad)) as JsonObject)?.ToDictionary(x => x.Key, x => x.Value != null ? x.Value.ToString() : ""); if (__LangDict != null) LangDict = __LangDict; diff --git a/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs b/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs index ae29196c7..568f12031 100644 --- a/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs +++ b/src/UniGetUI.Core.Logging.Tests/LogEntryTests.cs @@ -5,19 +5,19 @@ public class LogEntryTests [Fact] public async Task TestLogEntry() { - var startTime = DateTime.Now; + DateTime startTime = DateTime.Now; await Task.Delay(100); - var logEntry1 = new LogEntry("Hello World", LogEntry.SeverityLevel.Info); + LogEntry logEntry1 = new("Hello World", LogEntry.SeverityLevel.Info); await Task.Delay(50); - var logEntry2 = new LogEntry("Hello World 2", LogEntry.SeverityLevel.Debug); + LogEntry logEntry2 = new("Hello World 2", LogEntry.SeverityLevel.Debug); await Task.Delay(50); - var logEntry3 = new LogEntry("Hello World 3", LogEntry.SeverityLevel.Error); + LogEntry logEntry3 = new("Hello World 3", LogEntry.SeverityLevel.Error); await Task.Delay(100); - var endTime = DateTime.Now; + DateTime endTime = DateTime.Now; Assert.Equal("Hello World", logEntry1.Content); Assert.Equal("Hello World 2", logEntry2.Content); diff --git a/src/UniGetUI.Core.Logging.Tests/LoggerTests.cs b/src/UniGetUI.Core.Logging.Tests/LoggerTests.cs index 4eb16996c..dc4dabde6 100644 --- a/src/UniGetUI.Core.Logging.Tests/LoggerTests.cs +++ b/src/UniGetUI.Core.Logging.Tests/LoggerTests.cs @@ -5,15 +5,15 @@ public class LoggerTests [Fact] public void TestLogger() { - var startTime = DateTime.Now; + DateTime startTime = DateTime.Now; Logger.Info("Hello World"); Logger.Debug("Hello World 2"); Logger.Error("Hello World 3"); Logger.Warn(new Exception("Test exception")); - var endTime = DateTime.Now; + DateTime endTime = DateTime.Now; - var logs = Logger.GetLogs(); + LogEntry[] logs = Logger.GetLogs(); Assert.Equal("Hello World", logs[0].Content); Assert.Equal("Hello World 2", logs[1].Content); diff --git a/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs b/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs index fd312c747..d0c7461c8 100644 --- a/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs +++ b/src/UniGetUI.Core.Tools.Tests/ToolsTests.cs @@ -1,4 +1,3 @@ -using System.Diagnostics; using UniGetUI.Core.Language; namespace UniGetUI.Core.Tools.Tests @@ -14,7 +13,7 @@ public class ToolsTests [InlineData("Add packages or open an existing bundle", true)] public void TranslateFunctionTester(string textEntry, bool TranslationExists) { - var langEngine = new LanguageEngine("fr"); + LanguageEngine langEngine = new("fr"); CoreTools.ReloadLanguageEngineInstance("fr"); Assert.Equal(CoreTools.Translate(textEntry), langEngine.Translate(textEntry)); @@ -30,7 +29,7 @@ public void TranslateFunctionTester(string textEntry, bool TranslationExists) [Fact] public async Task TestWhichFunctionForExistingFile() { - var result = await CoreTools.Which("cmd.exe"); + Tuple result = await CoreTools.Which("cmd.exe"); Assert.True(result.Item1); Assert.True(File.Exists(result.Item2)); } @@ -38,7 +37,7 @@ public async Task TestWhichFunctionForExistingFile() [Fact] public async Task TestWhichFunctionForNonExistingFile() { - var result = await CoreTools.Which("nonexistentfile.exe"); + Tuple result = await CoreTools.Which("nonexistentfile.exe"); Assert.False(result.Item1); Assert.Equal("", result.Item2); } @@ -70,9 +69,9 @@ public void TestFormatAsName(string id, string name) [InlineData(64)] public void TestRandomStringGenerator(int length) { - var string1 = CoreTools.RandomString(length); - var string2 = CoreTools.RandomString(length); - var string3 = CoreTools.RandomString(length); + string string1 = CoreTools.RandomString(length); + string string2 = CoreTools.RandomString(length); + string string3 = CoreTools.RandomString(length); Assert.Equal(string1.Length, length); Assert.Equal(string2.Length, length); Assert.Equal(string3.Length, length); @@ -97,7 +96,7 @@ public void TestRandomStringGenerator(int length) [InlineData("https://www.marticliment.com/wingetui/wingetui_size_test.txt", 460)] public async Task TestFileSizeLoader(string uri, long expectedSize) { - var size = await CoreTools.GetFileSizeAsync(uri != ""? new Uri(uri): null); + double size = await CoreTools.GetFileSizeAsync(uri != ""? new Uri(uri): null); Assert.Equal(expectedSize / 1048576, size); } diff --git a/src/UniGetUI.Core.Tools/Tools.cs b/src/UniGetUI.Core.Tools/Tools.cs index 3c80e459e..124e6b815 100644 --- a/src/UniGetUI.Core.Tools/Tools.cs +++ b/src/UniGetUI.Core.Tools/Tools.cs @@ -1,4 +1,4 @@ -using System; +using Jeffijoe.MessageFormat; using System.Diagnostics; using System.Globalization; using System.Net; @@ -6,16 +6,13 @@ using UniGetUI.Core.Data; using UniGetUI.Core.Language; using UniGetUI.Core.Logging; -using Jeffijoe.MessageFormat; -using System.ComponentModel.DataAnnotations; -using Windows.Media.Capture; namespace UniGetUI.Core.Tools { public static class CoreTools { - public static readonly HttpClientHandler HttpClientConfig = new HttpClientHandler() + public static readonly HttpClientHandler HttpClientConfig = new() { AutomaticDecompression = DecompressionMethods.All }; @@ -39,8 +36,8 @@ public static string Translate(string text, Dictionary dict) public static string Translate(string text, params object[] values) { - var dict = new Dictionary(); - foreach (var (item, index) in values.Select((item, index) => (item, index))) + Dictionary dict = new(); + foreach ((object item, int index) in values.Select((item, index) => (item, index))) { dict.Add(index.ToString(), item); } @@ -294,7 +291,7 @@ public static double GetVersionStringAsFloat(string Version) if (_ver != "" && _ver != ".") try { - var val = double.Parse(_ver, CultureInfo.InvariantCulture); + double val = double.Parse(_ver, CultureInfo.InvariantCulture); return val; } catch { } diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/ChocolateySourceProvider.cs b/src/UniGetUI.PackageEngine.Managers.Chocolatey/ChocolateySourceProvider.cs index 5453c27fe..209c613ce 100644 --- a/src/UniGetUI.PackageEngine.Managers.Chocolatey/ChocolateySourceProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.Chocolatey/ChocolateySourceProvider.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; using UniGetUI.Core.Logging; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Classes.Manager.Providers; diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs b/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs index 9b472f5ab..ed3e438f4 100644 --- a/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs +++ b/src/UniGetUI.PackageEngine.Managers.Dotnet/DotNet.cs @@ -1,22 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Net.Http; +using System.Diagnostics; using System.Runtime.InteropServices; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; -using UniGetUI.PackageEngine.Managers; -using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using UniGetUI.PackageEngine.PackageClasses; +using UniGetUI.PackageEngine.Enums; +using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.Managers.PowerShellManager; +using UniGetUI.PackageEngine.PackageClasses; namespace UniGetUI.PackageEngine.Managers.DotNetManager { @@ -58,7 +48,7 @@ public DotNet() : base() protected override async Task GetAvailableUpdates_UnSafe() { - var which_res = await CoreTools.Which("dotnet-tools-outdated.exe"); + Tuple which_res = await CoreTools.Which("dotnet-tools-outdated.exe"); string path = which_res.Item2; if (!which_res.Item1) { @@ -268,7 +258,7 @@ protected override async Task LoadManager() { ManagerStatus status = new(); - var which_res = await CoreTools.Which("dotnet.exe"); + Tuple which_res = await CoreTools.Which("dotnet.exe"); status.ExecutablePath = which_res.Item2; status.Found = which_res.Item1; diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs index 31ceec598..29bc8ffae 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGet.cs @@ -1,20 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; +using System.Net; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Enums; +using System.Web; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using System.Net; -using System.Web; namespace UniGetUI.PackageEngine.Managers.PowerShellManager { @@ -60,18 +51,18 @@ protected sealed override async Task FindPackages_UnSafe(string query else sources = new ManagerSource[] { Properties.DefaultSource }; - foreach(var source in sources) + foreach(ManagerSource source in sources) { - Uri SearchUrl = new Uri($"{source.Url}/Search()?searchTerm=%27{HttpUtility.UrlEncode(query)}%27&targetFramework=%27%27&includePrerelease=false"); + Uri SearchUrl = new($"{source.Url}/Search()?searchTerm=%27{HttpUtility.UrlEncode(query)}%27&targetFramework=%27%27&includePrerelease=false"); Logger.Debug($"Begin package search with url={SearchUrl} on manager {Name}"); ; - HttpClientHandler handler = new HttpClientHandler() + HttpClientHandler handler = new() { AutomaticDecompression = DecompressionMethods.All }; - using (HttpClient client = new HttpClient(handler)) + using (HttpClient client = new(handler)) { - var response = await client.GetAsync(SearchUrl); + HttpResponseMessage response = await client.GetAsync(SearchUrl); if (!response.IsSuccessStatusCode) { @@ -98,7 +89,7 @@ protected sealed override async Task FindPackages_UnSafe(string query AlreadyProcessedPackages[id] = new SearchResult { id = id, version = version, version_float = float_version }; } - foreach(var package in AlreadyProcessedPackages.Values) + foreach(SearchResult package in AlreadyProcessedPackages.Values) Packages.Add(new Package(CoreTools.FormatAsName(package.id), package.id, package.version, source, this)); } diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsProvider.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsProvider.cs index 543d75c00..efa384b88 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/BaseNuGetDetailsProvider.cs @@ -1,22 +1,12 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Net; -using System.Text; +using System.Net; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Xml.Linq; using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Classes.Manager.BaseProviders; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.Managers.Generic.NuGet.Internal; using UniGetUI.PackageEngine.PackageClasses; -using static UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers.ManagerSource; namespace UniGetUI.PackageEngine.Managers.PowerShellManager { @@ -102,14 +92,14 @@ protected override async Task GetPackageDetails_Unsafe(Package p protected override async Task GetPackageIcon_Unsafe(Package package) { - var PackageManifestContent = await PackageManifestLoader.GetPackageManifestContent(package); + string? PackageManifestContent = await PackageManifestLoader.GetPackageManifestContent(package); if (PackageManifestContent == null) { Logger.Warn($"No manifest content could be loaded for package {package.Id} on manager {package.Manager.Name}"); return null; } - var possibleIconUrl = Regex.Match(PackageManifestContent, "<(?:d\\:)?IconUrl>(.*)<(?:\\/d:)?IconUrl>"); + Match possibleIconUrl = Regex.Match(PackageManifestContent, "<(?:d\\:)?IconUrl>(.*)<(?:\\/d:)?IconUrl>"); if (!possibleIconUrl.Success) { @@ -128,16 +118,16 @@ protected override Task GetPackageScreenshots_Unsafe(Package package) protected override async Task GetPackageVersions_Unsafe(Package package) { - Uri SearchUrl = new Uri($"{package.Source.Url}/FindPackagesById()?id='{package.Id}'"); + Uri SearchUrl = new($"{package.Source.Url}/FindPackagesById()?id='{package.Id}'"); Logger.Debug($"Begin package version search with url={SearchUrl} on manager {Manager.Name}"); ; - HttpClientHandler handler = new HttpClientHandler() + HttpClientHandler handler = new() { AutomaticDecompression = DecompressionMethods.All }; - using (HttpClient client = new HttpClient(handler)) + using (HttpClient client = new(handler)) { - var response = await client.GetAsync(SearchUrl); + HttpResponseMessage response = await client.GetAsync(SearchUrl); if (!response.IsSuccessStatusCode) { @@ -148,8 +138,8 @@ protected override async Task GetPackageVersions_Unsafe(Package packag string SearchResults = await response.Content.ReadAsStringAsync(); MatchCollection matches = Regex.Matches(SearchResults, "Version='([^<>']+)'"); - List results = new List(); - HashSet alreadyProcessed = new HashSet(); + List results = new(); + HashSet alreadyProcessed = new(); foreach (Match match in matches) if(!alreadyProcessed.Contains(match.Groups[1].Value) && match.Success) diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/Internal/PackageManifestLoader.cs b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/Internal/PackageManifestLoader.cs index 62d2d329f..b48dbce62 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/Internal/PackageManifestLoader.cs +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/Internal/PackageManifestLoader.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; +using System.Net; using UniGetUI.Core.Logging; using UniGetUI.PackageEngine.PackageClasses; @@ -51,14 +45,14 @@ public static Uri GetPackageNuGetPackageUrl(Package package) try { - HttpClientHandler handler = new HttpClientHandler() + HttpClientHandler handler = new() { AutomaticDecompression = DecompressionMethods.All }; - using (HttpClient client = new HttpClient(handler)) + using (HttpClient client = new(handler)) { - var response = await client.GetAsync(PackageManifestUrl); + HttpResponseMessage response = await client.GetAsync(PackageManifestUrl); if (!response.IsSuccessStatusCode && package.Version.EndsWith(".0")) response = await client.GetAsync(new Uri(PackageManifestUrl.ToString().Replace(".0')", "')"))); diff --git a/src/UniGetUI.PackageEngine.Managers.Npm/Npm.cs b/src/UniGetUI.PackageEngine.Managers.Npm/Npm.cs index cc2793af0..ce46ad171 100644 --- a/src/UniGetUI.PackageEngine.Managers.Npm/Npm.cs +++ b/src/UniGetUI.PackageEngine.Managers.Npm/Npm.cs @@ -1,5 +1,4 @@ using System.Diagnostics; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; @@ -86,7 +85,7 @@ protected override async Task FindPackages_UnSafe(string query) protected override async Task GetAvailableUpdates_UnSafe() { List Packages = new(); - foreach (var scope in new PackageScope[] { PackageScope.Local, PackageScope.Global }) + foreach (PackageScope scope in new PackageScope[] { PackageScope.Local, PackageScope.Global }) { Process p = new(); p.StartInfo = new ProcessStartInfo() @@ -132,7 +131,7 @@ protected override async Task GetAvailableUpdates_UnSafe() protected override async Task GetInstalledPackages_UnSafe() { List Packages = new(); - foreach (var scope in new PackageScope[] { PackageScope.Local, PackageScope.Global }) + foreach (PackageScope scope in new PackageScope[] { PackageScope.Local, PackageScope.Global }) { Process p = new(); p.StartInfo = new ProcessStartInfo() @@ -194,7 +193,7 @@ public override OperationVeredict GetUninstallOperationVeredict(Package package, } public override string[] GetInstallParameters(Package package, InstallationOptions options) { - var parameters = GetUninstallParameters(package, options).ToList(); + List parameters = GetUninstallParameters(package, options).ToList(); parameters[0] = Properties.InstallVerb; if (options.Version != "") diff --git a/src/UniGetUI.PackageEngine.Managers.Npm/NpmPackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.Managers.Npm/NpmPackageDetailsProvider.cs index 38ef9f807..63c020530 100644 --- a/src/UniGetUI.PackageEngine.Managers.Npm/NpmPackageDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.Npm/NpmPackageDetailsProvider.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Diagnostics; using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI.PackageEngine.Managers.Pip/Pip.cs b/src/UniGetUI.PackageEngine.Managers.Pip/Pip.cs index 686f97d53..1da75a97e 100644 --- a/src/UniGetUI.PackageEngine.Managers.Pip/Pip.cs +++ b/src/UniGetUI.PackageEngine.Managers.Pip/Pip.cs @@ -1,7 +1,5 @@ using System.Diagnostics; -using System.Text.Json.Nodes; using System.Text.RegularExpressions; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; @@ -49,7 +47,7 @@ protected override async Task FindPackages_UnSafe(string query) { List Packages = new(); - var which_res = await CoreTools.Which("parse_pip_search"); + Tuple which_res = await CoreTools.Which("parse_pip_search"); string path = which_res.Item2; if (!which_res.Item1) { @@ -273,7 +271,7 @@ protected override async Task LoadManager() { ManagerStatus status = new(); - var which_res = await CoreTools.Which("python.exe"); + Tuple which_res = await CoreTools.Which("python.exe"); status.ExecutablePath = which_res.Item2; status.Found = which_res.Item1; diff --git a/src/UniGetUI.PackageEngine.Managers.Pip/PipPackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.Managers.Pip/PipPackageDetailsProvider.cs index 92f1554bb..fb6ea6e30 100644 --- a/src/UniGetUI.PackageEngine.Managers.Pip/PipPackageDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.Pip/PipPackageDetailsProvider.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Diagnostics; using System.Text.Json.Nodes; -using System.Threading.Tasks; using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs b/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs index b84407421..725750400 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell/PowerShell.cs @@ -1,18 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; +using System.Diagnostics; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; namespace UniGetUI.PackageEngine.Managers.PowerShellManager { diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs index 79906fdeb..d91073d72 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/Scoop.cs @@ -1,23 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; +using System.Diagnostics; using System.Runtime.InteropServices; -using System.Text.Json.Nodes; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Enums; using UniGetUI.Core.Logging; -using UniGetUI.Core.Tools; using UniGetUI.Core.SettingsEngine; -using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using static System.Runtime.InteropServices.JavaScript.JSType; -using Microsoft.VisualBasic; +using UniGetUI.PackageEngine.Enums; +using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.PackageEngine.PackageClasses; namespace UniGetUI.PackageEngine.Managers.ScoopManager { @@ -80,7 +70,7 @@ protected override async Task FindPackages_UnSafe(string query) { List Packages = new(); - var which_res = await CoreTools.Which("scoop-search.exe"); + Tuple which_res = await CoreTools.Which("scoop-search.exe"); string path = which_res.Item2; if (!which_res.Item1) { diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopPackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopPackageDetailsProvider.cs index dc3689de1..5b917f66d 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopPackageDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopPackageDetailsProvider.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Diagnostics; using System.Text.Json.Nodes; -using System.Threading.Tasks; -using System.Xml.Linq; using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopSourceProvider.cs b/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopSourceProvider.cs index 493429671..7448898cb 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopSourceProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/ScoopSourceProvider.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using System.Diagnostics; using System.Text.RegularExpressions; -using System.Threading.Tasks; using UniGetUI.Core.Logging; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Classes.Manager.Providers; diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs index 236bef0ff..6ca9fd827 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs @@ -1,20 +1,11 @@ -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; using System.Runtime.InteropServices; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.Core.Data; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Enums; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using Windows.Graphics.Display; namespace UniGetUI.PackageEngine.Managers.WingetManager @@ -410,7 +401,7 @@ protected override async Task LoadManager() { ManagerStatus status = new(); - var which_res = await CoreTools.Which("winget.exe"); + Tuple which_res = await CoreTools.Which("winget.exe"); status.ExecutablePath = which_res.Item2; status.Found = which_res.Item1; diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers.cs index ec0b85e1d..b1497db36 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetHelpers.cs @@ -1,20 +1,13 @@ using Microsoft.Management.Deployment; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Data; -using UniGetUI.PackageEngine.Classes; -using WindowsPackageManager.Interop; using UniGetUI.Core.Logging; -using Deployment = Microsoft.Management.Deployment; using UniGetUI.Core.Tools; -using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.PackageClasses; +using WindowsPackageManager.Interop; +using Deployment = Microsoft.Management.Deployment; namespace UniGetUI.PackageEngine.Managers.WingetManager { diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetPackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetPackageDetailsProvider.cs index cdb801b29..b0a736e3d 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetPackageDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetPackageDetailsProvider.cs @@ -1,24 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.Core.Data; +using Microsoft.Management.Deployment; +using System.Globalization; +using System.Net; +using System.Text.RegularExpressions; +using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; -using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Classes.Manager.BaseProviders; -using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUIManagers = UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Managers.WingetManager; using UniGetUI.PackageEngine.PackageClasses; -using Microsoft.Management.Deployment; -using UniGetUI.Core.IconEngine; -using System.Net.Http.Json; -using System.Text.RegularExpressions; -using System.Runtime.InteropServices; -using System.Net; -using System.Globalization; +using UniGetUIManagers = UniGetUI.PackageEngine.ManagerClasses.Manager; namespace UniGetUI.PackageEngine.Managers.WingetManager { @@ -59,11 +47,11 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag if (package.Source.Name != "msstore") return []; - var ResponseContent = await GetMicrosoftStorePackageManifest(package); + string? ResponseContent = await GetMicrosoftStorePackageManifest(package); if (ResponseContent == null) return []; - var IconArray = Regex.Match(ResponseContent, "(?:\"|')Images(?:\"|'): ?\\[([^\\]]+)\\]"); + Match IconArray = Regex.Match(ResponseContent, "(?:\"|')Images(?:\"|'): ?\\[([^\\]]+)\\]"); if (!IconArray.Success) { Logger.Warn($"Could not parse Images array from Microsoft Store response"); @@ -78,11 +66,11 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag if (!ImageEntry.Success) continue; - var ImagePurpose = Regex.Match(ImageEntry.Groups[1].Value, "(?:\"|')ImagePurpose(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); + Match ImagePurpose = Regex.Match(ImageEntry.Groups[1].Value, "(?:\"|')ImagePurpose(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); if (!ImagePurpose.Success || ImagePurpose.Groups[1].Value != "Screenshot") continue; - var ImageUrl = Regex.Match(ImageEntry.Groups[1].Value, "(?:\"|')Uri(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); + Match ImageUrl = Regex.Match(ImageEntry.Groups[1].Value, "(?:\"|')Uri(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); if (!ImageUrl.Success) continue; @@ -103,22 +91,22 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag string url = $"https://storeedgefd.dsx.mp.microsoft.com/v8.0/sdk/products?market={CountryCode}&locale={Locale}&deviceFamily=Windows.Desktop"; #pragma warning disable SYSLIB0014 - var httpRequest = (HttpWebRequest)WebRequest.Create(url); + HttpWebRequest httpRequest = (HttpWebRequest)WebRequest.Create(url); #pragma warning restore SYSLIB0014 httpRequest.Method = "POST"; httpRequest.ContentType = "application/json"; - var data = "{\"productIds\": \"" + package.Id.ToLower() + "\"}"; + string data = "{\"productIds\": \"" + package.Id.ToLower() + "\"}"; - using (var streamWriter = new StreamWriter(httpRequest.GetRequestStream())) + using (StreamWriter streamWriter = new(httpRequest.GetRequestStream())) { streamWriter.Write(data); } - var httpResponse = (HttpWebResponse)await httpRequest.GetResponseAsync(); + HttpWebResponse httpResponse = (HttpWebResponse)await httpRequest.GetResponseAsync(); string result; - using (var streamReader = new StreamReader(httpResponse.GetResponseStream())) + using (StreamReader streamReader = new(httpResponse.GetResponseStream())) { result = streamReader.ReadToEnd(); } @@ -131,11 +119,11 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag private async Task GetMicrosoftStorePackageIcon(Package package) { - var ResponseContent = await GetMicrosoftStorePackageManifest(package); + string? ResponseContent = await GetMicrosoftStorePackageManifest(package); if (ResponseContent == null) return null; - var IconArray = Regex.Match(ResponseContent, "(?:\"|')Images(?:\"|'): ?\\[([^\\]]+)\\]"); + Match IconArray = Regex.Match(ResponseContent, "(?:\"|')Images(?:\"|'): ?\\[([^\\]]+)\\]"); if (!IconArray.Success) { Logger.Warn($"Could not parse Images array from Microsoft Store response"); @@ -146,17 +134,17 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag foreach (Match ImageEntry in Regex.Matches(IconArray.Groups[1].Value, "{([^}]+)}")) { - var CurrentImage = ImageEntry.Groups[1].Value; + string CurrentImage = ImageEntry.Groups[1].Value; if (!ImageEntry.Success) continue; - var ImagePurpose = Regex.Match(CurrentImage, "(?:\"|')ImagePurpose(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); + Match ImagePurpose = Regex.Match(CurrentImage, "(?:\"|')ImagePurpose(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); if (!ImagePurpose.Success || ImagePurpose.Groups[1].Value != "Tile") continue; - var ImageUrl = Regex.Match(CurrentImage, "(?:\"|')Uri(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); - var ImageSize = Regex.Match(CurrentImage, "(?:\"|')Height(?:\"|'): ?([^,]+)"); + Match ImageUrl = Regex.Match(CurrentImage, "(?:\"|')Uri(?:\"|'): ?(?:\"|')([^'\"]+)(?:\"|')"); + Match ImageSize = Regex.Match(CurrentImage, "(?:\"|')Height(?:\"|'): ?([^,]+)"); if (!ImageUrl.Success || !ImageSize.Success) continue; @@ -187,8 +175,8 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag return null; } - var WinGetManager = ((NativeWinGetHelper)WinGetHelper.Instance).WinGetManager; - var Factory = ((NativeWinGetHelper)WinGetHelper.Instance).Factory; + Microsoft.Management.Deployment.PackageManager WinGetManager = ((NativeWinGetHelper)WinGetHelper.Instance).WinGetManager; + WindowsPackageManager.Interop.WindowsPackageManagerStandardFactory Factory = ((NativeWinGetHelper)WinGetHelper.Instance).Factory; // Find the native package for the given Package object PackageCatalogReference Catalog = WinGetManager.GetPackageCatalogByName(package.Source.Name); @@ -232,7 +220,7 @@ protected override async Task GetPackageScreenshots_Unsafe(Package packag CacheableIcon? Icon = null; - foreach (var icon in NativeDetails.Icons.ToArray()) + foreach (Icon? icon in NativeDetails.Icons.ToArray()) { Icon = new CacheableIcon(new Uri(icon.Url), icon.Sha256); Logger.Debug($"Found WinGet native icon for {package.Id} with URL={icon.Url}"); diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetSourceProvider.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetSourceProvider.cs index a8dd9dc83..a5672fc07 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetSourceProvider.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGetSourceProvider.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Classes.Manager.Providers; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; @@ -16,7 +11,7 @@ public WinGetSourceProvider(WinGet manager) : base(manager) { } public override string[] GetAddSourceParameters(ManagerSource source) { - var args = new List() { "source", "add", "--name", source.Name, "--arg", source.Url.ToString(), "--accept-source-agreements", "--disable-interactivity" }; + List args = new() { "source", "add", "--name", source.Name, "--arg", source.Url.ToString(), "--accept-source-agreements", "--disable-interactivity" }; if (source.Name != "winget") args.AddRange(new string[] { "--type", "Microsoft.Rest" }); return args.ToArray(); diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BasePackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BasePackageDetailsProvider.cs index 770006023..c86e592b4 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BasePackageDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BasePackageDetailsProvider.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.Core.Data; -using UniGetUI.Core.IconEngine; +using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.PackageEngine.Classes.Manager.Interfaces; using UniGetUI.PackageEngine.ManagerClasses.Manager; @@ -30,7 +24,7 @@ public async Task GetPackageVersions(Package package) { if (Manager.Capabilities.SupportsCustomVersions) { - var result = await GetPackageVersions_Unsafe(package); + string[] result = await GetPackageVersions_Unsafe(package); Logger.Debug($"Found {result.Length} versions for package Id={package.Id} on manager {Manager.Name}"); return result; } @@ -54,7 +48,7 @@ public async Task GetPackageVersions(Package package) if (Icon == null) { - var url = IconDatabase.Instance.GetIconUrlForId(package.GetIconId()); + string url = IconDatabase.Instance.GetIconUrlForId(package.GetIconId()); if(url != "") Icon = new CacheableIcon(new Uri(url), package.Version); } @@ -80,9 +74,9 @@ public async Task GetPackageScreenshotsUrl(Package package) Logger.Debug($"Manager {Manager.Name} does not support native screenshots"); if(URIs.Length == 0){ - var UrlArray = IconDatabase.Instance.GetScreenshotsUrlForId(package.Id); + string[] UrlArray = IconDatabase.Instance.GetScreenshotsUrlForId(package.Id); List UriList = new(); - foreach (var url in UrlArray) if (url != "") UriList.Add(new Uri(url)); + foreach (string url in UrlArray) if (url != "") UriList.Add(new Uri(url)); URIs = UriList.ToArray(); } Logger.Info($"Found {URIs.Length} screenshots for package Id={package.Id}"); diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BaseSourceProvider.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BaseSourceProvider.cs index e5d7b7f84..fb74411f2 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BaseSourceProvider.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/BaseProviders/BaseSourceProvider.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; -using UniGetUI.Core.Logging; -using UniGetUI.PackageEngine.Classes.Manager.Interfaces; +using UniGetUI.PackageEngine.Classes.Manager.Interfaces; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerCapabilities.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerCapabilities.cs index e4f2e9e39..8b6675474 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerCapabilities.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerCapabilities.cs @@ -1,9 +1,4 @@ using System.Runtime.InteropServices; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; namespace UniGetUI.PackageEngine.ManagerClasses.Manager diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerProperties.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerProperties.cs index a213f1d6f..84acb5ff7 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerProperties.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerProperties.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; namespace UniGetUI.PackageEngine.ManagerClasses.Manager { diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSource.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSource.cs index c126fc69c..8ea0a9a31 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSource.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSource.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.PackageEngine.ManagerClasses.Manager; namespace UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers { diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSourceFactory.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSourceFactory.cs index 62bd9bb5c..d891f8927 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSourceFactory.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerSourceFactory.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.PackageEngine.ManagerClasses.Manager; namespace UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers { diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerStatus.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerStatus.cs index 718b68805..ca9314997 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerStatus.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Classes/ManagerStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers +namespace UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers { public class ManagerStatus { diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/IPackageDetailsProvider.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/IPackageDetailsProvider.cs index b3aa60750..8239a78aa 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/IPackageDetailsProvider.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/IPackageDetailsProvider.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; -using UniGetUI.Core.IconEngine; -using UniGetUI.Core.Logging; +using UniGetUI.Core.IconEngine; using UniGetUI.PackageEngine.PackageClasses; namespace UniGetUI.PackageEngine.Classes.Manager.Interfaces diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/ISourceProvider.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/ISourceProvider.cs index fd5b49c1f..b4d3bb123 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/ISourceProvider.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/Interfaces/ISourceProvider.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; namespace UniGetUI.PackageEngine.Classes.Manager.Interfaces diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs index c9e214deb..45ce3207b 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Manager/PackageManager.cs @@ -1,5 +1,4 @@ -using System.ComponentModel; -using System.Diagnostics; +using System.Diagnostics; using System.Text.RegularExpressions; using UniGetUI.Core.Classes; using UniGetUI.Core.Data; @@ -362,7 +361,7 @@ public virtual async Task GetSources() try { AssertSourceCompatibility("GetSources"); - var result = await SourceProvider.GetSources().WaitAsync(TimeSpan.FromSeconds(60)); + ManagerSource[] result = await SourceProvider.GetSources().WaitAsync(TimeSpan.FromSeconds(60)); Logger.Debug($"Loaded {result.Length} sources for manager {Name}"); return result; } @@ -396,7 +395,7 @@ public async Task GetPackageDetails(Package package) try { AssertPackageDetailsCompatibility("GetPackageDetails"); - var details = await PackageDetailsProvider.GetPackageDetails(package); + PackageDetails details = await PackageDetailsProvider.GetPackageDetails(package); Logger.Info($"Loaded details for package {package.Id} on manager {Name}"); return details; } diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/InstallationOptions.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/InstallationOptions.cs index 04280b090..1b0360b7b 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/InstallationOptions.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/InstallationOptions.cs @@ -1,10 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; +using System.Runtime.InteropServices; using System.Text.Json; -using System.Threading.Tasks; using UniGetUI.Core.Data; using UniGetUI.Core.Language; using UniGetUI.Core.Logging; @@ -134,7 +129,7 @@ public void SaveOptionsToDisk() if (optionsFile.Directory?.Exists == false) optionsFile.Directory.Create(); - var fileContents = JsonSerializer.Serialize(Serialized()); + string fileContents = JsonSerializer.Serialize(Serialized()); File.WriteAllText(optionsFile.FullName, fileContents); } catch (Exception ex) @@ -155,7 +150,7 @@ public async Task SaveOptionsToDiskAsync() if (optionsFile.Directory?.Exists == false) optionsFile.Directory.Create(); - var fileContents = JsonSerializer.Serialize(Serialized()); + string fileContents = JsonSerializer.Serialize(Serialized()); await File.WriteAllTextAsync(optionsFile.FullName, fileContents); } catch (Exception ex) diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs index 3d03f9464..a14bf584b 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/Package.cs @@ -1,23 +1,15 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.IO; +using System.ComponentModel; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Text.Json; using System.Text.Json.Nodes; -using System.Threading.Tasks; using UniGetUI.Core.Data; +using UniGetUI.Core.IconEngine; +using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.Interface.Enums; -using UniGetUI.Core.Logging; -using UniGetUI.Core.IconEngine; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Classes.Packages; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Classes.Packages; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using Windows.UI.Composition; -using UniGetUI.Core.Classes; namespace UniGetUI.PackageEngine.PackageClasses { diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageDetails.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageDetails.cs index d0e89fa21..db171b31f 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageDetails.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageDetails.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; - -namespace UniGetUI.PackageEngine.PackageClasses +namespace UniGetUI.PackageEngine.PackageClasses { /// /// The properties of a given package. diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageFactory.cs b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageFactory.cs index c676cba57..8cbf9f580 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageFactory.cs +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/Packages/PackageFactory.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; namespace UniGetUI.PackageEngine.Classes.Packages @@ -61,7 +56,7 @@ public static Package GetInstalledPackageIfRepeated(Package p) if (!__available_packages.ContainsKey(p.Manager)) return null; - foreach (var package in __available_packages[p.Manager].Values) + foreach (Package package in __available_packages[p.Manager].Values) if (p.Equals(package)) return package; @@ -73,7 +68,7 @@ public static Package GetInstalledPackageIfRepeated(Package p) if (!__upgradable_packages.ContainsKey(p.Manager)) return null; - foreach (var package in __upgradable_packages[p.Manager].Values) + foreach (Package package in __upgradable_packages[p.Manager].Values) if (p.Equals(package)) return package; @@ -85,7 +80,7 @@ public static Package GetInstalledPackageIfRepeated(Package p) if(!__installed_packages.ContainsKey(p.Manager)) return null; - foreach (var package in __installed_packages[p.Manager].Values) + foreach (Package package in __installed_packages[p.Manager].Values) if (p.Equals(package)) return package; diff --git a/src/UniGetUI/App.xaml.cs b/src/UniGetUI/App.xaml.cs index c3ea352f4..c2dfb164c 100644 --- a/src/UniGetUI/App.xaml.cs +++ b/src/UniGetUI/App.xaml.cs @@ -1,38 +1,26 @@ -using CommunityToolkit.WinUI.Notifications; +using CommunityToolkit.WinUI.Helpers; +using CommunityToolkit.WinUI.Notifications; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using UniGetUI.Core; +using System.Diagnostics; +using System.Globalization; +using System.Security.Cryptography; using UniGetUI.Core.Data; using UniGetUI.Core.IconEngine; -using UniGetUI.Interface; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Managers; -using Windows.Foundation.Collections; using UniGetUI.Core.Logging; -using UniGetUI.Core.Tools; using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; +using UniGetUI.Interface; using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Managers.ScoopManager; -using UniGetUI.PackageEngine.Managers.WingetManager; using UniGetUI.PackageEngine.Managers.ChocolateyManager; -using UniGetUI.PackageEngine.Managers.PowerShellManager; using UniGetUI.PackageEngine.Managers.DotNetManager; -using UniGetUI.PackageEngine.Managers.PipManager; using UniGetUI.PackageEngine.Managers.NpmManager; -using System.Diagnostics; -using System.Globalization; -using System.Security.Cryptography; -using System.Net.Http; -using System.ComponentModel; +using UniGetUI.PackageEngine.Managers.PipManager; +using UniGetUI.PackageEngine.Managers.PowerShellManager; +using UniGetUI.PackageEngine.Managers.ScoopManager; +using UniGetUI.PackageEngine.Managers.WingetManager; using UniGetUI.PackageEngine.Operations; -using System.ComponentModel.Design; -using CommunityToolkit.WinUI.Helpers; -using Windows.ApplicationModel.Email.DataProvider; +using Windows.Foundation.Collections; namespace UniGetUI { @@ -128,7 +116,7 @@ private async void LoadGSudo() { if (Settings.Get("UseUserGSudo")) { - var gsudo_result = await CoreTools.Which("gsudo.exe"); + Tuple gsudo_result = await CoreTools.Which("gsudo.exe"); if (gsudo_result.Item1 != false) { Logger.Info($"Using System GSudo at {gsudo_result.Item2}"); diff --git a/src/UniGetUI/EntryPoint.cs b/src/UniGetUI/EntryPoint.cs index 27fd4bf05..b4385a876 100644 --- a/src/UniGetUI/EntryPoint.cs +++ b/src/UniGetUI/EntryPoint.cs @@ -1,12 +1,6 @@ using CommunityToolkit.WinUI.Notifications; using Microsoft.UI.Dispatching; using Microsoft.Windows.AppLifecycle; -using System; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; @@ -47,7 +41,7 @@ static async Task AsyncMain(string[] args) { try { - var textart = @" + string textart = @" __ __ _ ______ __ __ ______ / / / /___ (_) ____/__ / /_/ / / / _/ / / / / __ \/ / / __/ _ \/ __/ / / // / diff --git a/src/UniGetUI/Interface/BackgroundApi.cs b/src/UniGetUI/Interface/BackgroundApi.cs index 1e7887160..1a1021f63 100644 --- a/src/UniGetUI/Interface/BackgroundApi.cs +++ b/src/UniGetUI/Interface/BackgroundApi.cs @@ -1,12 +1,6 @@ using Nancy; using Nancy.Hosting.Self; -using System; -using System.Drawing; -using System.Text; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Data; -using UniGetUI.Core.IconEngine; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/Interface/Dialogs/AboutUniGetUI.xaml.cs b/src/UniGetUI/Interface/Dialogs/AboutUniGetUI.xaml.cs index 39e97c4d7..1fca5e29d 100644 --- a/src/UniGetUI/Interface/Dialogs/AboutUniGetUI.xaml.cs +++ b/src/UniGetUI/Interface/Dialogs/AboutUniGetUI.xaml.cs @@ -1,7 +1,5 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Animation; -using UniGetUI.Core; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.Interface.Pages.AboutPages; diff --git a/src/UniGetUI/Interface/Dialogs/IgnoredUpdates.xaml.cs b/src/UniGetUI/Interface/Dialogs/IgnoredUpdates.xaml.cs index 224758d75..8f3a34b5f 100644 --- a/src/UniGetUI/Interface/Dialogs/IgnoredUpdates.xaml.cs +++ b/src/UniGetUI/Interface/Dialogs/IgnoredUpdates.xaml.cs @@ -1,18 +1,11 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Input; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; using System.Text.Json.Nodes; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Data; -using UniGetUI.PackageEngine.Classes; using UniGetUI.Core.Logging; -using UniGetUI.Interface.Enums; using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; @@ -67,7 +60,7 @@ public async Task UpdateData() private async void IgnoredUpdatesList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e) { - var package = IgnoredUpdatesList.SelectedItem as IgnoredPackage; + IgnoredPackage? package = IgnoredUpdatesList.SelectedItem as IgnoredPackage; if (package != null) await package.RemoveFromIgnoredUpdates(); } diff --git a/src/UniGetUI/Interface/Dialogs/InstallOptions.xaml.cs b/src/UniGetUI/Interface/Dialogs/InstallOptions.xaml.cs index 6aad5df7e..4d8faa242 100644 --- a/src/UniGetUI/Interface/Dialogs/InstallOptions.xaml.cs +++ b/src/UniGetUI/Interface/Dialogs/InstallOptions.xaml.cs @@ -1,18 +1,10 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Linq; using System.Runtime.InteropServices; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Operations; using UniGetUI.Core.Language; -using UniGetUI.Core.Logging; +using UniGetUI.Core.Tools; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.Core.Tools; -using CommunityToolkit.WinUI.Controls; // 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/Interface/Dialogs/ReleaseNotes.xaml.cs b/src/UniGetUI/Interface/Dialogs/ReleaseNotes.xaml.cs index ce58e04be..816ea9c06 100644 --- a/src/UniGetUI/Interface/Dialogs/ReleaseNotes.xaml.cs +++ b/src/UniGetUI/Interface/Dialogs/ReleaseNotes.xaml.cs @@ -1,8 +1,5 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Threading.Tasks; -using UniGetUI.Core.Logging; using UniGetUI.Core.Data; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Interface/MainView.xaml.cs b/src/UniGetUI/Interface/MainView.xaml.cs index 813e73fe1..eab2a1b88 100644 --- a/src/UniGetUI/Interface/MainView.xaml.cs +++ b/src/UniGetUI/Interface/MainView.xaml.cs @@ -3,28 +3,17 @@ using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; using Microsoft.UI.Xaml.Documents; -using Microsoft.UI.Xaml.Media.Imaging; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using UniGetUI.Core; +using Microsoft.UI.Xaml.Media; using UniGetUI.Core.Data; +using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; using UniGetUI.Interface.Dialogs; using UniGetUI.Interface.Pages; +using UniGetUI.Interface.SoftwarePages; using UniGetUI.Interface.Widgets; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Operations; -using UniGetUI.Core.Logging; -using Windows.UI.Core; -using UniGetUI.Core.SettingsEngine; -using UniGetUI.PackageEngine.PackageClasses; -using System.Reflection.Emit; using UniGetUI.PackageEngine.Enums; -using UniGetUI.Core.Tools; -using UniGetUI.Interface.SoftwarePages; -using UniGetUI; -using Microsoft.UI.Xaml.Media; -using Windows.ApplicationModel.VoiceCommands; +using UniGetUI.PackageEngine.PackageClasses; +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. @@ -169,7 +158,7 @@ private void SettingsNavButton_Click(object sender, NavButton.NavButtonEventArgs private async void AboutNavButton_Click(object sender, NavButton.NavButtonEventArgs e) { ContentDialog? AboutDialog = new(); - var AboutPage = new AboutUniGetUI(); + AboutUniGetUI AboutPage = new(); AboutDialog.Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style; AboutDialog.XamlRoot = XamlRoot; AboutDialog.Resources["ContentDialogMaxWidth"] = 1200; @@ -199,7 +188,7 @@ public async Task ManageIgnoredUpdatesDialog() UpdatesDialog.PrimaryButtonText = CoreTools.Translate("Reset"); UpdatesDialog.DefaultButton = ContentDialogButton.Secondary; UpdatesDialog.Title = CoreTools.Translate("Manage ignored updates"); - var IgnoredUpdatesPage = new IgnoredUpdatesManager(); + IgnoredUpdatesManager IgnoredUpdatesPage = new(); UpdatesDialog.PrimaryButtonClick += IgnoredUpdatesPage.ManageIgnoredUpdates_SecondaryButtonClick; UpdatesDialog.Content = IgnoredUpdatesPage; IgnoredUpdatesPage.Close += (s, e) => { UpdatesDialog.Hide(); }; @@ -232,7 +221,7 @@ public async Task ShowOperationFailedDialog( grid.RowDefinitions.Add(new RowDefinition() { Height = GridLength.Auto }); grid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1, GridUnitType.Star) }); - var headerContent = new TextBlock() + TextBlock headerContent = new() { TextWrapping = TextWrapping.WrapWholeWords, Text = $"{shortDescription}. " @@ -272,7 +261,7 @@ public async Task ShowOperationFailedDialog( VerticalAlignment = VerticalAlignment.Stretch, }; - Grid OutputGrid = new Grid(); + Grid OutputGrid = new(); OutputGrid.Children.Add(ScrollView); OutputGrid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(1, GridUnitType.Star) }); OutputGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(1, GridUnitType.Star) }); diff --git a/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml.cs b/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml.cs index 4cc9212a9..a24723d77 100644 --- a/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml.cs +++ b/src/UniGetUI/Interface/Pages/AboutPages/AboutUniGetUI.xaml.cs @@ -1,6 +1,4 @@ using Microsoft.UI.Xaml.Controls; -using UniGetUI.Core; -using UniGetUI.Core.Logging; using UniGetUI.Core.Data; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/Interface/Pages/AboutPages/Contributors.xaml.cs b/src/UniGetUI/Interface/Pages/AboutPages/Contributors.xaml.cs index 2fea8248f..ad5ef2d33 100644 --- a/src/UniGetUI/Interface/Pages/AboutPages/Contributors.xaml.cs +++ b/src/UniGetUI/Interface/Pages/AboutPages/Contributors.xaml.cs @@ -1,8 +1,7 @@ using Microsoft.UI.Xaml.Controls; -using System; using System.Collections.ObjectModel; -using UniGetUI.Core.Data; using UniGetUI.Core.Classes; +using UniGetUI.Core.Data; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -13,7 +12,7 @@ namespace UniGetUI.Interface.Pages.AboutPages /// An empty page that can be used on its own or navigated to within a Frame. /// /// - + public sealed partial class Contributors : Page { diff --git a/src/UniGetUI/Interface/Pages/AboutPages/ThirdPartyLicenses.xaml.cs b/src/UniGetUI/Interface/Pages/AboutPages/ThirdPartyLicenses.xaml.cs index 2983fe220..1518f0c2a 100644 --- a/src/UniGetUI/Interface/Pages/AboutPages/ThirdPartyLicenses.xaml.cs +++ b/src/UniGetUI/Interface/Pages/AboutPages/ThirdPartyLicenses.xaml.cs @@ -1,7 +1,5 @@ using Microsoft.UI.Xaml.Controls; -using System; using System.Collections.ObjectModel; -using UniGetUI.Core; using UniGetUI.Core.Data; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/Interface/Pages/AboutPages/Translators.xaml.cs b/src/UniGetUI/Interface/Pages/AboutPages/Translators.xaml.cs index cb293f867..a0051220d 100644 --- a/src/UniGetUI/Interface/Pages/AboutPages/Translators.xaml.cs +++ b/src/UniGetUI/Interface/Pages/AboutPages/Translators.xaml.cs @@ -1,12 +1,7 @@ using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Text.Json.Nodes; -using UniGetUI.Core; -using UniGetUI.Core.Language; -using UniGetUI.Core.Logging; using UniGetUI.Core.Classes; +using UniGetUI.Core.Language; // 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/Interface/Pages/HelpPage.xaml.cs b/src/UniGetUI/Interface/Pages/HelpPage.xaml.cs index 4524fafa8..ecd745960 100644 --- a/src/UniGetUI/Interface/Pages/HelpPage.xaml.cs +++ b/src/UniGetUI/Interface/Pages/HelpPage.xaml.cs @@ -1,9 +1,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; using System.Diagnostics; -using UniGetUI.Core.Logging; -using System.Threading.Tasks; // 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/Interface/Pages/LogPage.xaml.cs b/src/UniGetUI/Interface/Pages/LogPage.xaml.cs index 917c32f0c..0eebd1ebf 100644 --- a/src/UniGetUI/Interface/Pages/LogPage.xaml.cs +++ b/src/UniGetUI/Interface/Pages/LogPage.xaml.cs @@ -1,25 +1,16 @@ +using ExternalLibraries.Clipboard; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Documents; -using System; -using System.Collections.Generic; +using Microsoft.UI.Xaml.Media; using System.Diagnostics; -using System.IO; -using UniGetUI.Core; using UniGetUI.Core.Data; -using ExternalLibraries.Clipboard; using UniGetUI.Core.Logging; -using Windows.Storage; -using Windows.Storage.Pickers; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; -using System.Linq; -using Windows.UI.WebUI; -using Microsoft.UI.Xaml.Media; -using Windows.Media.Playback; +using Windows.Storage; +using Windows.Storage.Pickers; using Windows.UI; -using CommunityToolkit.WinUI.Controls; -using CommunityToolkit.WinUI.Helpers; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -91,11 +82,11 @@ public void LoadLog() bool IS_DARK = MainApp.Instance.ThemeListener.CurrentTheme == ApplicationTheme.Dark; - var logs = Logger.GetLogs(); + LogEntry[] logs = Logger.GetLogs(); LogTextBox.Blocks.Clear(); - foreach (var log_entry in logs) + foreach (LogEntry log_entry in logs) { - var p = new Paragraph(); + Paragraph p = new(); if (log_entry.Content == "") continue; @@ -133,9 +124,9 @@ public void LoadLog() break; } - var lines = log_entry.Content.Split('\n'); - var date_length = -1; - foreach(var line in lines) + string[] lines = log_entry.Content.Split('\n'); + int date_length = -1; + foreach(string line in lines) if (date_length == -1) { p.Inlines.Add(new Run { Text = $"[{log_entry.Time}] {line}\n", Foreground = color }); diff --git a/src/UniGetUI/Interface/Pages/PackageDetailsPage.xaml.cs b/src/UniGetUI/Interface/Pages/PackageDetailsPage.xaml.cs index fd96a5f2a..d8eefbb05 100644 --- a/src/UniGetUI/Interface/Pages/PackageDetailsPage.xaml.cs +++ b/src/UniGetUI/Interface/Pages/PackageDetailsPage.xaml.cs @@ -1,30 +1,18 @@ 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 System; using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.Core.Data; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Operations; using UniGetUI.Core.Logging; +using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Enums; +using UniGetUI.PackageEngine.Operations; +using UniGetUI.PackageEngine.PackageClasses; using Windows.Storage; using Windows.Storage.Pickers; -using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.Core.Tools; -using UniGetUI.Core.IconEngine; -using Microsoft.UI.Xaml.Documents; -using Microsoft.UI.Text; -using Windows.UI.Text; -using System.Linq.Expressions; -using System.Runtime.CompilerServices; -using Microsoft.UI.Xaml.Media; 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. @@ -272,7 +260,7 @@ public async void LoadIcon() public async void LoadScreenshots() { - var screenshots = await Package.GetPackageScreenshots(); + Uri[] screenshots = await Package.GetPackageScreenshots(); PackageHasScreenshots = screenshots.Count() > 0; if (PackageHasScreenshots) { @@ -334,7 +322,7 @@ public async void DownloadInstallerButton_Click(object sender, RoutedEventArgs e StorageFile file = await savePicker.PickSaveFileAsync(); if (file != null) { - var loader = async () => + Func loader = async () => { List texts = [ "[≡≡≡≡ ]", @@ -344,7 +332,7 @@ public async void DownloadInstallerButton_Click(object sender, RoutedEventArgs e "[ ≡≡≡≡]", "[≡≡ ≡≡]"]; int i = 0; - var baseString = CoreTools.Translate("Downloading installer for {package}", new Dictionary { { "package", Package.Name } }); + string baseString = CoreTools.Translate("Downloading installer for {package}", new Dictionary { { "package", Package.Name } }); while (running) { DownloadInstaller_Button.Inlines.Clear(); diff --git a/src/UniGetUI/Interface/Pages/SettingsPage.xaml.cs b/src/UniGetUI/Interface/Pages/SettingsPage.xaml.cs index ef5d25fb8..f2e1aa06a 100644 --- a/src/UniGetUI/Interface/Pages/SettingsPage.xaml.cs +++ b/src/UniGetUI/Interface/Pages/SettingsPage.xaml.cs @@ -1,22 +1,16 @@ using CommunityToolkit.WinUI.Controls; +using ExternalLibraries.Clipboard; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Newtonsoft.Json; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Linq; -using UniGetUI.Core; using UniGetUI.Core.Data; -using ExternalLibraries.Clipboard; -using UniGetUI.Interface.Widgets; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.Core.Logging; using UniGetUI.Core.Language; -using UniGetUI.Core.Tools; +using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; +using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine.ManagerClasses.Manager; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml.cs b/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml.cs index 705fb3d5d..f86193ac9 100644 --- a/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml.cs +++ b/src/UniGetUI/Interface/SoftwarePages/AbstractPackagesPage.xaml.cs @@ -1,28 +1,20 @@ -using CommunityToolkit.WinUI.Notifications; using Microsoft.UI.Input; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Classes; -using UniGetUI.Core.Data; -using UniGetUI.Interface.Enums; -using UniGetUI.Interface.Widgets; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.PackageEngine.Operations; using UniGetUI.Core.Logging; -using Windows.UI.Core; using UniGetUI.Core.SettingsEngine; -using UniGetUI.PackageEngine.PackageClasses; +using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; +using UniGetUI.Interface.Widgets; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Operations; +using UniGetUI.PackageEngine.PackageClasses; +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. @@ -259,7 +251,7 @@ public AbstractPackagesPage() } else if (e.Key == Windows.System.VirtualKey.Space && PackageList.SelectedItem != null) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if(package != null) package.IsChecked = !package.IsChecked; } diff --git a/src/UniGetUI/Interface/SoftwarePages/NewDiscoverSoftwarePage.cs b/src/UniGetUI/Interface/SoftwarePages/NewDiscoverSoftwarePage.cs index d27e0d051..b377173f7 100644 --- a/src/UniGetUI/Interface/SoftwarePages/NewDiscoverSoftwarePage.cs +++ b/src/UniGetUI/Interface/SoftwarePages/NewDiscoverSoftwarePage.cs @@ -1,10 +1,5 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; using UniGetUI.Interface.Enums; @@ -24,9 +19,9 @@ public class NewDiscoverSoftwarePage : AbstractPackagesPage public override BetterMenu GenerateContextMenu() { - BetterMenu menu = new BetterMenu(); + BetterMenu menu = new(); - var menuInstall = new BetterMenuItem + BetterMenuItem menuInstall = new() { Text = "Install", IconName = "newversion", @@ -37,7 +32,7 @@ public override BetterMenu GenerateContextMenu() menu.Items.Add(new MenuFlyoutSeparator { Height = 5 }); - var menuInstallSettings = new BetterMenuItem + BetterMenuItem menuInstallSettings = new() { Text = "Installation options", IconName = "options", @@ -74,7 +69,7 @@ public override BetterMenu GenerateContextMenu() menu.Items.Add(new MenuFlyoutSeparator { Height = 5 }); - var menuShare = new BetterMenuItem + BetterMenuItem menuShare = new() { Text = "Share this package", IconName = "share" @@ -82,7 +77,7 @@ public override BetterMenu GenerateContextMenu() menuShare.Click += MenuShare_Invoked; menu.Items.Add(menuShare); - var menuDetails = new BetterMenuItem + BetterMenuItem menuDetails = new() { Text = "Package details", IconName = "info", @@ -269,7 +264,7 @@ protected override async Task IsPackageValid(Package package) protected override Task LoadPackagesFromManager(PackageManager manager) { - var text = QueryBlock.Text; + string text = QueryBlock.Text; text = CoreTools.EnsureSafeQueryString(text); if (text == string.Empty) return new Task(() => { return []; }); @@ -332,7 +327,7 @@ private void MenuShare_Invoked(object sender, RoutedEventArgs e) private void MenuInstall_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new InstallPackageOperation(package)); @@ -340,7 +335,7 @@ private void MenuInstall_Invoked(object sender, RoutedEventArgs e) private void MenuSkipHash_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new InstallPackageOperation(package, @@ -349,7 +344,7 @@ private void MenuSkipHash_Invoked(object sender, RoutedEventArgs e) private void MenuInteractive_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new InstallPackageOperation(package, @@ -358,7 +353,7 @@ private void MenuInteractive_Invoked(object sender, RoutedEventArgs e) private void MenuAsAdmin_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new InstallPackageOperation(package, diff --git a/src/UniGetUI/Interface/SoftwarePages/NewInstalledPackagesPage.cs b/src/UniGetUI/Interface/SoftwarePages/NewInstalledPackagesPage.cs index 2bdc2cd04..c39464667 100644 --- a/src/UniGetUI/Interface/SoftwarePages/NewInstalledPackagesPage.cs +++ b/src/UniGetUI/Interface/SoftwarePages/NewInstalledPackagesPage.cs @@ -1,10 +1,5 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; @@ -29,8 +24,8 @@ public class NewInstalledPackagesPage : AbstractPackagesPage public override BetterMenu GenerateContextMenu() { - BetterMenu menu = new BetterMenu(); - var menuUninstall = new BetterMenuItem + BetterMenu menu = new(); + BetterMenuItem menuUninstall = new() { Text = "Uninstall", IconName = "trash", @@ -41,7 +36,7 @@ public override BetterMenu GenerateContextMenu() menu.Items.Add(new MenuFlyoutSeparator { Height = 5 }); - var menuInstallSettings = new BetterMenuItem + BetterMenuItem menuInstallSettings = new() { Text = "Installation options", IconName = "options", @@ -78,7 +73,7 @@ public override BetterMenu GenerateContextMenu() menu.Items.Add(new MenuFlyoutSeparator()); - var menuReinstall = new BetterMenuItem + BetterMenuItem menuReinstall = new() { Text = "Reinstall package", IconName = "newversion" @@ -86,7 +81,7 @@ public override BetterMenu GenerateContextMenu() menuReinstall.Click += MenuReinstall_Invoked; menu.Items.Add(menuReinstall); - var menuUninstallThenReinstall = new BetterMenuItem + BetterMenuItem menuUninstallThenReinstall = new() { Text = "Uninstall package, then reinstall it", IconName = "undelete" @@ -96,7 +91,7 @@ public override BetterMenu GenerateContextMenu() menu.Items.Add(new MenuFlyoutSeparator()); - var menuIgnorePackage = new BetterMenuItem + BetterMenuItem menuIgnorePackage = new() { Text = "Ignore updates for this package", IconName = "pin" @@ -106,7 +101,7 @@ public override BetterMenu GenerateContextMenu() menu.Items.Add(new MenuFlyoutSeparator()); - var menuShare = new BetterMenuItem + BetterMenuItem menuShare = new() { Text = "Share this package", IconName = "share" @@ -114,7 +109,7 @@ public override BetterMenu GenerateContextMenu() menuShare.Click += MenuShare_Invoked; menu.Items.Add(menuShare); - var menuDetails = new BetterMenuItem + BetterMenuItem menuDetails = new() { Text = "Package details", IconName = "info", @@ -429,7 +424,7 @@ public async Task BackupPackages() private void MenuUninstall_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; ConfirmAndUninstall(package, new InstallationOptions(package)); @@ -437,7 +432,7 @@ private void MenuUninstall_Invoked(object sender, RoutedEventArgs args) private void MenuAsAdmin_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; ConfirmAndUninstall(package, new InstallationOptions(package) { RunAsAdministrator = true }); @@ -445,7 +440,7 @@ private void MenuAsAdmin_Invoked(object sender, RoutedEventArgs args) private void MenuInteractive_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; ConfirmAndUninstall(package, @@ -454,7 +449,7 @@ private void MenuInteractive_Invoked(object sender, RoutedEventArgs args) private void MenuRemoveData_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; ConfirmAndUninstall(package, @@ -463,7 +458,7 @@ private void MenuRemoveData_Invoked(object sender, RoutedEventArgs args) private void MenuReinstall_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new InstallPackageOperation(package)); @@ -471,7 +466,7 @@ private void MenuReinstall_Invoked(object sender, RoutedEventArgs args) private void MenuUninstallThenReinstall_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UninstallPackageOperation(package, IgnoreParallelInstalls: true)); @@ -480,7 +475,7 @@ private void MenuUninstallThenReinstall_Invoked(object sender, RoutedEventArgs a } private void MenuIgnorePackage_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; _ = package.AddToIgnoredUpdatesAsync(); @@ -501,7 +496,7 @@ private void MenuDetails_Invoked(object sender, RoutedEventArgs args) private async void MenuInstallSettings_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (package != null && await MainApp.Instance.MainWindow.NavigationPage.ShowInstallationSettingsForPackageAndContinue(package, OperationType.Uninstall)) { diff --git a/src/UniGetUI/Interface/SoftwarePages/NewSoftwareUpdatesPage.cs b/src/UniGetUI/Interface/SoftwarePages/NewSoftwareUpdatesPage.cs index 2f9e27ab9..016c89e9b 100644 --- a/src/UniGetUI/Interface/SoftwarePages/NewSoftwareUpdatesPage.cs +++ b/src/UniGetUI/Interface/SoftwarePages/NewSoftwareUpdatesPage.cs @@ -1,12 +1,6 @@ using CommunityToolkit.WinUI.Notifications; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Media.Imaging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using UniGetUI.Core.Data; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; @@ -50,9 +44,9 @@ public override void GenerateUIText() public override BetterMenu GenerateContextMenu() { - BetterMenu ContextMenu = new BetterMenu(); + BetterMenu ContextMenu = new(); - var menuInstall = new BetterMenuItem() + BetterMenuItem menuInstall = new() { Text = "Update", IconName="menu_updates", @@ -60,7 +54,7 @@ public override BetterMenu GenerateContextMenu() }; menuInstall.Click += MenuInstall_Invoked; - var menuInstallSettings = new BetterMenuItem() + BetterMenuItem menuInstallSettings = new() { Text = "Installation options", IconName="options", @@ -89,14 +83,14 @@ public override BetterMenu GenerateContextMenu() }; MenuskipHash.Click += MenuSkipHash_Invoked; - var menuUpdateAfterUninstall = new BetterMenuItem() + BetterMenuItem menuUpdateAfterUninstall = new() { Text = "Uninstall package, then update it", IconName="undelete", }; menuUpdateAfterUninstall.Click += MenuUpdateAfterUninstall_Invoked; - var menuUninstall = new BetterMenuItem() + BetterMenuItem menuUninstall = new() { Text = "Uninstall package", IconName="trash", @@ -104,28 +98,28 @@ public override BetterMenu GenerateContextMenu() menuUninstall.Click += MenuUninstall_Invoked; - var menuIgnorePackage = new BetterMenuItem() + BetterMenuItem menuIgnorePackage = new() { Text = "Ignore updates for this package", IconName="pin", }; menuIgnorePackage.Click += MenuIgnorePackage_Invoked; - var menuSkipVersion = new BetterMenuItem() + BetterMenuItem menuSkipVersion = new() { Text = "Skip this version", IconName="skip", }; menuSkipVersion.Click += MenuSkipVersion_Invoked; - var menuShare = new BetterMenuItem() + BetterMenuItem menuShare = new() { Text = "Share this package", IconName="share", }; menuShare.Click += (o, e) => { SharePackage(PackageList.SelectedItem as Package); }; - var menuDetails = new BetterMenuItem() + BetterMenuItem menuDetails = new() { Text = "Package details", IconName="info", @@ -458,7 +452,7 @@ protected override async Task WhenPackagesLoaded(ReloadReason reason) private void MenuInstall_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UpdatePackageOperation(package)); @@ -466,7 +460,7 @@ private void MenuInstall_Invoked(object sender, RoutedEventArgs e) private void MenuSkipHash_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UpdatePackageOperation(package, @@ -475,7 +469,7 @@ private void MenuSkipHash_Invoked(object sender, RoutedEventArgs e) private void MenuInteractive_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UpdatePackageOperation(package, @@ -484,7 +478,7 @@ private void MenuInteractive_Invoked(object sender, RoutedEventArgs e) private void MenuAsAdmin_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UpdatePackageOperation(package, @@ -493,7 +487,7 @@ private void MenuAsAdmin_Invoked(object sender, RoutedEventArgs e) private void MenuUpdateAfterUninstall_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UninstallPackageOperation(package, IgnoreParallelInstalls: true)); @@ -502,7 +496,7 @@ private void MenuUpdateAfterUninstall_Invoked(object sender, RoutedEventArgs e) private void MenuUninstall_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; MainApp.Instance.AddOperationToList(new UninstallPackageOperation(package)); @@ -510,7 +504,7 @@ private void MenuUninstall_Invoked(object sender, RoutedEventArgs e) private void MenuIgnorePackage_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; _ = package.AddToIgnoredUpdatesAsync(); @@ -519,7 +513,7 @@ private void MenuIgnorePackage_Invoked(object sender, RoutedEventArgs e) private void MenuSkipVersion_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as Package; + Package? package = PackageList.SelectedItem as Package; if (!Initialized || package == null) return; _ = package.AddToIgnoredUpdatesAsync((package).NewVersion); diff --git a/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml.cs b/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml.cs index b2f2b1b49..f1e59cf54 100644 --- a/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml.cs +++ b/src/UniGetUI/Interface/SoftwarePages/PackageBundle.xaml.cs @@ -1,31 +1,25 @@ +using ExternalLibraries.Pickers; using Microsoft.UI.Input; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Data; using System.Diagnostics; -using System.IO; -using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; using System.Text.Json; -using System.Threading.Tasks; using System.Xml.Serialization; -using UniGetUI.Core; using UniGetUI.Core.Classes; -using ExternalLibraries.Pickers; +using UniGetUI.Core.Logging; +using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; using UniGetUI.Interface.Widgets; using UniGetUI.PackageEngine.Classes; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Enums; +using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.Operations; -using Windows.UI.Core; -using UniGetUI.Core.Logging; -using UniGetUI.Core.SettingsEngine; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using UniGetUI.Core.Tools; +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. @@ -90,7 +84,7 @@ public PackageBundlePage() PackageList.DoubleTapped += (s, e) => { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (package == null) return; _ = MainApp.Instance.MainWindow.NavigationPage.ShowPackageDetails(package.Package, OperationType.None); }; @@ -123,7 +117,7 @@ public PackageBundlePage() (PackageList.SelectedItem as BundledPackage)?.ShowOptions(s, e); else { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (package == null) return; _ = MainApp.Instance.MainWindow.NavigationPage.ShowPackageDetails(package.Package, OperationType.None); } @@ -137,7 +131,7 @@ public PackageBundlePage() } else if (e.Key == Windows.System.VirtualKey.Space && PackageList.SelectedItem != null) { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (package == null) return; package.Package.IsChecked = !package.Package.IsChecked; } @@ -472,8 +466,8 @@ public void GenerateToolBar() toolButton.Icon = new LocalIcon(Icons[toolButton]); PackageDetails.Click += (s, e) => - { - var package = PackageList.SelectedItem as BundledPackage; + { + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (package != null) _ = MainApp.Instance.MainWindow.NavigationPage.ShowPackageDetails(package.Package, OperationType.None); }; @@ -533,7 +527,7 @@ public void GenerateToolBar() SharePackage.Click += (s, e) => { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (package != null) MainApp.Instance.MainWindow.SharePackage(package.Package); }; @@ -545,7 +539,7 @@ public void GenerateToolBar() private void MenuRemoveFromList_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (!Initialized || package == null) return; package.RemoveFromList(sender, args); @@ -554,7 +548,7 @@ private void MenuRemoveFromList_Invoked(object sender, RoutedEventArgs args) private void MenuShare_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (!Initialized || package == null || !package.IsValid) return; MainApp.Instance.MainWindow.SharePackage(package.Package); @@ -562,7 +556,7 @@ private void MenuShare_Invoked(object sender, RoutedEventArgs args) private void MenuDetails_Invoked(object sender, RoutedEventArgs args) { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (!Initialized || package == null || !package.IsValid) return; _ = MainApp.Instance.MainWindow.NavigationPage.ShowPackageDetails(package.Package, OperationType.None); @@ -582,7 +576,7 @@ private void ClearSourceSelectionButton_Click(object sender, RoutedEventArgs e) private void MenuInstallSettings_Invoked(object sender, RoutedEventArgs e) { - var package = PackageList.SelectedItem as BundledPackage; + BundledPackage? package = PackageList.SelectedItem as BundledPackage; if (package?.Package != null) package.ShowOptions(sender, e); } diff --git a/src/UniGetUI/Interface/Widgets/Announcer.xaml.cs b/src/UniGetUI/Interface/Widgets/Announcer.xaml.cs index 85b089dfa..aa0d09cc7 100644 --- a/src/UniGetUI/Interface/Widgets/Announcer.xaml.cs +++ b/src/UniGetUI/Interface/Widgets/Announcer.xaml.cs @@ -3,11 +3,9 @@ using Microsoft.UI.Xaml.Documents; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; -using System; -using UniGetUI.Core; -using Windows.UI.Text; using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; +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. diff --git a/src/UniGetUI/Interface/Widgets/ButtonCard.cs b/src/UniGetUI/Interface/Widgets/ButtonCard.cs index 1ab88d283..17a2486a8 100644 --- a/src/UniGetUI/Interface/Widgets/ButtonCard.cs +++ b/src/UniGetUI/Interface/Widgets/ButtonCard.cs @@ -1,9 +1,6 @@ using CommunityToolkit.WinUI.Controls; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using UniGetUI.Core.Logging; -using UniGetUI.Core; using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Interface/Widgets/CheckboxCard.cs b/src/UniGetUI/Interface/Widgets/CheckboxCard.cs index b9d8ff893..766f75ebe 100644 --- a/src/UniGetUI/Interface/Widgets/CheckboxCard.cs +++ b/src/UniGetUI/Interface/Widgets/CheckboxCard.cs @@ -1,9 +1,6 @@ using CommunityToolkit.WinUI.Controls; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using UniGetUI.Core; -using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/Interface/Widgets/ComboboxCard.cs b/src/UniGetUI/Interface/Widgets/ComboboxCard.cs index f0ce3d761..15e518839 100644 --- a/src/UniGetUI/Interface/Widgets/ComboboxCard.cs +++ b/src/UniGetUI/Interface/Widgets/ComboboxCard.cs @@ -2,11 +2,8 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using UniGetUI.Core.Logging; -using UniGetUI.Core; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/Interface/Widgets/LocalIcon.cs b/src/UniGetUI/Interface/Widgets/LocalIcon.cs index b974fd754..9c27c2029 100644 --- a/src/UniGetUI/Interface/Widgets/LocalIcon.cs +++ b/src/UniGetUI/Interface/Widgets/LocalIcon.cs @@ -1,9 +1,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; -using System; -using UniGetUI.Core; -using UniGetUI.Core.Logging; namespace UniGetUI.Interface.Widgets { diff --git a/src/UniGetUI/Interface/Widgets/MenuForPackage.cs b/src/UniGetUI/Interface/Widgets/MenuForPackage.cs index af46a60f8..c59e3e183 100644 --- a/src/UniGetUI/Interface/Widgets/MenuForPackage.cs +++ b/src/UniGetUI/Interface/Widgets/MenuForPackage.cs @@ -1,11 +1,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; -using UniGetUI.Core.Logging; -using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.PackageClasses; namespace UniGetUI.Interface.Widgets { diff --git a/src/UniGetUI/Interface/Widgets/NavButton.xaml.cs b/src/UniGetUI/Interface/Widgets/NavButton.xaml.cs index b57d14c28..300a30eac 100644 --- a/src/UniGetUI/Interface/Widgets/NavButton.xaml.cs +++ b/src/UniGetUI/Interface/Widgets/NavButton.xaml.cs @@ -1,10 +1,6 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls.Primitives; -using System; -using System.Linq; -using UniGetUI.Core.Logging; -using UniGetUI.Core; using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Interface/Widgets/SettingsEntry.cs b/src/UniGetUI/Interface/Widgets/SettingsEntry.cs index 0f2f6ac1d..8cf2f8400 100644 --- a/src/UniGetUI/Interface/Widgets/SettingsEntry.cs +++ b/src/UniGetUI/Interface/Widgets/SettingsEntry.cs @@ -1,8 +1,6 @@ using CommunityToolkit.WinUI.Controls; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using UniGetUI.Core; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/Interface/Widgets/SourceManager.xaml.cs b/src/UniGetUI/Interface/Widgets/SourceManager.xaml.cs index 9763dd4a1..af242538c 100644 --- a/src/UniGetUI/Interface/Widgets/SourceManager.xaml.cs +++ b/src/UniGetUI/Interface/Widgets/SourceManager.xaml.cs @@ -1,17 +1,11 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using UniGetUI.Core; -using UniGetUI.PackageEngine.Classes; using UniGetUI.Core.Logging; -using UniGetUI.PackageEngine.Operations; -using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.Core.Tools; -using System.Diagnostics.CodeAnalysis; -using System.ComponentModel.Design; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.ManagerClasses.Manager; +using UniGetUI.PackageEngine.Operations; // To learn more about WinUI, the WinUI project structure, // and more about our project templates, see: http://aka.ms/winui-project-info. @@ -99,7 +93,7 @@ public SourceManager(PackageManager Manager) } else { - var sourceName = SourcesCombo.SelectedValue.ToString(); + string? sourceName = SourcesCombo.SelectedValue.ToString(); if (sourceName != null) { SourceUrlTextBox.IsEnabled = SourceNameTextBox.IsEnabled = false; diff --git a/src/UniGetUI/Interface/Widgets/TextboxCard.cs b/src/UniGetUI/Interface/Widgets/TextboxCard.cs index e3e2ae485..46960c6c7 100644 --- a/src/UniGetUI/Interface/Widgets/TextboxCard.cs +++ b/src/UniGetUI/Interface/Widgets/TextboxCard.cs @@ -1,9 +1,6 @@ using CommunityToolkit.WinUI.Controls; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using System; -using UniGetUI.Core.Logging; -using UniGetUI.Core; using UniGetUI.Core.SettingsEngine; using UniGetUI.Core.Tools; diff --git a/src/UniGetUI/Interface/Widgets/TranslatedTextBlock.xaml.cs b/src/UniGetUI/Interface/Widgets/TranslatedTextBlock.xaml.cs index a15ecb0f7..ce42f8979 100644 --- a/src/UniGetUI/Interface/Widgets/TranslatedTextBlock.xaml.cs +++ b/src/UniGetUI/Interface/Widgets/TranslatedTextBlock.xaml.cs @@ -1,7 +1,5 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using UniGetUI.Core; -using UniGetUI.Core.Logging; using UniGetUI.Core.Tools; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/PackageEngine/Classes/ImportExport.cs b/src/UniGetUI/PackageEngine/Classes/ImportExport.cs index e3cc51201..ccfc16cd6 100644 --- a/src/UniGetUI/PackageEngine/Classes/ImportExport.cs +++ b/src/UniGetUI/PackageEngine/Classes/ImportExport.cs @@ -1,16 +1,11 @@ using Microsoft.UI.Xaml; -using System.Collections.Generic; using System.ComponentModel; using System.Runtime.CompilerServices; -using System.Threading.Tasks; -using UniGetUI.Core.Logging; -using UniGetUI.Core; +using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.ManagerClasses.Manager; using UniGetUI.PackageEngine.PackageClasses; using UniGetUI.PackageEngine.Serializable; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.PackageEngine.ManagerClasses.Manager; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; -using UniGetUI.Core.Tools; namespace UniGetUI.PackageEngine.Classes { diff --git a/src/UniGetUI/PackageEngine/Operations/OperationControl.xaml.cs b/src/UniGetUI/PackageEngine/Operations/OperationControl.xaml.cs index ff6063aa4..d58f5a47e 100644 --- a/src/UniGetUI/PackageEngine/Operations/OperationControl.xaml.cs +++ b/src/UniGetUI/PackageEngine/Operations/OperationControl.xaml.cs @@ -1,23 +1,17 @@ +using ExternalLibraries.Clipboard; 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 System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Diagnostics; -using System.Linq; using System.Runtime.InteropServices.WindowsRuntime; -using System.Threading.Tasks; -using UniGetUI.Core; -using UniGetUI.Core.Data; -using UniGetUI.Interface.Enums; using UniGetUI.Core.Logging; -using ExternalLibraries.Clipboard; using UniGetUI.Core.SettingsEngine; -using UniGetUI.PackageEngine.Enums; using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; +using UniGetUI.PackageEngine.Enums; // To learn more about WinUI, the WinUI project structure, diff --git a/src/UniGetUI/PackageEngine/Operations/PackageOperations.cs b/src/UniGetUI/PackageEngine/Operations/PackageOperations.cs index 499bb8f3b..6c8f65e80 100644 --- a/src/UniGetUI/PackageEngine/Operations/PackageOperations.cs +++ b/src/UniGetUI/PackageEngine/Operations/PackageOperations.cs @@ -1,23 +1,13 @@ using CommunityToolkit.WinUI.Notifications; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Documents; -using Microsoft.UI.Xaml.Media; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Data; -using UniGetUI.Interface.Widgets; -using UniGetUI.Interface.Enums; using UniGetUI.Core.Logging; -using UniGetUI.PackageEngine.Classes; using UniGetUI.Core.SettingsEngine; +using UniGetUI.Core.Tools; +using UniGetUI.Interface.Enums; using UniGetUI.PackageEngine.Enums; using UniGetUI.PackageEngine.PackageClasses; -using UniGetUI.PackageEngine.ManagerClasses; -using UniGetUI.Core.Tools; namespace UniGetUI.PackageEngine.Operations { diff --git a/src/UniGetUI/PackageEngine/Operations/SourceOperations.cs b/src/UniGetUI/PackageEngine/Operations/SourceOperations.cs index 2c76eb45f..fb81dd29c 100644 --- a/src/UniGetUI/PackageEngine/Operations/SourceOperations.cs +++ b/src/UniGetUI/PackageEngine/Operations/SourceOperations.cs @@ -1,21 +1,12 @@ using CommunityToolkit.WinUI.Notifications; -using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Documents; -using Microsoft.UI.Xaml.Media; -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Threading.Tasks; -using UniGetUI.Core; using UniGetUI.Core.Data; -using UniGetUI.Interface.Widgets; -using UniGetUI.PackageEngine.Classes; using UniGetUI.Core.Logging; using UniGetUI.Core.SettingsEngine; -using UniGetUI.PackageEngine.Enums; -using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; using UniGetUI.Core.Tools; +using UniGetUI.PackageEngine.Classes.Manager.ManagerHelpers; +using UniGetUI.PackageEngine.Enums; namespace UniGetUI.PackageEngine.Operations {