diff --git a/.github/workflows/dotnet-test.yml b/.github/workflows/dotnet-test.yml index ddd70bbc9..72d581d33 100644 --- a/.github/workflows/dotnet-test.yml +++ b/.github/workflows/dotnet-test.yml @@ -48,3 +48,7 @@ jobs: - name: Run Tests working-directory: src run: dotnet test --no-restore --verbosity q --nologo + + - name: Test publish + working-directory: src + run: dotnet publish --configuration Release --no-restore diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000..3cb606be6 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,16 @@ + + + enable + 10.0.19041.0 + 10.0.26100.53 + 8.0.404 + Martí Climent and the contributors + Martí Climent + enable + + + + latest + true + + diff --git a/src/ExternalLibraries.Clipboard/ExternalLibraries.Clipboard.csproj b/src/ExternalLibraries.Clipboard/ExternalLibraries.Clipboard.csproj index 2420faafb..353c111f1 100644 --- a/src/ExternalLibraries.Clipboard/ExternalLibraries.Clipboard.csproj +++ b/src/ExternalLibraries.Clipboard/ExternalLibraries.Clipboard.csproj @@ -2,8 +2,6 @@ net8.0 - enable - enable x64 diff --git a/src/ExternalLibraries.FilePickers/ExternalLibraries.FilePickers.csproj b/src/ExternalLibraries.FilePickers/ExternalLibraries.FilePickers.csproj index 2420faafb..353c111f1 100644 --- a/src/ExternalLibraries.FilePickers/ExternalLibraries.FilePickers.csproj +++ b/src/ExternalLibraries.FilePickers/ExternalLibraries.FilePickers.csproj @@ -2,8 +2,6 @@ net8.0 - enable - enable x64 diff --git a/src/UniGetUI.Core.Classes.Tests/UniGetUI.Core.Classes.Tests.csproj b/src/UniGetUI.Core.Classes.Tests/UniGetUI.Core.Classes.Tests.csproj index 5e0b58518..6e9425c2c 100644 --- a/src/UniGetUI.Core.Classes.Tests/UniGetUI.Core.Classes.Tests.csproj +++ b/src/UniGetUI.Core.Classes.Tests/UniGetUI.Core.Classes.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.Classes/UniGetUI.Core.Classes.csproj b/src/UniGetUI.Core.Classes/UniGetUI.Core.Classes.csproj index 0da9bfb3d..c4642ba65 100644 --- a/src/UniGetUI.Core.Classes/UniGetUI.Core.Classes.csproj +++ b/src/UniGetUI.Core.Classes/UniGetUI.Core.Classes.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.Core.Data.Tests/UniGetUI.Core.Data.Tests.csproj b/src/UniGetUI.Core.Data.Tests/UniGetUI.Core.Data.Tests.csproj index 2a1bbd765..79da41009 100644 --- a/src/UniGetUI.Core.Data.Tests/UniGetUI.Core.Data.Tests.csproj +++ b/src/UniGetUI.Core.Data.Tests/UniGetUI.Core.Data.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.Data/CoreData.cs b/src/UniGetUI.Core.Data/CoreData.cs index 3f9c7239a..b6034a848 100644 --- a/src/UniGetUI.Core.Data/CoreData.cs +++ b/src/UniGetUI.Core.Data/CoreData.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using System.Net; using System.Text.Json; using System.Text.Json.Serialization.Metadata; @@ -284,7 +284,6 @@ private static string GetNewDataDirectoryOrMoveOld(string old_path, string new_p WriteIndented = true, }; - private static int GetCodePage() { try diff --git a/src/UniGetUI.Core.Data/UniGetUI.Core.Data.csproj b/src/UniGetUI.Core.Data/UniGetUI.Core.Data.csproj index 6dc38ed1c..4fcf38aba 100644 --- a/src/UniGetUI.Core.Data/UniGetUI.Core.Data.csproj +++ b/src/UniGetUI.Core.Data/UniGetUI.Core.Data.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.Core.IconEngine.Tests/UniGetUI.Core.IconEngine.Tests.csproj b/src/UniGetUI.Core.IconEngine.Tests/UniGetUI.Core.IconEngine.Tests.csproj index 58837c25c..e132df7cd 100644 --- a/src/UniGetUI.Core.IconEngine.Tests/UniGetUI.Core.IconEngine.Tests.csproj +++ b/src/UniGetUI.Core.IconEngine.Tests/UniGetUI.Core.IconEngine.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.IconStore/UniGetUI.Core.IconEngine.csproj b/src/UniGetUI.Core.IconStore/UniGetUI.Core.IconEngine.csproj index b0bcc1816..1b503f0f0 100644 --- a/src/UniGetUI.Core.IconStore/UniGetUI.Core.IconEngine.csproj +++ b/src/UniGetUI.Core.IconStore/UniGetUI.Core.IconEngine.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.Core.Language.Tests/UniGetUI.Core.LanguageEngine.Tests.csproj b/src/UniGetUI.Core.Language.Tests/UniGetUI.Core.LanguageEngine.Tests.csproj index 1efb3916b..e770e0f4a 100644 --- a/src/UniGetUI.Core.Language.Tests/UniGetUI.Core.LanguageEngine.Tests.csproj +++ b/src/UniGetUI.Core.Language.Tests/UniGetUI.Core.LanguageEngine.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.LanguageEngine/UniGetUI.Core.LanguageEngine.csproj b/src/UniGetUI.Core.LanguageEngine/UniGetUI.Core.LanguageEngine.csproj index 7dc6e7fb5..a191fa73e 100644 --- a/src/UniGetUI.Core.LanguageEngine/UniGetUI.Core.LanguageEngine.csproj +++ b/src/UniGetUI.Core.LanguageEngine/UniGetUI.Core.LanguageEngine.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release @@ -60,6 +53,7 @@ + @@ -93,12 +87,6 @@ - - - PreserveNewest - - - diff --git a/src/UniGetUI.Core.Logger/UniGetUI.Core.Logging.csproj b/src/UniGetUI.Core.Logger/UniGetUI.Core.Logging.csproj index 60a30f5c7..1acd41c5f 100644 --- a/src/UniGetUI.Core.Logger/UniGetUI.Core.Logging.csproj +++ b/src/UniGetUI.Core.Logger/UniGetUI.Core.Logging.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.Core.Logging.Tests/UniGetUI.Core.Logging.Tests.csproj b/src/UniGetUI.Core.Logging.Tests/UniGetUI.Core.Logging.Tests.csproj index dbe9ac5d7..b186a05bd 100644 --- a/src/UniGetUI.Core.Logging.Tests/UniGetUI.Core.Logging.Tests.csproj +++ b/src/UniGetUI.Core.Logging.Tests/UniGetUI.Core.Logging.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.Settings.Tests/UniGetUI.Core.Settings.Tests.csproj b/src/UniGetUI.Core.Settings.Tests/UniGetUI.Core.Settings.Tests.csproj index b1cb99031..9b21b90d0 100644 --- a/src/UniGetUI.Core.Settings.Tests/UniGetUI.Core.Settings.Tests.csproj +++ b/src/UniGetUI.Core.Settings.Tests/UniGetUI.Core.Settings.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.Settings/UniGetUI.Core.Settings.csproj b/src/UniGetUI.Core.Settings/UniGetUI.Core.Settings.csproj index 44a20f7be..518e09dd4 100644 --- a/src/UniGetUI.Core.Settings/UniGetUI.Core.Settings.csproj +++ b/src/UniGetUI.Core.Settings/UniGetUI.Core.Settings.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.Core.Tools.Tests/UniGetUI.Core.Tools.Tests.csproj b/src/UniGetUI.Core.Tools.Tests/UniGetUI.Core.Tools.Tests.csproj index 728c44315..9a41a6996 100644 --- a/src/UniGetUI.Core.Tools.Tests/UniGetUI.Core.Tools.Tests.csproj +++ b/src/UniGetUI.Core.Tools.Tests/UniGetUI.Core.Tools.Tests.csproj @@ -2,23 +2,16 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent false Debug;Release - enable false true diff --git a/src/UniGetUI.Core.Tools/UniGetUI.Core.Tools.csproj b/src/UniGetUI.Core.Tools/UniGetUI.Core.Tools.csproj index 12b86baca..689adc788 100644 --- a/src/UniGetUI.Core.Tools/UniGetUI.Core.Tools.csproj +++ b/src/UniGetUI.Core.Tools/UniGetUI.Core.Tools.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.Interface.BackgroundApi/UniGetUI.Interface.BackgroundApi.csproj b/src/UniGetUI.Interface.BackgroundApi/UniGetUI.Interface.BackgroundApi.csproj index 3ad3f6cfc..82527e5fa 100644 --- a/src/UniGetUI.Interface.BackgroundApi/UniGetUI.Interface.BackgroundApi.csproj +++ b/src/UniGetUI.Interface.BackgroundApi/UniGetUI.Interface.BackgroundApi.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false diff --git a/src/UniGetUI.Interface.Enums/UniGetUI.Interface.Enums.csproj b/src/UniGetUI.Interface.Enums/UniGetUI.Interface.Enums.csproj index ed36b0d29..e8ecd0a3c 100644 --- a/src/UniGetUI.Interface.Enums/UniGetUI.Interface.Enums.csproj +++ b/src/UniGetUI.Interface.Enums/UniGetUI.Interface.Enums.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false diff --git a/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs b/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs index b59c8b089..a61f689ad 100644 --- a/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs +++ b/src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs @@ -1,4 +1,3 @@ -using System.Net; using UniGetUI.Core.Data; using UniGetUI.Core.Language; using UniGetUI.Core.Logging; @@ -50,9 +49,9 @@ public static async void Initialize() foreach (var manager in PEInterface.Managers) { - if(manager.IsEnabled()) ManagerMagicValue |= mask; + if (manager.IsEnabled()) ManagerMagicValue |= mask; mask = mask << 1; - if(manager.IsEnabled() && manager.Status.Found) ManagerMagicValue |= mask; + if (manager.IsEnabled() && manager.Status.Found) ManagerMagicValue |= mask; mask = mask << 1; if (mask == 0x1) @@ -69,7 +68,7 @@ public static async void Initialize() else if (setting.StartsWith("Disable")) enabled = !Settings.Get(setting); else enabled = Settings.Get(setting); - if(enabled) SettingsMagicValue |= mask; + if (enabled) SettingsMagicValue |= mask; mask = mask << 1; if (mask == 0x1) @@ -117,7 +116,6 @@ public static async void PackageInstalled(IPackage package) string ID = Settings.GetValue("TelemetryClientToken"); - var request = new HttpRequestMessage(HttpMethod.Post, $"{HOST}/install"); request.Headers.Add("clientId", ID); diff --git a/src/UniGetUI.Interface.Telemetry/UniGetUI.Interface.Telemetry.csproj b/src/UniGetUI.Interface.Telemetry/UniGetUI.Interface.Telemetry.csproj index 2aed3bc30..3f1660cd6 100644 --- a/src/UniGetUI.Interface.Telemetry/UniGetUI.Interface.Telemetry.csproj +++ b/src/UniGetUI.Interface.Telemetry/UniGetUI.Interface.Telemetry.csproj @@ -1,19 +1,12 @@ - + net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false false UniGetUI.Interface.Telemetry diff --git a/src/UniGetUI.PAckageEngine.Interfaces/UniGetUI.PackageEngine.Interfaces.csproj b/src/UniGetUI.PAckageEngine.Interfaces/UniGetUI.PackageEngine.Interfaces.csproj index 054438b4f..1963a991c 100644 --- a/src/UniGetUI.PAckageEngine.Interfaces/UniGetUI.PackageEngine.Interfaces.csproj +++ b/src/UniGetUI.PAckageEngine.Interfaces/UniGetUI.PackageEngine.Interfaces.csproj @@ -2,23 +2,17 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 10.0.19041.0 - 8.0.404 true true 3.1.0.0 3.1.0-beta0 UniGetUI - Martí Climent and the contributors - Martí Climent 3.1.0-beta0 2025, Martí Climent - enable Debug;Release diff --git a/src/UniGetUI.PackageEngine.Enums/UniGetUI.PackageEngine.Structs.csproj b/src/UniGetUI.PackageEngine.Enums/UniGetUI.PackageEngine.Structs.csproj index 60a30f5c7..1acd41c5f 100644 --- a/src/UniGetUI.PackageEngine.Enums/UniGetUI.PackageEngine.Structs.csproj +++ b/src/UniGetUI.PackageEngine.Enums/UniGetUI.PackageEngine.Structs.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Cargo/UniGetUI.PackageEngine.Managers.Cargo.csproj b/src/UniGetUI.PackageEngine.Managers.Cargo/UniGetUI.PackageEngine.Managers.Cargo.csproj index 50deb4f3a..6b32f7a8d 100644 --- a/src/UniGetUI.PackageEngine.Managers.Cargo/UniGetUI.PackageEngine.Managers.Cargo.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Cargo/UniGetUI.PackageEngine.Managers.Cargo.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Chocolatey/UniGetUI.PackageEngine.Managers.Chocolatey.csproj b/src/UniGetUI.PackageEngine.Managers.Chocolatey/UniGetUI.PackageEngine.Managers.Chocolatey.csproj index b0c73f7ab..df5c9dd8d 100644 --- a/src/UniGetUI.PackageEngine.Managers.Chocolatey/UniGetUI.PackageEngine.Managers.Chocolatey.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Chocolatey/UniGetUI.PackageEngine.Managers.Chocolatey.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Dotnet/UniGetUI.PackageEngine.Managers.Dotnet.csproj b/src/UniGetUI.PackageEngine.Managers.Dotnet/UniGetUI.PackageEngine.Managers.Dotnet.csproj index 174cde52b..3e9aa9c7a 100644 --- a/src/UniGetUI.PackageEngine.Managers.Dotnet/UniGetUI.PackageEngine.Managers.Dotnet.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Dotnet/UniGetUI.PackageEngine.Managers.Dotnet.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/UniGetUI.PackageEngine.Managers.Generic.NuGet.csproj b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/UniGetUI.PackageEngine.Managers.Generic.NuGet.csproj index c03532463..56537f8b4 100644 --- a/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/UniGetUI.PackageEngine.Managers.Generic.NuGet.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Generic.NuGet/UniGetUI.PackageEngine.Managers.Generic.NuGet.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Npm/UniGetUI.PackageEngine.Managers.Npm.csproj b/src/UniGetUI.PackageEngine.Managers.Npm/UniGetUI.PackageEngine.Managers.Npm.csproj index 96ab48183..99672e412 100644 --- a/src/UniGetUI.PackageEngine.Managers.Npm/UniGetUI.PackageEngine.Managers.Npm.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Npm/UniGetUI.PackageEngine.Managers.Npm.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Pip/UniGetUI.PackageEngine.Managers.Pip.csproj b/src/UniGetUI.PackageEngine.Managers.Pip/UniGetUI.PackageEngine.Managers.Pip.csproj index 96ab48183..99672e412 100644 --- a/src/UniGetUI.PackageEngine.Managers.Pip/UniGetUI.PackageEngine.Managers.Pip.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Pip/UniGetUI.PackageEngine.Managers.Pip.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell/UniGetUI.PackageEngine.Managers.PowerShell.csproj b/src/UniGetUI.PackageEngine.Managers.PowerShell/UniGetUI.PackageEngine.Managers.PowerShell.csproj index 174cde52b..3e9aa9c7a 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell/UniGetUI.PackageEngine.Managers.PowerShell.csproj +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell/UniGetUI.PackageEngine.Managers.PowerShell.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.PowerShell7/UniGetUI.PackageEngine.Managers.PowerShell7.csproj b/src/UniGetUI.PackageEngine.Managers.PowerShell7/UniGetUI.PackageEngine.Managers.PowerShell7.csproj index 7765f14b2..8e6affb9e 100644 --- a/src/UniGetUI.PackageEngine.Managers.PowerShell7/UniGetUI.PackageEngine.Managers.PowerShell7.csproj +++ b/src/UniGetUI.PackageEngine.Managers.PowerShell7/UniGetUI.PackageEngine.Managers.PowerShell7.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Scoop/UniGetUI.PackageEngine.Managers.Scoop.csproj b/src/UniGetUI.PackageEngine.Managers.Scoop/UniGetUI.PackageEngine.Managers.Scoop.csproj index 96ab48183..99672e412 100644 --- a/src/UniGetUI.PackageEngine.Managers.Scoop/UniGetUI.PackageEngine.Managers.Scoop.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Scoop/UniGetUI.PackageEngine.Managers.Scoop.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.Vcpkg/UniGetUI.PackageEngine.Managers.Vcpkg.csproj b/src/UniGetUI.PackageEngine.Managers.Vcpkg/UniGetUI.PackageEngine.Managers.Vcpkg.csproj index 3cf2fcfbb..75a1d2e30 100644 --- a/src/UniGetUI.PackageEngine.Managers.Vcpkg/UniGetUI.PackageEngine.Managers.Vcpkg.csproj +++ b/src/UniGetUI.PackageEngine.Managers.Vcpkg/UniGetUI.PackageEngine.Managers.Vcpkg.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.22621.47 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs index 17fb387e5..78eb510cc 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/Helpers/WinGetPkgOperationHelper.cs @@ -115,7 +115,6 @@ protected override IEnumerable _getOperationParameters(IPackage package, Logger.Error(ex); } - return parameters; } diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/UniGetUI.PackageEngine.Managers.WinGet.csproj b/src/UniGetUI.PackageEngine.Managers.WinGet/UniGetUI.PackageEngine.Managers.WinGet.csproj index 27758f023..6e5dfaaa0 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/UniGetUI.PackageEngine.Managers.WinGet.csproj +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/UniGetUI.PackageEngine.Managers.WinGet.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs index 730a8b04e..38c8d01c8 100644 --- a/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs +++ b/src/UniGetUI.PackageEngine.Managers.WinGet/WinGet.cs @@ -259,8 +259,6 @@ public override void AttemptFastRepair() } } - - public override void RefreshPackageIndexes() { Process p = new() diff --git a/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs b/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs index d6e10ddcb..7394e9f26 100644 --- a/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs +++ b/src/UniGetUI.PackageEngine.Operations/AbstractOperation.cs @@ -119,7 +119,6 @@ public OperationStatus Status private AbstractOperation? requirement; - public AbstractOperation(bool queue_enabled, AbstractOperation? req) { QUEUE_ENABLED = queue_enabled; @@ -271,7 +270,6 @@ public async Task MainThread() } } - Task op = PerformOperation(); while (Status != OperationStatus.Canceled && !op.IsCompleted) await Task.Delay(100); diff --git a/src/UniGetUI.PackageEngine.Operations/UniGetUI.PackageEngine.Operations.csproj b/src/UniGetUI.PackageEngine.Operations/UniGetUI.PackageEngine.Operations.csproj index 39fca7e6e..5765d5981 100644 --- a/src/UniGetUI.PackageEngine.Operations/UniGetUI.PackageEngine.Operations.csproj +++ b/src/UniGetUI.PackageEngine.Operations/UniGetUI.PackageEngine.Operations.csproj @@ -1,18 +1,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.401 true true - Martí Climent and the contributors - Martí Climent - enable false diff --git a/src/UniGetUI.PackageEngine.PackageEngine/UniGetUI.PackageEngine.PEInterface.csproj b/src/UniGetUI.PackageEngine.PackageEngine/UniGetUI.PackageEngine.PEInterface.csproj index 0ae20166a..d5244328a 100644 --- a/src/UniGetUI.PackageEngine.PackageEngine/UniGetUI.PackageEngine.PEInterface.csproj +++ b/src/UniGetUI.PackageEngine.PackageEngine/UniGetUI.PackageEngine.PEInterface.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false diff --git a/src/UniGetUI.PackageEngine.PackageLoader/UniGetUI.PackageEngine.PackageLoaders.csproj b/src/UniGetUI.PackageEngine.PackageLoader/UniGetUI.PackageEngine.PackageLoaders.csproj index 43b16adf3..b0d848839 100644 --- a/src/UniGetUI.PackageEngine.PackageLoader/UniGetUI.PackageEngine.PackageLoaders.csproj +++ b/src/UniGetUI.PackageEngine.PackageLoader/UniGetUI.PackageEngine.PackageLoaders.csproj @@ -1,18 +1,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false diff --git a/src/UniGetUI.PackageEngine.PackageManagerClasses/UniGetUI.PackageEngine.Classes.csproj b/src/UniGetUI.PackageEngine.PackageManagerClasses/UniGetUI.PackageEngine.Classes.csproj index 985eb24ea..ce67ef703 100644 --- a/src/UniGetUI.PackageEngine.PackageManagerClasses/UniGetUI.PackageEngine.Classes.csproj +++ b/src/UniGetUI.PackageEngine.PackageManagerClasses/UniGetUI.PackageEngine.Classes.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.PackageEngine.Serializable/UniGetUI.PackageEngine.Serializable.csproj b/src/UniGetUI.PackageEngine.Serializable/UniGetUI.PackageEngine.Serializable.csproj index 60a30f5c7..1acd41c5f 100644 --- a/src/UniGetUI.PackageEngine.Serializable/UniGetUI.PackageEngine.Serializable.csproj +++ b/src/UniGetUI.PackageEngine.Serializable/UniGetUI.PackageEngine.Serializable.csproj @@ -2,18 +2,11 @@ net8.0-windows10.0.26100.0 - enable win-x64;win-arm64 win-$(Platform) x64 - 10.0.19041.0 - 10.0.26100.53 - 8.0.404 true true - Martí Climent and the contributors - Martí Climent - enable false Debug;Release diff --git a/src/UniGetUI.sln b/src/UniGetUI.sln index 9dd813855..49c002fa9 100644 --- a/src/UniGetUI.sln +++ b/src/UniGetUI.sln @@ -83,6 +83,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UniGetUI.Interface.Backgrou EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E5F60EF3-4347-4294-9CD9-B756027B6321}" ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props SharedAssemblyInfo.cs = SharedAssemblyInfo.cs EndProjectSection EndProject diff --git a/src/UniGetUI/App.xaml.cs b/src/UniGetUI/App.xaml.cs index e99293e82..06d490deb 100644 --- a/src/UniGetUI/App.xaml.cs +++ b/src/UniGetUI/App.xaml.cs @@ -291,7 +291,7 @@ private async Task LoadComponentsAsync() _ = MainWindow.DoEntryTextAnimationAsync(); // Load package managers - await Task.Run(() => PEInterface.Initialize()); + await Task.Run(PEInterface.Initialize); TelemetryHandler.Initialize(); Logger.Info("LoadComponentsAsync finished executing. All managers loaded. Proceeding to interface."); diff --git a/src/UniGetUI/AppOperationHelper.cs b/src/UniGetUI/AppOperationHelper.cs index 840530f10..524c192cc 100644 --- a/src/UniGetUI/AppOperationHelper.cs +++ b/src/UniGetUI/AppOperationHelper.cs @@ -81,7 +81,6 @@ public static void Remove(AbstractOperation op) savePicker.FileTypeChoices.Add("Default", [$".{extension}"]); - StorageFile file = await savePicker.PickSaveFileAsync(); DialogHelper.HideLoadingDialog(); @@ -102,7 +101,6 @@ public static void Remove(AbstractOperation op) } } - /* * PACKAGE INSTALLATION */ @@ -122,8 +120,6 @@ public static void Install(IReadOnlyList packages, bool? elevated = nu foreach (var package in packages) _ = Install(package, elevated, interactive, no_integrity); } - - /* * PACKAGE UPDATE */ @@ -142,8 +138,6 @@ public static void Update(IReadOnlyList packages, bool? elevated = nul foreach (var package in packages) _ = Update(package, elevated, interactive, no_integrity); } - - /* * PACKAGE UNINSTALL */ diff --git a/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs b/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs index 3fee7e56f..2fbbb1757 100644 --- a/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs +++ b/src/UniGetUI/Controls/SettingsWidgets/CheckboxButtonCard.cs @@ -51,7 +51,6 @@ public bool ButtonAlwaysOn set => _buttonAlwaysOn = value; } - public CheckboxButtonCard() { Button = new Button(); @@ -79,7 +78,6 @@ public CheckboxButtonCard() Button.IsEnabled = _buttonAlwaysOn; }; - Button.MinWidth = 200; Button.Click += (s, e) => Click?.Invoke(s, e); } diff --git a/src/UniGetUI/MainWindow.xaml.cs b/src/UniGetUI/MainWindow.xaml.cs index c38a73d7b..228b376c9 100644 --- a/src/UniGetUI/MainWindow.xaml.cs +++ b/src/UniGetUI/MainWindow.xaml.cs @@ -249,7 +249,6 @@ private void HandleDeepLink(string link) string ManagerName = Regex.Match(baseUrl, "managerName=([^&]+)").Value.Split("=")[^1]; string SourceName = Regex.Match(baseUrl, "sourceName=([^&]+)").Value.Split("=")[^1]; - if (Id != "" && CombinedManagerName != "" && ManagerName == "" && SourceName == "") { Logger.Warn($"URI {link} follows old scheme"); diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs index c937c804a..eb8be8484 100644 --- a/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs +++ b/src/UniGetUI/Pages/DialogPages/DialogHelper_Generic.cs @@ -341,7 +341,6 @@ public static async void WarnAboutAdminRights() await Window.ShowDialogAsync(AdminDialog); } - public static async Task ShowAboutUniGetUI() { ContentDialog? AboutDialog = new(); diff --git a/src/UniGetUI/Pages/DialogPages/DialogHelper_Operations.cs b/src/UniGetUI/Pages/DialogPages/DialogHelper_Operations.cs index a0775ead0..8a406ff61 100644 --- a/src/UniGetUI/Pages/DialogPages/DialogHelper_Operations.cs +++ b/src/UniGetUI/Pages/DialogPages/DialogHelper_Operations.cs @@ -18,11 +18,12 @@ public static async Task ShowOperationFailedDialog(AbstractOperation operation, { ContentDialog dialog = new() { - Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style, XamlRoot = Window.XamlRoot + Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style, XamlRoot = Window.XamlRoot, + Resources = { ["ContentDialogMaxWidth"] = 850, + ["ContentDialogMaxHeight"] = 800, + }, + Title = operation.Metadata.FailureTitle, }; - dialog.Resources["ContentDialogMaxWidth"] = 850; - dialog.Resources["ContentDialogMaxHeight"] = 800; - dialog.Title = operation.Metadata.FailureTitle; Grid grid = new() { @@ -106,7 +107,7 @@ public static async Task ShowOperationFailedDialog(AbstractOperation operation, Grid.SetRow(headerContent, 0); Grid.SetRow(ScrollView, 1); - var CloseButton = new Button() + var CloseButton = new Button { Content = CoreTools.Translate("Close"), HorizontalAlignment = HorizontalAlignment.Stretch, Height = 30, }; @@ -116,10 +117,10 @@ public static async Task ShowOperationFailedDialog(AbstractOperation operation, }; Control _retryButton; - var retryOptions = opControl.GetRetryOptions(() => dialog.Hide()); + var retryOptions = opControl.GetRetryOptions(dialog.Hide); if (retryOptions.Any()) { - SplitButton RetryButton = new SplitButton() + SplitButton RetryButton = new SplitButton { Content = CoreTools.Translate("Retry"), HorizontalAlignment = HorizontalAlignment.Stretch, @@ -141,7 +142,7 @@ public static async Task ShowOperationFailedDialog(AbstractOperation operation, } else { - var RetryButton = new Button() + var RetryButton = new Button { Content = CoreTools.Translate("Retry"), HorizontalAlignment = HorizontalAlignment.Stretch, @@ -163,8 +164,8 @@ public static async Task ShowOperationFailedDialog(AbstractOperation operation, HorizontalAlignment = HorizontalAlignment.Stretch, Background = (Brush)Application.Current.Resources["ApplicationPageBackgroundThemeBrush"] }; - sp.ColumnDefinitions.Add(new ColumnDefinition(){Width = new(1, GridUnitType.Star)}); - sp.ColumnDefinitions.Add(new ColumnDefinition(){Width = new(1, GridUnitType.Star)}); + sp.ColumnDefinitions.Add(new ColumnDefinition {Width = new(1, GridUnitType.Star)}); + sp.ColumnDefinitions.Add(new ColumnDefinition {Width = new(1, GridUnitType.Star)}); sp.Children.Add(_retryButton); Grid.SetColumn(CloseButton, 1); sp.Children.Add(CloseButton); diff --git a/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs b/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs index 65d574826..d086c0914 100644 --- a/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs +++ b/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs @@ -550,13 +550,15 @@ public async Task SaveFile() public static async Task CreateBundle(IEnumerable unsorted_packages, BundleFormatType formatType = BundleFormatType.JSON) { - SerializableBundle_v1 exportable = new(); - exportable.export_version = 2.1; + SerializableBundle_v1 exportable = new() + { + export_version = 2.1, + }; List packages = unsorted_packages.ToList(); packages.Sort(Comparison); - int Comparison(IPackage x, IPackage y) + static int Comparison(IPackage x, IPackage y) { if(x.Id != y.Id) return String.Compare(x.Id, y.Id, StringComparison.Ordinal); if(x.Name != y.Name) return String.Compare(x.Name, y.Name, StringComparison.Ordinal); diff --git a/src/UniGetUI/UniGetUI.csproj b/src/UniGetUI/UniGetUI.csproj index ec1cef518..40487fdf0 100644 --- a/src/UniGetUI/UniGetUI.csproj +++ b/src/UniGetUI/UniGetUI.csproj @@ -1,15 +1,10 @@ - enable win-x64;win-arm64 win-$(Platform) ARM64;x64 net8.0-windows10.0.26100.0 - 10.0.19041.0 - Martí Climent and the contributors - Martí Climent - enable false Debug;Release WinExe @@ -24,7 +19,6 @@ true - 8.0.404 true true None diff --git a/src/WindowsPackageManager.Interop/ExternalLibraries.WindowsPackageManager.Interop.csproj b/src/WindowsPackageManager.Interop/ExternalLibraries.WindowsPackageManager.Interop.csproj index 3caa74e90..c7095e8bc 100644 --- a/src/WindowsPackageManager.Interop/ExternalLibraries.WindowsPackageManager.Interop.csproj +++ b/src/WindowsPackageManager.Interop/ExternalLibraries.WindowsPackageManager.Interop.csproj @@ -2,15 +2,11 @@ net8.0-windows10.0.26100.0 - enable - 10.0.19041.0 - 10.0.26100.56 x64 true WindowsPackageManager.Interop - disable Debug;Release