From 1e7805a090030fc727b45a4e04f230f796806fc1 Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Mon, 12 Sep 2022 15:58:05 -0700 Subject: [PATCH 01/61] (#902) Add debug info to Contributing document Since debugging can be cumbersome if you don't have access to the Chocolatey.Lib objects, this adds a script to bring the library version in line with Chocolatey on the system, and also adds a note to the Contributing document to explain that. --- CONTRIBUTING.md | 10 ++++++++++ Update-DebugConfiguration.ps1 | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Update-DebugConfiguration.ps1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ead72834b..8dad44e87 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,6 +106,16 @@ The only reasons a pull request should be closed and resubmitted are as follows: * When the pull request is targeting the wrong branch (this doesn't happen as often). * When there are updates made to the original by someone other than the original contributor. Then the old branch is closed with a note on the newer branch this supersedes #github_number. +### Debugging with Chocolatey library information + +In order to debug Chocolatey GUI, you need Chocolatey.Lib referenced in the project to match the Chocolatey version installed locally on your system. The easiest way to do this is to run `./Update-DebugConfiguration.ps1` from the root of the repository. + +> :warning: **Note:** +> +> You will need to have `nuget.commandline` installed for this script to work. +> +> You will also want to **not** commit the changes this script makes to the `.csproj` and `packages.config` files. As such, if you're making changes that would modify any of these files, it is recommended to make those changes, commit, then run the `./Update-DebugConfiguration.ps1` script. + ## Other General Information If you reformat code or hit core functionality without an approval from a person on the Chocolatey Team, it's likely that no matter how awesome it looks afterwards, it will probably not get accepted. Reformatting code makes it harder for us to evaluate exactly what was changed. diff --git a/Update-DebugConfiguration.ps1 b/Update-DebugConfiguration.ps1 new file mode 100644 index 000000000..c984614c8 --- /dev/null +++ b/Update-DebugConfiguration.ps1 @@ -0,0 +1,10 @@ +$ChocolateyPackages = choco list -lo -r | ConvertFrom-Csv -Delimiter '|' -Header Package,Version +$NugetPackage = $ChocolateyPackages | Where-Object Package -EQ nuget.commandline +$ChocolateyVersion = $ChocolateyPackages | Where-Object Package -EQ 'chocolatey' + +If ($null -eq $NugetPackage) { + throw "You must have nuget.commandline installed in order to automatically update Chocolatey.lib. Alternatively you can update Chocolatey.lib in Visual Studio to Version '$ChocolateyVersion'" +} + +nuget restore $PSScriptRoot/Source/ChocolateyGui.sln +nuget update $PSScriptRoot/Source/ChocolateyGui.sln -Id Chocolatey.lib -Version $ChocolateyVersion.Version From 5144d21f3c00c3e42c7ed0abc53fb2347ff73569 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 13 Sep 2022 08:10:28 +0100 Subject: [PATCH 02/61] (#902) Remove unnecessary whitespace --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8dad44e87..abc10f5f6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,12 +108,12 @@ The only reasons a pull request should be closed and resubmitted are as follows: ### Debugging with Chocolatey library information -In order to debug Chocolatey GUI, you need Chocolatey.Lib referenced in the project to match the Chocolatey version installed locally on your system. The easiest way to do this is to run `./Update-DebugConfiguration.ps1` from the root of the repository. +In order to debug Chocolatey GUI, you need Chocolatey.Lib referenced in the project to match the Chocolatey version installed locally on your system. The easiest way to do this is to run `./Update-DebugConfiguration.ps1` from the root of the repository. > :warning: **Note:** -> +> > You will need to have `nuget.commandline` installed for this script to work. -> +> > You will also want to **not** commit the changes this script makes to the `.csproj` and `packages.config` files. As such, if you're making changes that would modify any of these files, it is recommended to make those changes, commit, then run the `./Update-DebugConfiguration.ps1` script. ## Other General Information From 4feae9de70d22d1a4cd064c0d444c7db0cdd1441 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 13 Sep 2022 08:11:12 +0100 Subject: [PATCH 03/61] (#902) Change markdown formatting To be consistent with how things are done in the docs repository. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index abc10f5f6..8000b3c36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -110,7 +110,7 @@ The only reasons a pull request should be closed and resubmitted are as follows: In order to debug Chocolatey GUI, you need Chocolatey.Lib referenced in the project to match the Chocolatey version installed locally on your system. The easiest way to do this is to run `./Update-DebugConfiguration.ps1` from the root of the repository. -> :warning: **Note:** +> :warning: **NOTE** > > You will need to have `nuget.commandline` installed for this script to work. > From 5c1aa32f42886deacc67d00fa80dfc27d6ac23eb Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 13 Sep 2022 08:12:07 +0100 Subject: [PATCH 04/61] (#902) Correctly output the version number Without this change, the output contains both the package id and version number, when the intention is simply to output the version number. --- Update-DebugConfiguration.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update-DebugConfiguration.ps1 b/Update-DebugConfiguration.ps1 index c984614c8..0ab97cb85 100644 --- a/Update-DebugConfiguration.ps1 +++ b/Update-DebugConfiguration.ps1 @@ -3,7 +3,7 @@ $NugetPackage = $ChocolateyPackages | Where-Object Package -EQ nuget.commandline $ChocolateyVersion = $ChocolateyPackages | Where-Object Package -EQ 'chocolatey' If ($null -eq $NugetPackage) { - throw "You must have nuget.commandline installed in order to automatically update Chocolatey.lib. Alternatively you can update Chocolatey.lib in Visual Studio to Version '$ChocolateyVersion'" + throw "You must have nuget.commandline installed in order to automatically update Chocolatey.lib. Alternatively you can update Chocolatey.lib in Visual Studio to Version '$($ChocolateyVersion.Version)'" } nuget restore $PSScriptRoot/Source/ChocolateyGui.sln From 1a979f45c443e2b069741f737005d411f03233b1 Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Mon, 12 Sep 2022 15:33:47 -0700 Subject: [PATCH 05/61] (#956) Add initial set of Pester tests Since we have a CLI for Chocolatey GUI, add some basic tests to ensure it runs. This first set will only catch the most egregious errors, but we can expand on them as we go. --- CONTRIBUTING.md | 6 ++++ Tests/chocolateyguicli.Tests.ps1 | 49 +++++++++++++++++++++++++++++ Tests/helpers/gui-helpers.psm1 | 1 + Tests/helpers/gui/Invoke-GuiCli.ps1 | 23 ++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 Tests/chocolateyguicli.Tests.ps1 create mode 100644 Tests/helpers/gui-helpers.psm1 create mode 100644 Tests/helpers/gui/Invoke-GuiCli.ps1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8000b3c36..2909d0aec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,6 +106,12 @@ The only reasons a pull request should be closed and resubmitted are as follows: * When the pull request is targeting the wrong branch (this doesn't happen as often). * When there are updates made to the original by someone other than the original contributor. Then the old branch is closed with a note on the newer branch this supersedes #github_number. +### Testing + +There are some barebones Pester tests used to test the very basic functionalities of `chocolateyguicli`. These require Pester version 5.3.1 or newer. They can be launched by running `Invoke-Pester` within the `Tests` directory of the repository. + +It is **not currently** expected that these Pester tests are run before submitting a PR. Their purpose at the moment is to establish a base to build upon. + ### Debugging with Chocolatey library information In order to debug Chocolatey GUI, you need Chocolatey.Lib referenced in the project to match the Chocolatey version installed locally on your system. The easiest way to do this is to run `./Update-DebugConfiguration.ps1` from the root of the repository. diff --git a/Tests/chocolateyguicli.Tests.ps1 b/Tests/chocolateyguicli.Tests.ps1 new file mode 100644 index 000000000..18937a467 --- /dev/null +++ b/Tests/chocolateyguicli.Tests.ps1 @@ -0,0 +1,49 @@ +Import-Module helpers/gui-helpers + +Describe "chocolateyguicli" -Tag ChocolateyGuiCli { + BeforeDiscovery { + # Perhaps a better way is to pull these from the LiteDB similar to how we do features from the xml in CLI, but this will do for an initial setup. + $Features = (Invoke-GuiCli feature list -r).Lines | ConvertFrom-Csv -Delimiter '|' -Header Name, state, description | Select-Object Name, @{Name = 'enabled'; Expression = { $_.state -eq 'Enabled' } } + $Features | Out-string | write-host + } + + Context "Basic CLI functionality" { + BeforeAll { + $Output = Invoke-GuiCli + } + + It 'Should exit Success (0)' { + $Output.ExitCode | Should -Be 0 -Because $Output.String + } + + It 'Should output appropriate message' { + $Output.Lines | Should -Contain "Please run chocolateyguicli with 'chocolateyguicli -?' or 'chocolateyguicli -?' for specific help on each command" + } + } + + Context "Lists available features" { + BeforeAll { + $Output = Invoke-GuiCli feature list + } + + It "Contains reference of the option (<_.Name>)" -ForEach $Features { + $Output.String | Should -Match $Name + } + } + + Context "Toggles the feature (<_.Name>) successfully" -ForEach $Features { + BeforeAll { + $Outputs = if ($Enabled) { + Invoke-GuiCli feature disable --name $_.Name + Invoke-GuiCli feature enable --name $_.Name + } else { + Invoke-GuiCli feature enable --name $_.Name + Invoke-GuiCli feature disable --name $_.Name + } + } + + It "Should exit success" { + $Outputs.ExitCode | Should -Not -Contain 1 + } + } +} diff --git a/Tests/helpers/gui-helpers.psm1 b/Tests/helpers/gui-helpers.psm1 new file mode 100644 index 000000000..fa9c9b74e --- /dev/null +++ b/Tests/helpers/gui-helpers.psm1 @@ -0,0 +1 @@ +Get-ChildItem -Path $PSScriptRoot\gui -Filter *.ps1 -Recurse | ForEach-Object { . $_.FullName } diff --git a/Tests/helpers/gui/Invoke-GuiCli.ps1 b/Tests/helpers/gui/Invoke-GuiCli.ps1 new file mode 100644 index 000000000..467a40d04 --- /dev/null +++ b/Tests/helpers/gui/Invoke-GuiCli.ps1 @@ -0,0 +1,23 @@ +function Invoke-GuiCli { + <# + .Synopsis + Helper function to call chocolatey with any number of specified arguments, + and return a hashtable with the output as well as the exit code. + #> + [CmdletBinding()] + param( + # The arguments to use when calling the Choco executable + [Parameter(Position = 1, ValueFromRemainingArguments)] + [string[]]$Arguments + ) + + $output = & chocolateyguicli.exe @arguments + [PSCustomObject]@{ + # We trim all the lines, so we do not take into account + # trimming the lines when asserting, and that extra whitespace + # is not considered in our assertions. + Lines = if ($output) { $output.Trim() } else { @() } + String = $output -join "`r`n" + ExitCode = $LastExitCode + } +} From 6074656de815508df4691670c1eeeab97689f7c2 Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Tue, 13 Sep 2022 09:20:17 -0700 Subject: [PATCH 06/61] (#956) Get features, correct module import Extract Get-GuiFeature to allow to fetch features and reduce code duplication in the future. Update the module import to work without Test Kitchen since this currently isn't designed for Test Kitchen. --- Tests/chocolateyguicli.Tests.ps1 | 5 ++--- Tests/helpers/gui/Get-GuiFeature.ps1 | 17 +++++++++++++++++ Tests/helpers/gui/Invoke-GuiCli.ps1 | 4 ++-- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 Tests/helpers/gui/Get-GuiFeature.ps1 diff --git a/Tests/chocolateyguicli.Tests.ps1 b/Tests/chocolateyguicli.Tests.ps1 index 18937a467..44a013870 100644 --- a/Tests/chocolateyguicli.Tests.ps1 +++ b/Tests/chocolateyguicli.Tests.ps1 @@ -1,10 +1,9 @@ -Import-Module helpers/gui-helpers +Import-Module ./helpers/gui-helpers.psm1 Describe "chocolateyguicli" -Tag ChocolateyGuiCli { BeforeDiscovery { # Perhaps a better way is to pull these from the LiteDB similar to how we do features from the xml in CLI, but this will do for an initial setup. - $Features = (Invoke-GuiCli feature list -r).Lines | ConvertFrom-Csv -Delimiter '|' -Header Name, state, description | Select-Object Name, @{Name = 'enabled'; Expression = { $_.state -eq 'Enabled' } } - $Features | Out-string | write-host + $Features = Get-GuiFeature } Context "Basic CLI functionality" { diff --git a/Tests/helpers/gui/Get-GuiFeature.ps1 b/Tests/helpers/gui/Get-GuiFeature.ps1 new file mode 100644 index 000000000..f0426e25e --- /dev/null +++ b/Tests/helpers/gui/Get-GuiFeature.ps1 @@ -0,0 +1,17 @@ +function Get-GuiFeature { + <# + .Synopsis + Helper function to call chocolateyguicli and return the feature information as a PSCustomObject. + #> + [CmdletBinding()] + param( + [string[]]$Feature = '*' + ) + + $featureList = (Invoke-GuiCli feature list -r).Lines | + ConvertFrom-Csv -Delimiter '|' -Header Name, State, Description | + Select-Object Name, @{Name = 'enabled'; Expression = { $_.State -eq 'Enabled' } }, Description + foreach ($ftr in $Feature) { + $featureList | Where-Object Name -Like $ftr + } +} diff --git a/Tests/helpers/gui/Invoke-GuiCli.ps1 b/Tests/helpers/gui/Invoke-GuiCli.ps1 index 467a40d04..42d0ca36b 100644 --- a/Tests/helpers/gui/Invoke-GuiCli.ps1 +++ b/Tests/helpers/gui/Invoke-GuiCli.ps1 @@ -1,12 +1,12 @@ function Invoke-GuiCli { <# .Synopsis - Helper function to call chocolatey with any number of specified arguments, + Helper function to call chocolateyguicli with any number of specified arguments, and return a hashtable with the output as well as the exit code. #> [CmdletBinding()] param( - # The arguments to use when calling the Choco executable + # The arguments to use when calling the chocolateyguicli executable [Parameter(Position = 1, ValueFromRemainingArguments)] [string[]]$Arguments ) From 9f3dcffafa443691bba123bd177bd31a11d09efd Mon Sep 17 00:00:00 2001 From: Rain Sallow <32407840+vexx32@users.noreply.github.com> Date: Thu, 27 Oct 2022 08:57:45 -0400 Subject: [PATCH 07/61] (maint) add/update 3rd party licenses information Also moved LICENSE.txt to \legal\ folder in the nupkg, and added the CREDITS.md in there as well. --- CREDITS.md | 94 ++++++++++++++++++++------ nuspec/chocolatey/ChocolateyGUI.nuspec | 3 +- 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 612b88da1..b6e0af0ae 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -17,28 +17,7 @@ These are the committers to Chocolatey/Chocolatey GUI repository: * [Chocolatey GUI](https://github.com/chocolatey/chocolateygui/graphs/contributors) -## Frameworks - -Chocolatey GUI uses the following awesome frameworks: - -* [Autofac](http://autofac.org/) -* [AutoMapper](http://automapper.org/) -* [Caliburn.Micro](https://github.com/Caliburn-Micro/Caliburn.Micro) -* [ControlzEx](https://github.com/ControlzEx/ControlzEx) -* [corefx](https://github.com/dotnet/runtime) -* [Fizzler](https://github.com/atifaziz/Fizzler) -* [IconPacks](https://github.com/MahApps/MahApps.Metro.IconPacks) -* [LiteDB](https://www.litedb.org/) -* [log4net](http://logging.apache.org/log4net/) -* [MahApps.Metro](http://mahapps.com/) -* [Markdig](https://github.com/lunet-io/markdig) -* [Markdig.Wpf](https://github.com/Kryptos-FR/markdig.wpf) -* [Reactive Extenstions for .NET](https://github.com/dotnet/reactive) -* [Serilog](https://github.com/serilog/serilog) -* [Splat](https://github.com/reactiveui/splat) -* [SkiaSharp](https://github.com/mono/SkiaSharp) -* [Svg.Skia](https://github.com/wieslawsoltes/Svg.Skia) -* [XamlBehaviorsWpf](https://github.com/Microsoft/XamlBehaviorsWpf) +## Third-Party Dependencies - Development & Builds Chocolatey GUI is built, with the following fantastic frameworks and services: @@ -59,3 +38,74 @@ We would like to credit other super sweet tools/frameworks/services that aid in * [NuGet Framework](https://www.nuget.org/) * [ReSharper](https://www.jetbrains.com/resharper/) + +## Third-Party Dependencies and Licenses - Runtime + +Chocolatey GUI Editions uses Chocolatey FOSS components and also adds the following components listed below. + +### [GNU Lesser GPL](https://www.gnu.org/licenses/lgpl-3.0.html) + +* Fizzler @ 1.2.0 + +### [Apache v2.0 License](https://www.apache.org/licenses/LICENSE-2.0.html) + +* Chocolatey Open Source +* Serilog @ 2.5.0 +* Serilog.Formatting.Compact @ 1.0.0 +* Serilog.Sinks.Async @ 1.1.0 +* Serilog.Sinks.Console @ 3.1.0 +* Serilog.Sinks.File @ 3.2.0 +* Serilog.Sinks.PeriodicBatching @ 2.1.1 +* Serilog.Sinks.RollingFile @ 3.3.0 + +### [MIT License](https://mit-license.org/) + +* Autofac @ 4.6.1 +* AutoMapper @ 7.0.1 +* Caliburn.Micro @ 3.2.0 +* Caliburn.Micro.Core @ 3.2.0 +* ControlzEx @ 4.4.0 +* HarfBuzzSharp @ 2.6.1.4 +* LiteDB @ 5.0.5 +* MahApps.Metro @ 2.4.4 +* MahApps.Metro.IconPacks.BoxIcons @ 4.8.0 +* MahApps.Metro.IconPacks.Entypo @ 4.8.0 +* MahApps.Metro.IconPacks.FontAwesome @ 4.8.0 +* MahApps.Metro.IconPacks.Modern @ 4.8.0 +* MahApps.Metro.IconPacks.Octicons @ 4.8.0 +* MahApps.Metro.SimpleChildWindow @ 2.0.0 +* Microsoft.NETCore.Platforms @ 3.1.0 +* Microsoft.VisualStudio.Threading @ 15.4.4 +* Microsoft.VisualStudio.Validation @ 15.3.32 +* Microsoft.Xaml.Behaviors.Wpf @ 1.1.19 +* NETStandard.Library @ 2.0.3 +* SkiaSharp @ 1.68.3 +* SkiaSharp.HarfBuzz @ 1.68.3 +* Splat @ 2.0.0 +* Svg.Skia @ 0.3.0 +* System.Buffers @ 4.5.1 +* System.Memory @ 4.5.4 +* System.Numerics.Vectors @ 4.5.0 +* System.Reactive @ 3.1.1 +* System.Reactive.Core @ 3.1.1 +* System.Reactive.Interfaces @ 3.1.1 +* System.Reactive.Linq @ 3.1.1 +* System.Reactive.PlatformServices @ 3.1.1 +* System.Reactive.Windows.Threading @ 3.1.1 +* System.Runtime.CompilerServices.Unsafe @ 4.7.1 +* System.Threading.Tasks.Extensions @ 4.4.0 +* System.ValueTuple @ 4.5.0 + +### [BSD-2-Clause License](https://licenses.nuget.org/BSD-2-Clause) + +* Markdig.Signed @ 0.23.0 +* Markdig.Wpf.Signed @ 0.5.0.1 + +### [Microsoft Software License](https://go.microsoft.com/fwlink/?LinkId=329770) + +* System.Diagnostics.Contracts @ 4.3.0 +* System.Runtime.InteropServices.RuntimeInformation @ 4.3.0 + +### [MS-PL License](https://opensource.org/licenses/MS-PL) + +* Svg.Custom @ 0.3.0 diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index df6fd29f4..b766dcd35 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -36,7 +36,8 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc - + + From 983b619ae9cb7ab9d6272d20598ccdb363a541fa Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 7 Nov 2022 11:39:43 +0000 Subject: [PATCH 08/61] (build) Update to latest Chocolatey.Cake.Recipe This addresses a known issue where if the branch name starts with a number (which then generates an invalid version number for choco pack), that the asserted version number is changed to remove the number at the start of the asserted version number. --- recipe.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index 88202eff6..6102cec72 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Chocolatey.Cake.Recipe&version=0.16.0 +#load nuget:?package=Chocolatey.Cake.Recipe&version=0.19.0 /////////////////////////////////////////////////////////////////////////////// // MODULES From 0203cfd487be846d17be81e63941a47608e29340 Mon Sep 17 00:00:00 2001 From: "Cory Knox (He/Him)" <30301021+corbob@users.noreply.github.com> Date: Mon, 5 Dec 2022 07:38:51 -0800 Subject: [PATCH 09/61] (build) Allow building with Visual Studio 2022 - Update chocolatey.cake.recipe version to latest - Remove setting the build tool version to VS2019 so that VS 2022 can be used to build --- recipe.cake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe.cake b/recipe.cake index 6102cec72..bc5b4a542 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Chocolatey.Cake.Recipe&version=0.19.0 +#load nuget:?package=Chocolatey.Cake.Recipe&version=0.20.1 /////////////////////////////////////////////////////////////////////////////// // MODULES @@ -112,8 +112,7 @@ BuildParameters.SetParameters(context: Context, shouldBuildMsi: true, strongNameDependentAssembliesInputPath: string.Format("{0}{1}", ((FilePath)("./Source")).FullPath, "\\packages\\Splat*")); -ToolSettings.SetToolSettings(context: Context, - buildMSBuildToolVersion: MSBuildToolVersion.VS2019); +ToolSettings.SetToolSettings(context: Context); BuildParameters.PrintParameters(Context); From 8fabe2ce1bd84b86a222ab4b6b53922bd99e3813 Mon Sep 17 00:00:00 2001 From: "Cory Knox (He/Him)" <30301021+corbob@users.noreply.github.com> Date: Mon, 5 Dec 2022 07:43:16 -0800 Subject: [PATCH 10/61] (doc) Update Visual Studio version reference --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f19a0508d..b7007ade7 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you would like to contribute code or help squash a bug or two, that's awesome ### Building -* It is assumed that a version of Visual Studio 2019 is already installed on the machine being used to complete the build. +* It is assumed that a version of Visual Studio 2019 or newer is already installed on the machine being used to complete the build. * `choco install wixtoolset -y` * **OPTIONAL:** Set `FXCOPDIR` environment variable, which can be set using [vswhere](https://chocolatey.org/packages/vswhere) and the following command: ```ps1 From 82cf830faf41aa21bb9f49d9ac90605bf655b1e3 Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Fri, 6 Jan 2023 09:37:41 -0600 Subject: [PATCH 11/61] (maint) Start building ChocolateyGUI v2.0.0 --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index b2e5e8357..ddba28c28 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1 +1 @@ -next-version: 1.0.0 \ No newline at end of file +next-version: 2.0.0 \ No newline at end of file From 86f974c9e8c636d96a5330ea8c357f6e463425ad Mon Sep 17 00:00:00 2001 From: AdmiringWorm Date: Mon, 16 Jan 2023 11:21:55 +0100 Subject: [PATCH 12/61] (#974) Update chocolatey.lib to latest version This commit updates the Chocolatey Libraries to be the latest version available on NuGet.org. --- .../ChocolateyGui.Common.Windows.csproj | 6 ++---- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 6 ++---- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 6 ++---- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 6 ++---- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 12 insertions(+), 20 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 016ce723e..dc0a89cef 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -67,10 +67,8 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - - ..\packages\chocolatey.lib.1.0.0\lib\chocolatey.dll - False - False + + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index fe33eb7f3..dadc2cae6 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 6630edf82..d4f4d997f 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -54,10 +54,8 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - - ..\packages\chocolatey.lib.1.0.0\lib\chocolatey.dll - False - False + + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index b7fb395e4..a0556fdeb 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 8b9f4533e..68cf0399e 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -113,10 +113,8 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - - ..\packages\chocolatey.lib.1.0.0\lib\chocolatey.dll - False - False + + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index f817579cd..88d61ff33 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 74bbb5847..532673c7f 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -56,10 +56,8 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - - ..\packages\chocolatey.lib.1.0.0\lib\chocolatey.dll - False - False + + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 53327c5ea..b35d66be0 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From 2bd7790d580ed99477ea429a331ee03fc9fa732f Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Thu, 22 Dec 2022 08:16:49 -0600 Subject: [PATCH 13/61] (#974) Switch to NuGetVersion from NuGet.Client --- .../Services/ChocolateyService.cs | 7 ++++--- .../ViewModels/AdvancedInstallViewModel.cs | 12 ++++++------ .../ViewModels/Items/PackageViewModel.cs | 10 +++++----- .../ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- .../Models/Messages/PackageChangedMessage.cs | 6 +++--- .../Models/Messages/PackageHasUpdateMessage.cs | 6 +++--- ...TypeConverter.cs => NuGetVersionTypeConverter.cs} | 10 +++++----- .../ChocolateyGui.Common/Models/OutdatedPackage.cs | 6 +++--- Source/ChocolateyGui.Common/Models/Package.cs | 4 ++-- .../Services/IChocolateyService.cs | 4 ++-- .../ViewModels/Items/IPackageViewModel.cs | 6 +++--- 11 files changed, 37 insertions(+), 36 deletions(-) rename Source/ChocolateyGui.Common/Models/{SemanticVersionTypeConverter.cs => NuGetVersionTypeConverter.cs} (75%) diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs index 39397d53c..93ad7c393 100644 --- a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs +++ b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs @@ -23,6 +23,7 @@ using ChocolateyGui.Common.Utilities; using Microsoft.VisualStudio.Threading; using NuGet; +using NuGet.Versioning; using ChocolateySource = ChocolateyGui.Common.Models.ChocolateySource; using IFileSystem = chocolatey.infrastructure.filesystem.IFileSystem; @@ -323,7 +324,7 @@ public async Task GetByVersionAndIdAsync(string id, string version, boo return GetMappedPackage(_choco, new PackageResult(nugetPackage, null, chocoConfig.Sources), _mapper); } - public async Task> GetAvailableVersionsForPackageIdAsync(string id, int page, int pageSize, bool includePreRelease) + public async Task> GetAvailableVersionsForPackageIdAsync(string id, int page, int pageSize, bool includePreRelease) { _choco.Set( config => @@ -343,7 +344,7 @@ public async Task> GetAvailableVersionsForPackageIdAsync(s }); var chocoConfig = _choco.GetConfiguration(); var packages = await _choco.ListAsync(); - return packages.Select(p => new SemanticVersion(p.Version)).OrderByDescending(p => p.Version).ToList(); + return packages.Select(p => NuGetVersion.Parse(p.Version)).OrderByDescending(p => p.Version).ToList(); } public async Task UninstallPackage(string id, string version, bool force = false) @@ -628,7 +629,7 @@ private static Package GetMappedPackage(GetChocolatey choco, PackageResult packa mappedPackage.IsInstalled = !string.IsNullOrWhiteSpace(package.InstallLocation) || forceInstalled; mappedPackage.IsSideBySide = packageInfo.IsSideBySide; - mappedPackage.IsPrerelease = !string.IsNullOrWhiteSpace(mappedPackage.Version.SpecialVersion); + mappedPackage.IsPrerelease = mappedPackage.Version.IsPrerelease; // Add a sanity check here for pre-release packages // By default, pre-release packages are marked as IsLatestVersion = false, however, IsLatestVersion is diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs index 4901c4aca..fab198a99 100644 --- a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs +++ b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs @@ -18,7 +18,7 @@ using ChocolateyGui.Common.Windows.Commands; using ChocolateyGui.Common.Windows.Controls.Dialogs; using ChocolateyGui.Common.Windows.Utilities; -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Windows.ViewModels { @@ -60,7 +60,7 @@ public class AdvancedInstallViewModel : ObservableBase, IClosableChildWindow { "md5", "sha1", "sha256", "sha512" }; InstallCommand = new RelayCommand( o => { Close?.Invoke(this); }, - o => string.IsNullOrEmpty(SelectedVersion) || SelectedVersion == Resources.AdvancedChocolateyDialog_LatestVersion || SemanticVersion.TryParse(SelectedVersion, out _)); + o => string.IsNullOrEmpty(SelectedVersion) || SelectedVersion == Resources.AdvancedChocolateyDialog_LatestVersion || NuGetVersion.TryParse(SelectedVersion, out _)); CancelCommand = new RelayCommand( o => { @@ -437,11 +437,11 @@ private void SetDefaults() private void OnSelectedVersionChanged(string stringVersion) { - SemanticVersion version; + NuGetVersion version; - if (SemanticVersion.TryParse(stringVersion, out version)) + if (NuGetVersion.TryParse(stringVersion, out version)) { - PreRelease = !string.IsNullOrEmpty(version.SpecialVersion); + PreRelease = version.IsPrerelease; } } diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs index 92a5ead76..50001505e 100644 --- a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs +++ b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs @@ -20,7 +20,7 @@ using ChocolateyGui.Common.Windows.Services; using ChocolateyGui.Common.Windows.Views; using MahApps.Metro.Controls.Dialogs; -using NuGet; +using NuGet.Versioning; using Action = System.Action; using MemoryCache = System.Runtime.Caching.MemoryCache; @@ -84,7 +84,7 @@ public class PackageViewModel : private DateTime _lastUpdated; - private SemanticVersion _latestVersion; + private NuGetVersion _latestVersion; private string _licenseUrl = string.Empty; @@ -114,7 +114,7 @@ public class PackageViewModel : private string _title; - private SemanticVersion _version; + private NuGetVersion _version; private int _versionDownloadCount; @@ -314,7 +314,7 @@ public string Language set { SetPropertyValue(ref _language, value); } } - public SemanticVersion LatestVersion + public NuGetVersion LatestVersion { get { return _latestVersion; } set { SetPropertyValue(ref _latestVersion, value); } @@ -404,7 +404,7 @@ public string Title set { SetPropertyValue(ref _title, value); } } - public SemanticVersion Version + public NuGetVersion Version { get { return _version; } set { SetPropertyValue(ref _version, value); } diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index d4f4d997f..94da5718c 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -166,7 +166,7 @@ - + Resources.resx diff --git a/Source/ChocolateyGui.Common/Models/Messages/PackageChangedMessage.cs b/Source/ChocolateyGui.Common/Models/Messages/PackageChangedMessage.cs index 69912d548..005dfe0c4 100644 --- a/Source/ChocolateyGui.Common/Models/Messages/PackageChangedMessage.cs +++ b/Source/ChocolateyGui.Common/Models/Messages/PackageChangedMessage.cs @@ -5,7 +5,7 @@ // // -------------------------------------------------------------------------------------------------------------------- -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Models.Messages { @@ -20,7 +20,7 @@ public enum PackageChangeType public class PackageChangedMessage { - public PackageChangedMessage(string id, PackageChangeType changeType, SemanticVersion version = null) + public PackageChangedMessage(string id, PackageChangeType changeType, NuGetVersion version = null) { Id = id; ChangeType = changeType; @@ -29,7 +29,7 @@ public PackageChangedMessage(string id, PackageChangeType changeType, SemanticVe public string Id { get; } - public SemanticVersion Version { get; } + public NuGetVersion Version { get; } public PackageChangeType ChangeType { get; } } diff --git a/Source/ChocolateyGui.Common/Models/Messages/PackageHasUpdateMessage.cs b/Source/ChocolateyGui.Common/Models/Messages/PackageHasUpdateMessage.cs index 3c05ef5b2..5ee382d62 100644 --- a/Source/ChocolateyGui.Common/Models/Messages/PackageHasUpdateMessage.cs +++ b/Source/ChocolateyGui.Common/Models/Messages/PackageHasUpdateMessage.cs @@ -5,13 +5,13 @@ // // -------------------------------------------------------------------------------------------------------------------- -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Models.Messages { public class PackageHasUpdateMessage { - public PackageHasUpdateMessage(string id, SemanticVersion version) + public PackageHasUpdateMessage(string id, NuGetVersion version) { Id = id; Version = version; @@ -19,6 +19,6 @@ public PackageHasUpdateMessage(string id, SemanticVersion version) public string Id { get; } - public SemanticVersion Version { get; set; } + public NuGetVersion Version { get; set; } } } \ No newline at end of file diff --git a/Source/ChocolateyGui.Common/Models/SemanticVersionTypeConverter.cs b/Source/ChocolateyGui.Common/Models/NuGetVersionTypeConverter.cs similarity index 75% rename from Source/ChocolateyGui.Common/Models/SemanticVersionTypeConverter.cs rename to Source/ChocolateyGui.Common/Models/NuGetVersionTypeConverter.cs index 071df0eb4..08967ed27 100644 --- a/Source/ChocolateyGui.Common/Models/SemanticVersionTypeConverter.cs +++ b/Source/ChocolateyGui.Common/Models/NuGetVersionTypeConverter.cs @@ -1,5 +1,5 @@ // -------------------------------------------------------------------------------------------------------------------- -// +// // Copyright 2017 - Present Chocolatey Software, LLC // Copyright 2014 - 2017 Rob Reynolds, the maintainers of Chocolatey, and RealDimensions Software, LLC // @@ -8,11 +8,11 @@ using System; using System.ComponentModel; using System.Globalization; -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Models { - public class SemanticVersionTypeConverter : TypeConverter + public class NuGetVersionTypeConverter : TypeConverter { public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) { @@ -22,8 +22,8 @@ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceT public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) { var version = value as string; - SemanticVersion semanticVersion; - if (version != null && SemanticVersion.TryParse(version, out semanticVersion)) + NuGetVersion semanticVersion; + if (version != null && NuGetVersion.TryParse(version, out semanticVersion)) { return semanticVersion; } diff --git a/Source/ChocolateyGui.Common/Models/OutdatedPackage.cs b/Source/ChocolateyGui.Common/Models/OutdatedPackage.cs index 25d7d5ff0..21f1dad28 100644 --- a/Source/ChocolateyGui.Common/Models/OutdatedPackage.cs +++ b/Source/ChocolateyGui.Common/Models/OutdatedPackage.cs @@ -6,7 +6,7 @@ // -------------------------------------------------------------------------------------------------------------------- using System.Xml.Serialization; -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Models { @@ -17,9 +17,9 @@ public class OutdatedPackage public string VersionString { get; set; } [XmlIgnore] - public SemanticVersion Version + public NuGetVersion Version { - get { return new SemanticVersion(VersionString); } + get { return NuGetVersion.Parse(VersionString); } } } } \ No newline at end of file diff --git a/Source/ChocolateyGui.Common/Models/Package.cs b/Source/ChocolateyGui.Common/Models/Package.cs index 3e22f197d..72efad590 100644 --- a/Source/ChocolateyGui.Common/Models/Package.cs +++ b/Source/ChocolateyGui.Common/Models/Package.cs @@ -6,7 +6,7 @@ // -------------------------------------------------------------------------------------------------------------------- using System; -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Models { @@ -72,7 +72,7 @@ public class Package public string Title { get; set; } - public SemanticVersion Version { get; set; } + public NuGetVersion Version { get; set; } public int VersionDownloadCount { get; set; } } diff --git a/Source/ChocolateyGui.Common/Services/IChocolateyService.cs b/Source/ChocolateyGui.Common/Services/IChocolateyService.cs index 1e68d1e61..13feee9f5 100644 --- a/Source/ChocolateyGui.Common/Services/IChocolateyService.cs +++ b/Source/ChocolateyGui.Common/Services/IChocolateyService.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using ChocolateyGui.Common.Models; -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.Services { @@ -25,7 +25,7 @@ public interface IChocolateyService Task GetByVersionAndIdAsync(string id, string version, bool isPrerelease); - Task> GetAvailableVersionsForPackageIdAsync(string id, int page, int pageSize, bool includePreRelease); + Task> GetAvailableVersionsForPackageIdAsync(string id, int page, int pageSize, bool includePreRelease); Task InstallPackage( string id, diff --git a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs index aefd1e9cd..c820a359d 100644 --- a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs +++ b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs @@ -7,7 +7,7 @@ using System; using System.Threading.Tasks; -using NuGet; +using NuGet.Versioning; namespace ChocolateyGui.Common.ViewModels.Items { @@ -45,7 +45,7 @@ public interface IPackageViewModel string Language { get; set; } - SemanticVersion LatestVersion { get; } + NuGetVersion LatestVersion { get; } string LicenseUrl { get; set; } @@ -75,7 +75,7 @@ public interface IPackageViewModel string Title { get; set; } - SemanticVersion Version { get; set; } + NuGetVersion Version { get; set; } int VersionDownloadCount { get; set; } From b8b2c3a406a41d4ae1d5ca5b24ca1aae22e65799 Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Thu, 5 Jan 2023 18:48:31 -0600 Subject: [PATCH 14/61] (#974) Adjust to breaking changes. --- .../Services/ChocolateyService.cs | 42 +++++++++++-------- .../Startup/ChocolateyGuiModule.cs | 7 ++-- .../ViewModels/Items/PackageViewModel.cs | 20 +++------ .../ViewModels/RemoteSourceViewModel.cs | 5 +-- Source/ChocolateyGui.Common/Models/Package.cs | 4 -- .../ViewModels/Items/IPackageViewModel.cs | 4 +- 6 files changed, 37 insertions(+), 45 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs index 93ad7c393..8dde38b41 100644 --- a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs +++ b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; using AutoMapper; using chocolatey; +using chocolatey.infrastructure.app; using chocolatey.infrastructure.app.configuration; using chocolatey.infrastructure.app.domain; using chocolatey.infrastructure.app.nuget; @@ -22,7 +23,7 @@ using ChocolateyGui.Common.Services; using ChocolateyGui.Common.Utilities; using Microsoft.VisualStudio.Threading; -using NuGet; +using NuGet.Protocol.Core.Types; using NuGet.Versioning; using ChocolateySource = ChocolateyGui.Common.Models.ChocolateySource; using IFileSystem = chocolatey.infrastructure.filesystem.IFileSystem; @@ -31,6 +32,8 @@ namespace ChocolateyGui.Common.Windows.Services { using ChocolateySource = ChocolateySource; using ILogger = Serilog.ILogger; + using LogLevel = Models.LogLevel; + using LogMessage = Models.LogMessage; public class ChocolateyService : IChocolateyService { @@ -142,7 +145,7 @@ public async Task> GetOutdatedPackages(bool inclu var results = packages .Where(p => !p.Value.Inconclusive) .Select(p => new OutdatedPackage - { Id = p.Value.Package.Id, VersionString = p.Value.Package.Version.ToNormalizedString() }) + { Id = p.Value.Name, VersionString = p.Value.Version }) .ToArray(); try @@ -214,7 +217,9 @@ public async Task InstallPackage( config.ApplyInstallArgumentsToDependencies = advancedInstallOptions.ApplyInstallArgumentsToDependencies; config.ApplyPackageParametersToDependencies = advancedInstallOptions.ApplyPackageParametersToDependencies; config.AllowDowngrade = advancedInstallOptions.AllowDowngrade; +#pragma warning disable CS0618 // Type or member is obsolete config.AllowMultipleVersions = advancedInstallOptions.AllowMultipleVersions; +#pragma warning restore CS0618 // Type or member is obsolete config.IgnoreDependencies = advancedInstallOptions.IgnoreDependencies; config.ForceDependencies = advancedInstallOptions.ForceDependencies; config.SkipPackageInstallProvider = advancedInstallOptions.SkipPowerShell; @@ -313,9 +318,11 @@ public async Task GetByVersionAndIdAsync(string id, string version, boo }); var chocoConfig = _choco.GetConfiguration(); - var nugetLogger = _choco.Container().GetInstance(); - var semvar = new SemanticVersion(version); - var nugetPackage = await Task.Run(() => (NugetList.GetPackages(chocoConfig, nugetLogger) as IQueryable).FirstOrDefault(p => p.Version == semvar)); + var nugetLogger = _choco.Container().GetInstance(); + var origVer = chocoConfig.Version; + chocoConfig.Version = version; + var nugetPackage = await Task.Run(() => (NugetList.GetPackages(chocoConfig, nugetLogger, _fileSystem) as IQueryable).FirstOrDefault()); + chocoConfig.Version = origVer; if (nugetPackage == null) { throw new Exception("No Package Found"); @@ -399,6 +406,7 @@ public async Task PinPackage(string id, string version) config.PinCommand.Command = PinCommandType.add; config.PinCommand.Name = id; config.Version = version; + config.Sources = ApplicationParameters.PackagesLocation; }); try @@ -425,6 +433,7 @@ public async Task UnpinPackage(string id, string version config.PinCommand.Command = PinCommandType.remove; config.PinCommand.Name = id; config.Version = version; + config.Sources = ApplicationParameters.PackagesLocation; }); try { @@ -620,26 +629,25 @@ public async Task ExportPackages(string exportFilePath, bool includeVersionNumbe private static Package GetMappedPackage(GetChocolatey choco, PackageResult package, IMapper mapper, bool forceInstalled = false) { - var mappedPackage = package == null ? null : mapper.Map(package.Package); + var mappedPackage = package == null ? null : mapper.Map(package.SearchMetadata); if (mappedPackage != null) { + if (package.PackageMetadata != null) + { + mappedPackage.ReleaseNotes = package.PackageMetadata.ReleaseNotes; + mappedPackage.Language = package.PackageMetadata.Language; + mappedPackage.Copyright = package.PackageMetadata.Copyright; + } + var packageInfoService = choco.Container().GetInstance(); - var packageInfo = packageInfoService.get_package_information(package.Package); + var packageInfo = packageInfoService.get_package_information(package.PackageMetadata); mappedPackage.IsPinned = packageInfo.IsPinned; mappedPackage.IsInstalled = !string.IsNullOrWhiteSpace(package.InstallLocation) || forceInstalled; +#pragma warning disable CS0618 // Type or member is obsolete mappedPackage.IsSideBySide = packageInfo.IsSideBySide; +#pragma warning restore CS0618 // Type or member is obsolete mappedPackage.IsPrerelease = mappedPackage.Version.IsPrerelease; - - // Add a sanity check here for pre-release packages - // By default, pre-release packages are marked as IsLatestVersion = false, however, IsLatestVersion is - // what is used to show/hide the Out of Date message in the UI. In these cases, if it is a pre-release - // mark IsLatestVersion as true, and then the outcome of the call to choco outdated will correct whether - // it is actually Out of Date or not - if (mappedPackage.IsPrerelease && mappedPackage.IsAbsoluteLatestVersion && !mappedPackage.IsLatestVersion) - { - mappedPackage.IsLatestVersion = true; - } } return mappedPackage; diff --git a/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs b/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs index e19bcf522..ec8f01a30 100644 --- a/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs +++ b/Source/ChocolateyGui.Common.Windows/Startup/ChocolateyGuiModule.cs @@ -29,7 +29,7 @@ using ChocolateyGui.Common.Windows.ViewModels; using ChocolateyGui.Common.Windows.Views; using LiteDB; -using NuGet; +using NuGet.Protocol.Core.Types; using ChocolateySource = chocolatey.infrastructure.app.configuration.ChocolateySource; using Environment = System.Environment; using PackageViewModel = ChocolateyGui.Common.Windows.ViewModels.Items.PackageViewModel; @@ -94,10 +94,11 @@ protected override void Load(ContainerBuilder builder) config.CreateMap() .ForMember(vm => vm.IsInstalled, options => options.Ignore()); - config.CreateMap() + config.CreateMap() + .ForMember(dest => dest.Version, opt => opt.MapFrom(src => src.Identity.Version)) + .ForMember(dest => dest.Id, opt => opt.MapFrom(src => src.Identity.Id)) .ForMember(dest => dest.Authors, opt => opt.MapFrom(src => src.Authors.Split(','))) .ForMember(dest => dest.Owners, opt => opt.MapFrom(src => src.Owners.Split(','))); - config.CreateMap(); config.CreateMap(); config.CreateMap(); diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs index 50001505e..648a8506e 100644 --- a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs +++ b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs @@ -68,7 +68,7 @@ public class PackageViewModel : private string _id; - private bool _isAbsoluteLatestVersion; + private bool _isOutdated; private bool _isInstalled; @@ -76,8 +76,6 @@ public class PackageViewModel : private bool _isSideBySide; - private bool _isLatestVersion; - private bool _isPrerelease; private string _language; @@ -173,7 +171,7 @@ public string[] Authors public bool IsUninstallAllowed => _allowedCommandsService.IsUninstallCommandAllowed; - public bool CanUpdate => IsInstalled && !IsPinned && !IsSideBySide && !IsLatestVersion; + public bool CanUpdate => IsInstalled && !IsPinned && !IsSideBySide && IsOutdated; public bool IsUpgradeAllowed => _allowedCommandsService.IsUpgradeCommandAllowed; @@ -232,12 +230,6 @@ public string LowerCaseId get { return Id.ToLowerInvariant(); } } - public bool IsAbsoluteLatestVersion - { - get { return _isAbsoluteLatestVersion; } - set { SetPropertyValue(ref _isAbsoluteLatestVersion, value); } - } - public bool IsInstalled { get @@ -286,16 +278,16 @@ public bool IsSideBySide } } - public bool IsLatestVersion + public bool IsOutdated { get { - return _isLatestVersion; + return _isOutdated; } set { - if (SetPropertyValue(ref _isLatestVersion, value)) + if (SetPropertyValue(ref _isOutdated, value)) { NotifyPropertyChanged(nameof(CanUpdate)); } @@ -713,7 +705,7 @@ public void Handle(PackageHasUpdateMessage message) } LatestVersion = message.Version; - IsLatestVersion = false; + IsOutdated = true; } private async Task InstallPackage(string version, AdvancedInstall advancedOptions = null) diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/RemoteSourceViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/RemoteSourceViewModel.cs index bff05e7b5..9dfe81cbe 100644 --- a/Source/ChocolateyGui.Common.Windows/ViewModels/RemoteSourceViewModel.cs +++ b/Source/ChocolateyGui.Common.Windows/ViewModels/RemoteSourceViewModel.cs @@ -27,6 +27,7 @@ using ChocolateyGui.Common.Windows.Utilities; using ChocolateyGui.Common.Windows.Utilities.Extensions; using NuGet; +using NuGet.Packaging; using Serilog; using ILogger = Serilog.ILogger; @@ -322,10 +323,6 @@ public async Task LoadPackages(bool forceCheckForOutdatedPackages) { p.IsInstalled = true; } - if (outdated.Any(package => string.Equals(package.Id, p.Id, StringComparison.OrdinalIgnoreCase))) - { - p.IsLatestVersion = false; - } Packages.Add(Mapper.Map(p)); }); diff --git a/Source/ChocolateyGui.Common/Models/Package.cs b/Source/ChocolateyGui.Common/Models/Package.cs index 72efad590..fae42401a 100644 --- a/Source/ChocolateyGui.Common/Models/Package.cs +++ b/Source/ChocolateyGui.Common/Models/Package.cs @@ -28,16 +28,12 @@ public class Package public string Id { get; set; } - public bool IsAbsoluteLatestVersion { get; set; } - public bool IsInstalled { get; set; } public bool IsPinned { get; set; } public bool IsSideBySide { get; set; } - public bool IsLatestVersion { get; set; } - public bool IsPrerelease { get; set; } public string Language { get; set; } diff --git a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs index c820a359d..f13b9277e 100644 --- a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs +++ b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs @@ -31,7 +31,7 @@ public interface IPackageViewModel string Id { get; set; } - bool IsAbsoluteLatestVersion { get; set; } + bool IsOutdated { get; set; } bool IsInstalled { get; set; } @@ -39,8 +39,6 @@ public interface IPackageViewModel bool IsSideBySide { get; set; } - bool IsLatestVersion { get; set; } - bool IsPrerelease { get; set; } string Language { get; set; } From 5f36d7763e228cfefffea66ec6d804720f98b2f3 Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH Date: Tue, 10 Jan 2023 13:30:15 -0600 Subject: [PATCH 15/61] (#974) Fix bindings IsLatestVersion -> IsOutdated --- .../ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml | 4 ++-- Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml | 4 ++-- .../ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml index e9043c42b..d3ed45cab 100644 --- a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml +++ b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml @@ -80,7 +80,7 @@ - + @@ -317,7 +317,7 @@ diff --git a/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml b/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml index 1c44b4786..006057bf4 100644 --- a/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml +++ b/Source/ChocolateyGui.Common.Windows/Views/PackageView.xaml @@ -257,7 +257,7 @@ - + @@ -277,7 +277,7 @@ - + diff --git a/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml b/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml index 9c05f9623..270ec5564 100644 --- a/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml +++ b/Source/ChocolateyGui.Common.Windows/Views/RemoteSourceView.xaml @@ -287,14 +287,14 @@ - + - + From f2a3b6d65e1d60abbd29ade4e67a186482439b61 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 7 Nov 2022 11:39:43 +0000 Subject: [PATCH 16/61] (build) Update to latest Chocolatey.Cake.Recipe This addresses a known issue where if the branch name starts with a number (which then generates an invalid version number for choco pack), that the asserted version number is changed to remove the number at the start of the asserted version number. --- recipe.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index 88202eff6..6102cec72 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Chocolatey.Cake.Recipe&version=0.16.0 +#load nuget:?package=Chocolatey.Cake.Recipe&version=0.19.0 /////////////////////////////////////////////////////////////////////////////// // MODULES From fa4db64886768d4a3058dc78a80d4f3d155603c5 Mon Sep 17 00:00:00 2001 From: "Cory Knox (He/Him)" <30301021+corbob@users.noreply.github.com> Date: Mon, 5 Dec 2022 07:38:51 -0800 Subject: [PATCH 17/61] (build) Allow building with Visual Studio 2022 - Update chocolatey.cake.recipe version to latest - Remove setting the build tool version to VS2019 so that VS 2022 can be used to build --- recipe.cake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe.cake b/recipe.cake index 6102cec72..bc5b4a542 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Chocolatey.Cake.Recipe&version=0.19.0 +#load nuget:?package=Chocolatey.Cake.Recipe&version=0.20.1 /////////////////////////////////////////////////////////////////////////////// // MODULES @@ -112,8 +112,7 @@ BuildParameters.SetParameters(context: Context, shouldBuildMsi: true, strongNameDependentAssembliesInputPath: string.Format("{0}{1}", ((FilePath)("./Source")).FullPath, "\\packages\\Splat*")); -ToolSettings.SetToolSettings(context: Context, - buildMSBuildToolVersion: MSBuildToolVersion.VS2019); +ToolSettings.SetToolSettings(context: Context); BuildParameters.PrintParameters(Context); From 2da8af019a283d9fe09b4343d6655c21a77f6094 Mon Sep 17 00:00:00 2001 From: Rain Sallow <32407840+vexx32@users.noreply.github.com> Date: Thu, 27 Oct 2022 08:57:45 -0400 Subject: [PATCH 18/61] (maint) add/update 3rd party licenses information Also moved LICENSE.txt to \legal\ folder in the nupkg, and added the CREDITS.md in there as well. --- CREDITS.md | 94 ++++++++++++++++++++------ nuspec/chocolatey/ChocolateyGUI.nuspec | 3 +- 2 files changed, 74 insertions(+), 23 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 612b88da1..b6e0af0ae 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -17,28 +17,7 @@ These are the committers to Chocolatey/Chocolatey GUI repository: * [Chocolatey GUI](https://github.com/chocolatey/chocolateygui/graphs/contributors) -## Frameworks - -Chocolatey GUI uses the following awesome frameworks: - -* [Autofac](http://autofac.org/) -* [AutoMapper](http://automapper.org/) -* [Caliburn.Micro](https://github.com/Caliburn-Micro/Caliburn.Micro) -* [ControlzEx](https://github.com/ControlzEx/ControlzEx) -* [corefx](https://github.com/dotnet/runtime) -* [Fizzler](https://github.com/atifaziz/Fizzler) -* [IconPacks](https://github.com/MahApps/MahApps.Metro.IconPacks) -* [LiteDB](https://www.litedb.org/) -* [log4net](http://logging.apache.org/log4net/) -* [MahApps.Metro](http://mahapps.com/) -* [Markdig](https://github.com/lunet-io/markdig) -* [Markdig.Wpf](https://github.com/Kryptos-FR/markdig.wpf) -* [Reactive Extenstions for .NET](https://github.com/dotnet/reactive) -* [Serilog](https://github.com/serilog/serilog) -* [Splat](https://github.com/reactiveui/splat) -* [SkiaSharp](https://github.com/mono/SkiaSharp) -* [Svg.Skia](https://github.com/wieslawsoltes/Svg.Skia) -* [XamlBehaviorsWpf](https://github.com/Microsoft/XamlBehaviorsWpf) +## Third-Party Dependencies - Development & Builds Chocolatey GUI is built, with the following fantastic frameworks and services: @@ -59,3 +38,74 @@ We would like to credit other super sweet tools/frameworks/services that aid in * [NuGet Framework](https://www.nuget.org/) * [ReSharper](https://www.jetbrains.com/resharper/) + +## Third-Party Dependencies and Licenses - Runtime + +Chocolatey GUI Editions uses Chocolatey FOSS components and also adds the following components listed below. + +### [GNU Lesser GPL](https://www.gnu.org/licenses/lgpl-3.0.html) + +* Fizzler @ 1.2.0 + +### [Apache v2.0 License](https://www.apache.org/licenses/LICENSE-2.0.html) + +* Chocolatey Open Source +* Serilog @ 2.5.0 +* Serilog.Formatting.Compact @ 1.0.0 +* Serilog.Sinks.Async @ 1.1.0 +* Serilog.Sinks.Console @ 3.1.0 +* Serilog.Sinks.File @ 3.2.0 +* Serilog.Sinks.PeriodicBatching @ 2.1.1 +* Serilog.Sinks.RollingFile @ 3.3.0 + +### [MIT License](https://mit-license.org/) + +* Autofac @ 4.6.1 +* AutoMapper @ 7.0.1 +* Caliburn.Micro @ 3.2.0 +* Caliburn.Micro.Core @ 3.2.0 +* ControlzEx @ 4.4.0 +* HarfBuzzSharp @ 2.6.1.4 +* LiteDB @ 5.0.5 +* MahApps.Metro @ 2.4.4 +* MahApps.Metro.IconPacks.BoxIcons @ 4.8.0 +* MahApps.Metro.IconPacks.Entypo @ 4.8.0 +* MahApps.Metro.IconPacks.FontAwesome @ 4.8.0 +* MahApps.Metro.IconPacks.Modern @ 4.8.0 +* MahApps.Metro.IconPacks.Octicons @ 4.8.0 +* MahApps.Metro.SimpleChildWindow @ 2.0.0 +* Microsoft.NETCore.Platforms @ 3.1.0 +* Microsoft.VisualStudio.Threading @ 15.4.4 +* Microsoft.VisualStudio.Validation @ 15.3.32 +* Microsoft.Xaml.Behaviors.Wpf @ 1.1.19 +* NETStandard.Library @ 2.0.3 +* SkiaSharp @ 1.68.3 +* SkiaSharp.HarfBuzz @ 1.68.3 +* Splat @ 2.0.0 +* Svg.Skia @ 0.3.0 +* System.Buffers @ 4.5.1 +* System.Memory @ 4.5.4 +* System.Numerics.Vectors @ 4.5.0 +* System.Reactive @ 3.1.1 +* System.Reactive.Core @ 3.1.1 +* System.Reactive.Interfaces @ 3.1.1 +* System.Reactive.Linq @ 3.1.1 +* System.Reactive.PlatformServices @ 3.1.1 +* System.Reactive.Windows.Threading @ 3.1.1 +* System.Runtime.CompilerServices.Unsafe @ 4.7.1 +* System.Threading.Tasks.Extensions @ 4.4.0 +* System.ValueTuple @ 4.5.0 + +### [BSD-2-Clause License](https://licenses.nuget.org/BSD-2-Clause) + +* Markdig.Signed @ 0.23.0 +* Markdig.Wpf.Signed @ 0.5.0.1 + +### [Microsoft Software License](https://go.microsoft.com/fwlink/?LinkId=329770) + +* System.Diagnostics.Contracts @ 4.3.0 +* System.Runtime.InteropServices.RuntimeInformation @ 4.3.0 + +### [MS-PL License](https://opensource.org/licenses/MS-PL) + +* Svg.Custom @ 0.3.0 diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index df6fd29f4..b766dcd35 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -36,7 +36,8 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc - + + From e880b1b0404f1efb6122eaab1ff56e32eb4f5a87 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 26 Jan 2023 07:51:33 +0000 Subject: [PATCH 19/61] (#978) Always delete outdated cache file Due to the way that the XmlService class works, if the information about the outdated packages is the same as what is currently present in the existing file, the file isn't updated. This is because the XmlService compares the hash, and chooses to not update the file, leaving it in tact. Depending on the use case, this is exactly the right thing to do, but for Chocolatey GUI, we use the date time of when the file was created as a trigger as to whether another outdated check is required. As a result, multiple repeated outdated checks can happen when not required. This commit first deletes the cached file if it exists, and a new outdated check was performed, writing a new file each time. This way, the outdated check will only be performed once, when required. --- .../Services/ChocolateyService.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs index 39397d53c..e2f43a00a 100644 --- a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs +++ b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs @@ -146,6 +146,16 @@ public async Task> GetOutdatedPackages(bool inclu try { + // The XmlService won't create a new file, if the file already exists with the same hash, + // i.e. the list of outdated packages hasn't changed. Currently, we check for new outdated + // packages, when the serialized file has become old/stale, so we NEED the file to be re-written + // when this check is done, so that it isn't always doing the check. Therefore, when we are + // getting ready to serialize the list of outdated packages, if the file already exists, delete it. + if (_fileSystem.file_exists(outdatedPackagesFile)) + { + _fileSystem.delete_file(outdatedPackagesFile); + } + _xmlService.serialize(results, outdatedPackagesFile); } catch (Exception ex) From 0cdf96d21eb87d22ca6d7051661a8d1fc41bcfd9 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 26 Jan 2023 08:20:55 +0000 Subject: [PATCH 20/61] (maint) Remove duplicates from csproj files The CODE_ANALYSIS constant was defined multiple times across the csproj files for Chocolatey GUI. This commit removes all the duplciates. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 016ce723e..1c4de67f0 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -43,7 +43,7 @@ bin\ReleaseOfficial\ - TRACE;CODE_ANALYSIS;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY + TRACE;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY true pdbonly AnyCPU diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 6630edf82..2361face0 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -39,7 +39,7 @@ bin\ReleaseOfficial\ - TRACE;CODE_ANALYSIS;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY + TRACE;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY true pdbonly AnyCPU diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 8b9f4533e..fbdb87cab 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -74,7 +74,7 @@ bin\ReleaseOfficial\ - TRACE;CODE_ANALYSIS;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY + TRACE;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY true pdbonly AnyCPU diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 74bbb5847..95b7cfcd6 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -43,7 +43,7 @@ bin\ReleaseOfficial\ - TRACE;CODE_ANALYSIS;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY + TRACE;CODE_ANALYSIS;FORCE_CHOCOLATEY_OFFICIAL_KEY true pdbonly AnyCPU From 3b5d4e4807e37aa8ccb9e31d0956a220752d5b1b Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 26 Jan 2023 08:23:09 +0000 Subject: [PATCH 21/61] (#977) Change variable names to be more specific To ensure that it is clear exactly which public keys are being referred to, but the variable names to include "Gui" in the name. That way, there is no ambiguity between the public keys used for Chocolatey CLI and Chocolatey GUI. --- Source/ChocolateyGui.Common.Windows/Bootstrapper.cs | 4 ++-- Source/ChocolateyGui/App.xaml.cs | 4 ++-- Source/ChocolateyGuiCli/Bootstrapper.cs | 4 ++-- Source/ChocolateyGuiCli/Program.cs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs index 86c62c5c6..7311630c3 100644 --- a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs +++ b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs @@ -48,8 +48,8 @@ public class Bootstrapper : BootstrapperBase public static readonly string ChocolateyGuiCommonAssemblySimpleName = "ChocolateyGui.Common"; public static readonly string ChocolateyGuiCommonWindowsAssemblySimpleName = "ChocolateyGui.Common.Windows"; - public static readonly string UnofficialChocolateyPublicKey = "ffc115b9f4eb5c26"; - public static readonly string OfficialChocolateyPublicKey = "dfd1909b30b79d8b"; + public static readonly string UnofficialChocolateyGuiPublicKey = "ffc115b9f4eb5c26"; + public static readonly string OfficialChocolateyGuiPublicKey = "dfd1909b30b79d8b"; public static readonly string Name = "Chocolatey GUI"; diff --git a/Source/ChocolateyGui/App.xaml.cs b/Source/ChocolateyGui/App.xaml.cs index bd9dfbaf8..5b8e5343a 100644 --- a/Source/ChocolateyGui/App.xaml.cs +++ b/Source/ChocolateyGui/App.xaml.cs @@ -59,9 +59,9 @@ public App() } #if FORCE_CHOCOLATEY_OFFICIAL_KEY - var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyPublicKey; + var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyGuiPublicKey; #else - var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyPublicKey; + var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyGuiPublicKey; #endif if (AssemblyResolver.DoesPublicKeyTokenMatch(requestedAssembly, chocolateyGuiPublicKey) diff --git a/Source/ChocolateyGuiCli/Bootstrapper.cs b/Source/ChocolateyGuiCli/Bootstrapper.cs index 76f54ce55..9b4fe0932 100644 --- a/Source/ChocolateyGuiCli/Bootstrapper.cs +++ b/Source/ChocolateyGuiCli/Bootstrapper.cs @@ -36,8 +36,8 @@ public static class Bootstrapper public static readonly string ChocolateyGuiCommonAssemblySimpleName = "ChocolateyGui.Common"; public static readonly string ChocolateyGuiCommonWindowsAssemblySimpleName = "ChocolateyGui.Common.Windows"; - public static readonly string UnofficialChocolateyPublicKey = "ffc115b9f4eb5c26"; - public static readonly string OfficialChocolateyPublicKey = "dfd1909b30b79d8b"; + public static readonly string UnofficialChocolateyGuiPublicKey = "ffc115b9f4eb5c26"; + public static readonly string OfficialChocolateyGuiPublicKey = "dfd1909b30b79d8b"; public static readonly string Name = "Chocolatey GUI"; diff --git a/Source/ChocolateyGuiCli/Program.cs b/Source/ChocolateyGuiCli/Program.cs index 4d1f7e0e2..ccb4d3924 100644 --- a/Source/ChocolateyGuiCli/Program.cs +++ b/Source/ChocolateyGuiCli/Program.cs @@ -51,9 +51,9 @@ private static void AddAssemblyResolver() } #if FORCE_CHOCOLATEY_OFFICIAL_KEY - var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyPublicKey; + var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyGuiPublicKey; #else - var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyPublicKey; + var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyGuiPublicKey; #endif if (AssemblyResolver.DoesPublicKeyTokenMatch(requestedAssembly, chocolateyGuiPublicKey) From 5e440feb5b63b82fb21e8fff97dbb9e975f93249 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 26 Jan 2023 08:26:05 +0000 Subject: [PATCH 22/61] (#977) Ensure that the correct public key is used When attempting to load the Chocolatey GUI Licensed Extension assembly, we need to ensure that the correct public key token is used. In previous versions of Chocolatey.Lib, the resolve_or_load_assembly method made assumptions that meant that this wasn't necessary, but a recent change over there has meant that it is now required. Without passing in this information, the Chocolatey GUI Licensed Extension assembly can't be located, and as a result, none of the licensed functionality currently works within Chocolatey GUI. --- Source/ChocolateyGui.Common.Windows/Bootstrapper.cs | 8 +++++++- .../ChocolateyGui.Common/Startup/AutoFacConfiguration.cs | 4 ++-- Source/ChocolateyGuiCli/Bootstrapper.cs | 8 +++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs index 7311630c3..671075bbc 100644 --- a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs +++ b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs @@ -103,7 +103,13 @@ protected override void Configure() Logger = Log.Logger = logConfig.CreateLogger(); - Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation); +#if FORCE_CHOCOLATEY_OFFICIAL_KEY + var chocolateyGuiPublicKey = OfficialChocolateyGuiPublicKey; +#else + var chocolateyGuiPublicKey = UnofficialChocolateyGuiPublicKey; +#endif + + Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation, chocolateyGuiPublicKey); } protected override async void OnStartup(object sender, StartupEventArgs e) diff --git a/Source/ChocolateyGui.Common/Startup/AutoFacConfiguration.cs b/Source/ChocolateyGui.Common/Startup/AutoFacConfiguration.cs index ef7bd02f4..616061d0b 100644 --- a/Source/ChocolateyGui.Common/Startup/AutoFacConfiguration.cs +++ b/Source/ChocolateyGui.Common/Startup/AutoFacConfiguration.cs @@ -20,7 +20,7 @@ public static class AutoFacConfiguration "Microsoft.Maintainability", "CA1506:AvoidExcessiveClassCoupling", Justification = "This is really a requirement due to required registrations.")] - public static IContainer RegisterAutoFac(string chocolateyGuiAssemblySimpleName, string licensedGuiAssemblyLocation) + public static IContainer RegisterAutoFac(string chocolateyGuiAssemblySimpleName, string licensedGuiAssemblyLocation, string publicKey) { var builder = new ContainerBuilder(); builder.RegisterAssemblyModules(System.Reflection.Assembly.GetCallingAssembly()); @@ -32,7 +32,7 @@ public static IContainer RegisterAutoFac(string chocolateyGuiAssemblySimpleName, { var licensedGuiAssembly = AssemblyResolution.resolve_or_load_assembly( chocolateyGuiAssemblySimpleName, - chocolatey.infrastructure.app.ApplicationParameters.OfficialChocolateyPublicKey, + publicKey, licensedGuiAssemblyLocation); if (licensedGuiAssembly != null) diff --git a/Source/ChocolateyGuiCli/Bootstrapper.cs b/Source/ChocolateyGuiCli/Bootstrapper.cs index 9b4fe0932..180b0daf0 100644 --- a/Source/ChocolateyGuiCli/Bootstrapper.cs +++ b/Source/ChocolateyGuiCli/Bootstrapper.cs @@ -72,7 +72,13 @@ internal static void Configure() Logger = Log.Logger = logConfig.CreateLogger(); - Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation); +#if FORCE_CHOCOLATEY_OFFICIAL_KEY + var chocolateyGuiPublicKey = OfficialChocolateyGuiPublicKey; +#else + var chocolateyGuiPublicKey = UnofficialChocolateyGuiPublicKey; +#endif + + Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation, chocolateyGuiPublicKey); } } } \ No newline at end of file From 711822a5325d0aa45a4a7525df460b849c30feaa Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 27 Jan 2023 14:23:19 +0000 Subject: [PATCH 23/61] (#974) Modify references to Chocolatey assembly In order for things to work correctly, both during debugging, and release builds, it is necessary to remove the explicit targetting of the referenced Chocolatey assembly. This is similar to what is done elsewhere in other Chocolatey codebases, and allows for both officially signed, and non-officially signed, refernces to be used. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 3ac38bd5e..661cf4fa7 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -67,7 +67,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 43e5b609b..a1d212059 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -54,7 +54,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index a15e92b9d..56fc9e38c 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -113,7 +113,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 5a5af6e28..0a6817307 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -56,7 +56,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - + ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll From d26e3d6c0e3862815c21137b2242bc7276e811b2 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 27 Jan 2023 14:25:10 +0000 Subject: [PATCH 24/61] (build) Add script to fetch latest Chocolatey bits When debugging Chocolatey GUI with the latest Chocolatey library, it is necessary to first build the Chocolatey CLI project, and copy the generated assemblies into the correct location. To save repeated work, this script (similar ones are used in other repositories) does that work for us, in a repeatable and configurable way. --- Get-ChocoUpdatedDebugVersion.ps1 | 150 +++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) create mode 100644 Get-ChocoUpdatedDebugVersion.ps1 diff --git a/Get-ChocoUpdatedDebugVersion.ps1 b/Get-ChocoUpdatedDebugVersion.ps1 new file mode 100644 index 000000000..950bee4fd --- /dev/null +++ b/Get-ChocoUpdatedDebugVersion.ps1 @@ -0,0 +1,150 @@ +[CmdletBinding(DefaultParameterSetName = "tag")] +param( + # The location where Chocolatey CLI sources are located, + # or will be located if the directory does not already exist. + # If not specified and the environment variable `CHOCO_SOURCE_LOCATION` + # is not definied, the location will default to `$env:TEMP\ + [Alias("ChocoLocation")] + [string] $ChocoSourceLocation = $env:CHOCO_SOURCE_LOCATION, + + # Checkout a specific tag of your own choosing. + # This value can also be a specific commit or a branch, but + # will be notified as being a tag. + # NOTE: Only tags already pulled down will be considered. + [Parameter(ParameterSetName = "tag")] + [string] $CheckoutTag = $null, + + # Checkout the latest tag available in the Chocolatey Source Location. + # NOTE: Only tags already pulled down will be considered. + [Parameter(ParameterSetName = "latest")] + [switch] $CheckoutLatestTag, + + # Try check out a tage with the same name as what is used as a reference + # in the packages.config file. If the reference specified is not a stable + # version, the latest tag will be checked out instead. + # NOTE: Only tags already pulled down will be considered. + [Parameter(ParameterSetName = 'ref-tag')] + [switch] $CheckoutRefTag, + + # Remove and clone the specified Chocolatey Source Location again. + # This is a very destructive operation, and should only be used if + # you are not interested in any local information. + [switch] $ForceChocoClone +) + +function CheckoutTag { + param( + [Parameter(Mandatory)] + [string] $SourceLocation, + + [string] $TagName + ) + + Push-Location "$SourceLocation" + if (!$TagName) { + $TagName = . git tag --sort v:refname | Where-Object { $_ -match "^[\d\.]+$" } | Select-Object -last 1 + } + + if ($TagName) { + git checkout $TagName -q 2>$null + if ($LASTEXITCODE -eq 0) { + Write-Host "Checked out Chocolatey CLI tag '$TagName'" + } + else { + $currentBranch = . git branch --show-current + if ($currentBranch) { + Write-Warning "Unable to check out tag $TagName. Leaving source in branch $currentBranch" + } + else { + Write-Warning "Unable to check out tag $TagName. Leaving source in commit $(git rev-parse HEAD)" + } + } + } + + Pop-Location +} + +Write-Host "We are at $PSScriptRoot" + +[xml]$packagesConfigFile = Get-Content -Path "$PSScriptRoot/Source/ChocolateyGui/packages.config" + +$chocolateyLibPackageVersion = $($packagesConfigFile.packages.package | Where-Object { $_.id -eq "chocolatey.lib" }).version + +if ($CheckoutRefTag) { + + if ($chocolateyLibPackageVersion -match '^[\d\.]+$') { + $CheckoutTag = $chocolateyLibPackageVersion + } + else { + $CheckoutLatestTag = $true + } +} + +if (!$ChocoSourceLocation) { + # To allow a default path being used for cloning the repository + $ChocoSourceLocation = "$env:TEMP\chocoSource" +} + +Write-Host "Looking for choco in '$ChocoSourceLocation'" + +if ($ForceChocoClone -and (Test-Path $ChocoSourceLocation)) { + Write-Host "Removing existing Chocolatey CLI Source in '$ChocoSourceLocation'" + # We use error action stop here, as there may be times the `.git` directory is locked. + # Having information about this is helpful to rectify the issue. + Remove-Item $ChocoSourceLocation -Recurse -Force -EA Stop +} + +if (!(Test-Path $ChocoSourceLocation)) { + Write-Host "Cloning Chocolatey CLI Repository to '$ChocoSourceLocation'" + git clone "https://github.com/chocolatey/choco.git" "$ChocoSourceLocation" + + if ($CheckoutLatestTag) { + CheckoutTag $ChocoSourceLocation + } + elseif ($CheckoutTag) { + CheckoutTag $ChocoSourceLocation -TagName $CheckoutTag + } +} +elseif ($CheckoutLatestTag) { + CheckoutTag $ChocoSourceLocation +} +elseif ($CheckoutTag) { + CheckoutTag $ChocoSourceLocation -TagName $CheckoutTag +} + +if (-not (Test-Path -Path $ChocoSourceLocation)) { + # We leave this here on purpose in case the cloning of the repository has failed. + throw "Location '$ChocoSourceLocation' not found; please rerun with the -ChocoSourceLocation parameter or set the CHOCO_SOURCE_LOCATION environment variable." +} + +Write-Host "Restore packages on project first..." +& ./build.debug.bat --target='Restore' + +Write-Host "Building choco at $ChocoSourceLocation with Debug..." + +Push-Location $ChocoSourceLocation +if (Test-Path "recipe.cake") { + & ./build.debug.bat --target='Build' + & ./build.debug.bat --target='Run-ILMerge' --exclusive +} +else { + & ./build.debug.bat +} +Pop-Location + +Write-Host "Copying chocolatey artifacts to current Chocolatey Package Version folder..." + +$chocolateyLibPackageFolder = "$PSScriptRoot/Source/packages/chocolatey.lib.$chocolateyLibPackageVersion/lib/net48" + +if (-not (Test-Path -Path $chocolateyLibPackageFolder)) { + New-Item -ItemType Directory -Path $chocolateyLibPackageFolder > $null +} + +$codeDropLibs = "$ChocoSourceLocation/code_drop/temp/_PublishedLibs/chocolatey_merged" + +if (!(Test-Path $codeDropLibs)) { + $codeDropLibs = "$ChocoSourceLocation/code_drop/chocolatey/lib" +} + +Write-Host "Copying chocolatey lib items from '$codeDropLibs/*' to '$chocolateyLibPackageFolder'." +Copy-Item -Path "$codeDropLibs/*" -Destination "$chocolateyLibPackageFolder/" -Force \ No newline at end of file From 155014f479da1caca047f43f72ccd935fa59f49f Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Sat, 4 Feb 2023 15:52:07 +0000 Subject: [PATCH 25/61] (#974) Update to latest version of Chocolatey.Lib Note: This will fail OSS builds of Chocolatey GUI until we release a new alpha version of Chocolatey.Lib. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 661cf4fa7..2a0a0a3d2 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index dadc2cae6..871321342 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index a1d212059..b7dee8f9b 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index a0556fdeb..3e8fbbcfb 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 56fc9e38c..08589a820 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 88d61ff33..9f2687e50 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 0a6817307..12cd674bf 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230124\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index b35d66be0..4f7b7d361 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From d0a138ee6acd3d1e481b8421ace0fb82ad03b393 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 17 Feb 2023 08:08:13 +0000 Subject: [PATCH 26/61] (#974) Update to latest version of Chocolatey.Lib --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 2a0a0a3d2..6a6778a5c 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 871321342..2b3222106 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index b7dee8f9b..b6d4e80d6 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 3e8fbbcfb..5622fd104 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 08589a820..4601d1053 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 9f2687e50..532460269 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 12cd674bf..2cbf9e7e1 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230203-845\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 4f7b7d361..f5b63f199 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From 90363667ae263f7c6c0baea46621e18c4e3d2c5e Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 17 Feb 2023 09:00:06 +0000 Subject: [PATCH 27/61] (build) Turn off the usage of Transifex We need to update to use the latest Transifex API, as the current calls to it are no longer supported. --- recipe.cake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index bc5b4a542..1abdec6ac 100644 --- a/recipe.cake +++ b/recipe.cake @@ -110,7 +110,8 @@ BuildParameters.SetParameters(context: Context, getFilesToSign: getFilesToSign, getMsisToSign: getMsisToSign, shouldBuildMsi: true, - strongNameDependentAssembliesInputPath: string.Format("{0}{1}", ((FilePath)("./Source")).FullPath, "\\packages\\Splat*")); + strongNameDependentAssembliesInputPath: string.Format("{0}{1}", ((FilePath)("./Source")).FullPath, "\\packages\\Splat*"), + shouldRunTransifex: false); ToolSettings.SetToolSettings(context: Context); From 2827e9b6941bb0537033e4a1fb6a78f4bd9f0d09 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 20 Feb 2023 07:39:15 +0000 Subject: [PATCH 28/61] (#974) Update to latest version of Chocolatey.Lib --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 6a6778a5c..f64fa0e46 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 2b3222106..5a318722e 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index b6d4e80d6..dbcd20b30 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 5622fd104..be01f5a5e 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 4601d1053..5f6e39a1b 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 532460269..f9bfcc819 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 2cbf9e7e1..99bd15f3e 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230216-883\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index f5b63f199..bdd2a187b 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From e95daedb075528fc2df806a4a73024e5195bd397 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 21 Feb 2023 07:53:14 +0000 Subject: [PATCH 29/61] (#974) Update to alpha release of Chocolatey.Lib This includes bumping the dependency in the nuspec to the required version range. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- nuspec/chocolatey/ChocolateyGUI.nuspec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index f64fa0e46..1a6e0a725 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 5a318722e..8423e1455 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index dbcd20b30..e2d7d0ecc 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index be01f5a5e..0d1383ccb 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 5f6e39a1b..c1f37878e 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index f9bfcc819..5dc9316ea 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 99bd15f3e..6068f9cb0 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230219-886\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index bdd2a187b..25705eaab 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index b766dcd35..3b9708c1b 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -26,7 +26,7 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc chocolateygui chocolatey admin foss - + From 76d18005a84d17eb26899f88698259891fd0462e Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 6 Mar 2023 08:46:34 +0000 Subject: [PATCH 30/61] (#974) Ensure Chocolatey assemblies not in MSI Ensure that the chocolatey.dll and chocolatey.pdb file are not copied into the MSI file. ChocolateyGUI should use only the system installed version of Chocolatey, and not a local version. --- .../ChocolateyGui.Install/ApplicationContent.Transform.xsl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/ChocolateyGui.Install/ApplicationContent.Transform.xsl b/Source/ChocolateyGui.Install/ApplicationContent.Transform.xsl index ffb6e158d..b3f66c56d 100644 --- a/Source/ChocolateyGui.Install/ApplicationContent.Transform.xsl +++ b/Source/ChocolateyGui.Install/ApplicationContent.Transform.xsl @@ -36,4 +36,9 @@ + + + + + \ No newline at end of file From 4128791cdee1b7fb2bc6bf707082b3bdbfc7cc97 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 6 Mar 2023 13:06:12 +0000 Subject: [PATCH 31/61] (#974) Add required properties to csproj files In a previous commit: https://github.com/chocolatey/ChocolateyGUI/commit/86f974c9e8c636d96a5330ea8c357f6e463425ad The SpecificVersion and Private properties had been removed, which meants that the chocolatey.dll was being copied, incorrectly, to the output folder, as well as requiring a specificversion of a referenced assembly to be provided. The former has been "fixed" by ensuring that the MSI project doesn't include the chocolatey.dll into the MSI, however, this commit addresses the issue at the source as well. This means that while in Debug mode, the chocolatey.dll will be copied to the output folder to help with debugging of Chocolatey GUI, however, in other build configurations, it will not be copied. --- .../ChocolateyGui.Common.Windows.csproj | 2 ++ Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 ++ Source/ChocolateyGui/ChocolateyGui.csproj | 2 ++ Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 1a6e0a725..b3900e2b9 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -69,6 +69,8 @@ ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + False + False ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index e2d7d0ecc..306c0b417 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -56,6 +56,8 @@ ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + False + False ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index c1f37878e..60aee6501 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -115,6 +115,8 @@ ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + False + False ..\packages\ControlzEx.4.4.0\lib\net462\ControlzEx.dll diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 6068f9cb0..e55c82de3 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -58,6 +58,8 @@ ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + False + False ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll From 3bd903508a9e63648c84579a6241a4e959c49962 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 7 Mar 2023 08:20:31 +0000 Subject: [PATCH 32/61] (#974) Update to alpha release of Chocolatey.Lib --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index b3900e2b9..d9e419afb 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 8423e1455..2039435e2 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 306c0b417..a5949ba7f 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 0d1383ccb..f9af863c5 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 60aee6501..4aab62e6f 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 5dc9316ea..dd877d011 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index e55c82de3..8c4301065 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230221\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 25705eaab..bb5af717b 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From b8bd1be4fddb4eaccd2e393017c45f3fabd213d9 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 7 Mar 2023 08:21:53 +0000 Subject: [PATCH 33/61] (#974) Update to alpha package in nuspec So that everything in this next release cycle lines up. --- nuspec/chocolatey/ChocolateyGUI.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index 3b9708c1b..881d9e2a1 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -26,7 +26,7 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc chocolateygui chocolatey admin foss - + From 9f6e7347290921b12829502f16a92b477e2e2c49 Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Thu, 2 Mar 2023 13:42:57 -0500 Subject: [PATCH 34/61] (maint) update Transifex config Transifex version update requires config format updates apparently. (cherry picked from commit 867b2b8a8ccae3d0a6f1cb891d2ab42f9a9a82d4) --- .tx/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.tx/config b/.tx/config index 28cf1a9f3..d120d80a0 100644 --- a/.tx/config +++ b/.tx/config @@ -2,9 +2,8 @@ host = https://www.transifex.com lang_map = en_GB: en-GB, en_US: en-US, zh_CN: zh-CN, cs_CZ: cs-CZ -[chocolatey-gui.resourcesresx] +[o:chocolatey:p:chocolatey-gui:r:resourcesresx] file_filter = Source/ChocolateyGui.Common/Properties/Resources..resx source_file = Source/ChocolateyGui.Common/Properties/Resources.resx source_lang = en type = RESX - From e12ebf3410407d0e3912b13fd08b20c30d73c226 Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Fri, 3 Mar 2023 12:36:28 -0500 Subject: [PATCH 35/61] (maint) use new transifex CLI for build Also needed to update the recipe version as there is a change to the recipe necessary for the new CLI to work. (cherry picked from commit 2c7140d81c15afef5ea78a6677d875ec3e197829) --- recipe.cake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe.cake b/recipe.cake index 1abdec6ac..09c5ef779 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Chocolatey.Cake.Recipe&version=0.20.1 +#load nuget:?package=Chocolatey.Cake.Recipe&version=0.20.2 /////////////////////////////////////////////////////////////////////////////// // MODULES @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////////////////////////// // TOOLS /////////////////////////////////////////////////////////////////////////////// -#tool choco:?package=transifex-client&version=0.12.4 +#tool choco:?package=transifex-cli&version=1.6.5 if (BuildSystem.IsLocalBuild) { @@ -102,6 +102,7 @@ BuildParameters.SetParameters(context: Context, repositoryOwner: "chocolatey", repositoryName: "ChocolateyGUI", shouldDownloadMilestoneReleaseNotes: true, + treatWarningsAsErrors: false, productName: "Chocolatey GUI", productDescription: "Chocolatey GUI is a product of Chocolatey Software, Inc. - All Rights Reserved", productCopyright: "Copyright 2014 - Present Open Source maintainers of Chocolatey GUI, and Chocolatey Software, Inc. - All Rights Reserved.", From f6b8716c47fc5ae235e68e68b3494752c5632618 Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Tue, 7 Mar 2023 15:50:34 -0500 Subject: [PATCH 36/61] (maint) Add gitversion config for support branch I've pulled this over from the choco repo as our CI builds are failing to assert a sensible version number for prerelease builds on this branch This seems to fix the issue based on the behaviour of running gitversion locally with this change. (cherry picked from commit 85e62be9499d2b81f22d40b752821cda2867d36f) # Conflicts: # GitVersion.yml --- GitVersion.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index ddba28c28..e05cbb004 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1 +1,15 @@ -next-version: 2.0.0 \ No newline at end of file +next-version: 2.0.0 +branches: + support: + mode: ContinuousDeployment + tag: alpha + increment: Minor + prevent-increment-of-merged-branch-version: false + track-merge-target: true + regex: ^support[/-] + source-branches: + - main + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 55000 From 9ad887c10d1c8f303ca99684d498a9f2b074b008 Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Fri, 3 Mar 2023 12:36:55 -0500 Subject: [PATCH 37/61] (#985) update liteDB dependency (cherry picked from commit dc45ca1547a65d3c913c9b0a3a0fc804cb8fa5a7) # Conflicts: # Source/ChocolateyGui.Common/packages.config # Source/ChocolateyGuiCli/packages.config --- .../ChocolateyGui.Common.Windows.csproj | 4 ++-- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 4 ++-- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 4 ++-- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 4 ++-- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index d9e419afb..4d82b1c58 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -81,8 +81,8 @@ ..\packages\HarfBuzzSharp.2.6.1.4\lib\net462\HarfBuzzSharp.dll - - ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll + + ..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll ..\packages\log4net.2.0.12\lib\net45\log4net.dll diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 2039435e2..ce591023a 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -9,7 +9,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index a5949ba7f..0a70eb1ef 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -59,8 +59,8 @@ False False - - ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll + + ..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll ..\packages\log4net.2.0.12\lib\net45\log4net.dll diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index f9af863c5..8d132d5cc 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -4,7 +4,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 4aab62e6f..546b9133d 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -127,8 +127,8 @@ ..\packages\HarfBuzzSharp.2.6.1.4\lib\net462\HarfBuzzSharp.dll - - ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll + + ..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll ..\packages\log4net.2.0.12\lib\net45\log4net.dll diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index dd877d011..f02d233be 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -9,7 +9,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 8c4301065..fd8caf0b0 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -61,8 +61,8 @@ False False - - ..\packages\LiteDB.5.0.5\lib\net45\LiteDB.dll + + ..\packages\LiteDB.5.0.15\lib\net45\LiteDB.dll ..\packages\log4net.2.0.12\lib\net45\log4net.dll diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index bb5af717b..8b555a547 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -3,7 +3,7 @@ - + From bb8d1dd516e3a5c6298cf8464c30622fbc2ab01d Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Wed, 8 Mar 2023 08:49:23 -0500 Subject: [PATCH 38/61] (maint) Gitversion branch config use main not master We don't have a main branch in this repo. (cherry picked from commit 56c1093fa466f608dbdb9d3f91187e37689b429a) --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index e05cbb004..2ad7ab274 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -8,7 +8,7 @@ branches: track-merge-target: true regex: ^support[/-] source-branches: - - main + - master tracks-release-branches: true is-release-branch: false is-mainline: false From ba1983a4c3fdc69500635fdfbec928aaca1c836e Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Wed, 8 Mar 2023 09:12:34 -0500 Subject: [PATCH 39/61] (maint) Update dependency version in CREDITS.md Bump to LiteDB v5.0.15 (cherry picked from commit ae33706ce395d5ae2e405a84a542d5aaf036c8df) --- CREDITS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CREDITS.md b/CREDITS.md index b6e0af0ae..928fe6196 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -66,7 +66,7 @@ Chocolatey GUI Editions uses Chocolatey FOSS components and also adds the follow * Caliburn.Micro.Core @ 3.2.0 * ControlzEx @ 4.4.0 * HarfBuzzSharp @ 2.6.1.4 -* LiteDB @ 5.0.5 +* LiteDB @ 5.0.15 * MahApps.Metro @ 2.4.4 * MahApps.Metro.IconPacks.BoxIcons @ 4.8.0 * MahApps.Metro.IconPacks.Entypo @ 4.8.0 From 5909e3369cae545369541d2885813260a714ec90 Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Wed, 8 Mar 2023 10:01:10 -0500 Subject: [PATCH 40/61] (maint) Update GRM issue_note template According to our standard release notes format. (cherry picked from commit 04cd6f210dd7620d435b04d440da97b8049882de) --- .templates/default/issue-note.sbn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.templates/default/issue-note.sbn b/.templates/default/issue-note.sbn index dbc4cf054..01ae15c08 100644 --- a/.templates/default/issue-note.sbn +++ b/.templates/default/issue-note.sbn @@ -1 +1 @@ -- {{ issue.title }} - see [#{{ issue.number }}]({{ issue.html_url }}) +- {{ issue.title }} - see [#{{ issue.number }}]({{ issue.html_url }}). From f83cfdb5533adc95a4dc86d81cda75f4103a118f Mon Sep 17 00:00:00 2001 From: Rain Sallow Date: Wed, 8 Mar 2023 12:18:03 -0500 Subject: [PATCH 41/61] Revert "(build) Turn off the usage of Transifex" This reverts commit 90363667ae263f7c6c0baea46621e18c4e3d2c5e. --- recipe.cake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe.cake b/recipe.cake index 09c5ef779..6ef11e5cf 100644 --- a/recipe.cake +++ b/recipe.cake @@ -111,8 +111,7 @@ BuildParameters.SetParameters(context: Context, getFilesToSign: getFilesToSign, getMsisToSign: getMsisToSign, shouldBuildMsi: true, - strongNameDependentAssembliesInputPath: string.Format("{0}{1}", ((FilePath)("./Source")).FullPath, "\\packages\\Splat*"), - shouldRunTransifex: false); + strongNameDependentAssembliesInputPath: string.Format("{0}{1}", ((FilePath)("./Source")).FullPath, "\\packages\\Splat*")); ToolSettings.SetToolSettings(context: Context); From 1ae765bcbf41f0492e91dabb3ebb9908dc7cbed0 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 17 Mar 2023 17:45:10 +0000 Subject: [PATCH 42/61] (#974) Update to latest alpha package --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 4d82b1c58..98b5fa39f 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index ce591023a..79d9d1c84 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 0a70eb1ef..126295da2 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 8d132d5cc..abc4573b7 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 546b9133d..1150ea129 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index f02d233be..126e1a63f 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index fd8caf0b0..54448346d 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230307\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 8b555a547..10faf3cfd 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From e45f44e44c5fde1bebb9c491a03803eb7d0f0009 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 20 Mar 2023 09:56:58 +0000 Subject: [PATCH 43/61] (#990) Fix usage of ListCommand WIthout this change in place, the search for packages results in doing a choco list command, which now only returns locally installed packages. Instead, we need to force usage of choco search, to ensure that the remote repository is queried. --- .../ChocolateyGui.Common.Windows/Services/ChocolateyService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs index 033151a21..2b614165c 100644 --- a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs +++ b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs @@ -74,7 +74,6 @@ public async Task> GetInstalledPackages() config => { config.CommandName = CommandNameType.list.ToString(); - config.ListCommand.LocalOnly = true; }); var chocoConfig = _choco.GetConfiguration(); @@ -278,7 +277,7 @@ public async Task Search(string query, PackageSearchOptions opti _choco.Set( config => { - config.CommandName = CommandNameType.list.ToString(); + config.CommandName = "search"; config.Input = query; config.AllVersions = options.IncludeAllVersions; config.ListCommand.Page = options.CurrentPage; From f7b7ecffb05ebc7fff1fca02b95efe8946ba6162 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 20 Mar 2023 09:59:06 +0000 Subject: [PATCH 44/61] (#989) Remove usage of side by side With the upstream change in Chocolatey CLI to remove the usage of side by side installations, we need to do the same thing within Chocolatey GUI to prevent errors from happening. This commit removes the usage of the properties that have been removed from Chocolatey CLI, as well as changes the GUI to not include the setting of these properties. --- .../Services/ChocolateyService.cs | 6 ----- .../ViewModels/AdvancedInstallViewModel.cs | 7 ----- .../ViewModels/Items/PackageViewModel.cs | 20 +------------- .../Views/AdvancedInstallView.xaml | 3 --- .../Views/LocalSourceView.xaml | 5 ---- .../Models/AdvancedInstall.cs | 2 -- Source/ChocolateyGui.Common/Models/Package.cs | 2 -- .../Properties/Resources.Designer.cs | 27 ------------------- .../Properties/Resources.resx | 9 ------- .../ViewModels/Items/IPackageViewModel.cs | 2 -- 10 files changed, 1 insertion(+), 82 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs index 2b614165c..9be15c5db 100644 --- a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs +++ b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs @@ -226,9 +226,6 @@ public async Task InstallPackage( config.ApplyInstallArgumentsToDependencies = advancedInstallOptions.ApplyInstallArgumentsToDependencies; config.ApplyPackageParametersToDependencies = advancedInstallOptions.ApplyPackageParametersToDependencies; config.AllowDowngrade = advancedInstallOptions.AllowDowngrade; -#pragma warning disable CS0618 // Type or member is obsolete - config.AllowMultipleVersions = advancedInstallOptions.AllowMultipleVersions; -#pragma warning restore CS0618 // Type or member is obsolete config.IgnoreDependencies = advancedInstallOptions.IgnoreDependencies; config.ForceDependencies = advancedInstallOptions.ForceDependencies; config.SkipPackageInstallProvider = advancedInstallOptions.SkipPowerShell; @@ -652,9 +649,6 @@ private static Package GetMappedPackage(GetChocolatey choco, PackageResult packa var packageInfo = packageInfoService.get_package_information(package.PackageMetadata); mappedPackage.IsPinned = packageInfo.IsPinned; mappedPackage.IsInstalled = !string.IsNullOrWhiteSpace(package.InstallLocation) || forceInstalled; -#pragma warning disable CS0618 // Type or member is obsolete - mappedPackage.IsSideBySide = packageInfo.IsSideBySide; -#pragma warning restore CS0618 // Type or member is obsolete mappedPackage.IsPrerelease = mappedPackage.Version.IsPrerelease; } diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs index fab198a99..e5bd4f42d 100644 --- a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs +++ b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs @@ -42,7 +42,6 @@ public class AdvancedInstallViewModel : ObservableBase, IClosableChildWindow _allowedCommandsService.IsUninstallCommandAllowed; - public bool CanUpdate => IsInstalled && !IsPinned && !IsSideBySide && IsOutdated; + public bool CanUpdate => IsInstalled && !IsPinned && IsOutdated; public bool IsUpgradeAllowed => _allowedCommandsService.IsUpgradeCommandAllowed; @@ -262,22 +260,6 @@ public bool IsPinned } } - public bool IsSideBySide - { - get - { - return _isSideBySide; - } - - set - { - if (SetPropertyValue(ref _isSideBySide, value)) - { - NotifyPropertyChanged(nameof(CanUpdate)); - } - } - } - public bool IsOutdated { get diff --git a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml index 1564d3b74..de7eaeab0 100644 --- a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml +++ b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml @@ -270,9 +270,6 @@ - - - diff --git a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml index d3ed45cab..3c3b0736d 100644 --- a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml +++ b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml @@ -54,10 +54,6 @@ ToolTip="{lang:Localize LocalSourceView_ToolTip_Pinned}" Kind="Pin" Margin="0 2" Visibility="{Binding IsPinned, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}" /> - - diff --git a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs index d01fd47ec..ae9e89d08 100644 --- a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs +++ b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs @@ -33,8 +33,6 @@ public class AdvancedInstall public bool AllowDowngrade { get; set; } - public bool AllowMultipleVersions { get; set; } - public bool IgnoreDependencies { get; set; } public bool ForceDependencies { get; set; } diff --git a/Source/ChocolateyGui.Common/Models/Package.cs b/Source/ChocolateyGui.Common/Models/Package.cs index fae42401a..7720d2a08 100644 --- a/Source/ChocolateyGui.Common/Models/Package.cs +++ b/Source/ChocolateyGui.Common/Models/Package.cs @@ -32,8 +32,6 @@ public class Package public bool IsPinned { get; set; } - public bool IsSideBySide { get; set; } - public bool IsPrerelease { get; set; } public string Language { get; set; } diff --git a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs index 4a1a153a3..393bacee0 100644 --- a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs +++ b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs @@ -159,24 +159,6 @@ public static string AdvancedChocolateyDialog_AllowEmptyChecksumsSecure_ToolTip } } - /// - /// Looks up a localized string similar to Allow Multiple Versions. - /// - public static string AdvancedChocolateyDialog_AllowMultipleVersions_Header { - get { - return ResourceManager.GetString("AdvancedChocolateyDialog_AllowMultipleVersions_Header", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Should multiple versions of a package be installed?. - /// - public static string AdvancedChocolateyDialog_AllowMultipleVersions_ToolTip { - get { - return ResourceManager.GetString("AdvancedChocolateyDialog_AllowMultipleVersions_ToolTip", resourceCulture); - } - } - /// /// Looks up a localized string similar to Apply Install Arguments to Dependencies. /// @@ -1937,15 +1919,6 @@ public static string LocalSourceView_SearchBoxText { } } - /// - /// Looks up a localized string similar to Installed Side by Side with another version of the same package.. - /// - public static string LocalSourceView_ToolTip_InstalledSideBySide { - get { - return ResourceManager.GetString("LocalSourceView_ToolTip_InstalledSideBySide", resourceCulture); - } - } - /// /// Looks up a localized string similar to Pinned. /// diff --git a/Source/ChocolateyGui.Common/Properties/Resources.resx b/Source/ChocolateyGui.Common/Properties/Resources.resx index 9c87d9512..fc7e926fa 100644 --- a/Source/ChocolateyGui.Common/Properties/Resources.resx +++ b/Source/ChocolateyGui.Common/Properties/Resources.resx @@ -635,9 +635,6 @@ Or if there is a traditional way to show sorting by the Title in your language, Fetching packages... - - Installed Side by Side with another version of the same package. - Pinned @@ -1064,12 +1061,6 @@ Please contact your System Administrator to enable this operation. Allow packages to have empty/missing checksums for downloaded resources from non-secure locations (HTTP, FTP). Using this switch is not recommended if using sources that download resources from the internet. Only overrides the value in the configuration when 'On' is specified. - - Allow Multiple Versions - - - Should multiple versions of a package be installed? - Apply Install Arguments to Dependencies diff --git a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs index f13b9277e..d97c41de7 100644 --- a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs +++ b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs @@ -37,8 +37,6 @@ public interface IPackageViewModel bool IsPinned { get; set; } - bool IsSideBySide { get; set; } - bool IsPrerelease { get; set; } string Language { get; set; } From ea45903ca4b71aba4eebfd2eccba4d053c576bbb Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 20 Mar 2023 14:35:20 +0000 Subject: [PATCH 45/61] (#974) Update to beta packages for Chocolatey --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 98b5fa39f..ac62d9411 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 79d9d1c84..9623926af 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 126295da2..33b2a12ac 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index abc4573b7..87427d1f8 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 1150ea129..9f038f270 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 126e1a63f..fc6bebc9a 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 54448346d..0aceebf13 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 10faf3cfd..6aedc2461 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From 199c78d04833eaa988499e33e5aab60e7df22c48 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 21 Mar 2023 10:34:28 +0000 Subject: [PATCH 46/61] (#974) Update to released beta packages --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- nuspec/chocolatey/ChocolateyGUI.nuspec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index ac62d9411..50fd63cdf 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 9623926af..499e62a68 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 33b2a12ac..82e78cc33 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 87427d1f8..9b7c130c3 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 9f038f270..1618e77fe 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index fc6bebc9a..3c50c6712 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 0aceebf13..3398496fe 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 6aedc2461..df37d05d3 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index 881d9e2a1..2b3515dc7 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -26,7 +26,7 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc chocolateygui chocolatey admin foss - + From c680462ae26b292d62926de792c3a043393d3df0 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 21 Mar 2023 11:33:17 +0000 Subject: [PATCH 47/61] (maint) Prevent download of relase notes There is a bug in the Chocolatey.Cake.Recipe which is preventing the download of the release notes for this release, so let's skip it completely for just now. --- recipe.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index 6ef11e5cf..a6d08aa29 100644 --- a/recipe.cake +++ b/recipe.cake @@ -101,7 +101,7 @@ BuildParameters.SetParameters(context: Context, title: "Chocolatey GUI", repositoryOwner: "chocolatey", repositoryName: "ChocolateyGUI", - shouldDownloadMilestoneReleaseNotes: true, + shouldDownloadMilestoneReleaseNotes: false, treatWarningsAsErrors: false, productName: "Chocolatey GUI", productDescription: "Chocolatey GUI is a product of Chocolatey Software, Inc. - All Rights Reserved", From c1d410efe2e0c2baf84968bc1c1ae90efc00ff73 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 28 Mar 2023 13:32:51 +0100 Subject: [PATCH 48/61] (build) Add notification templates These will be used in future releases, when we ship a new version of Chocolatey.Cake.Recipe, which will allow for automatically sending notifications on a new release. --- .notifications/discord.txt | 5 +++++ .notifications/mastodon.txt | 1 + .notifications/slack.txt | 5 +++++ .notifications/twitter.txt | 5 +++++ 4 files changed, 16 insertions(+) create mode 100644 .notifications/discord.txt create mode 100644 .notifications/mastodon.txt create mode 100644 .notifications/slack.txt create mode 100644 .notifications/twitter.txt diff --git a/.notifications/discord.txt b/.notifications/discord.txt new file mode 100644 index 000000000..61aa0af0a --- /dev/null +++ b/.notifications/discord.txt @@ -0,0 +1,5 @@ +@everyone We have just released v{0} of the Chocolatey GUI! + +Release notes can be found here: + +https://docs.chocolatey.org/en-us/chocolatey-gui/release-notes#{1} \ No newline at end of file diff --git a/.notifications/mastodon.txt b/.notifications/mastodon.txt new file mode 100644 index 000000000..1a7380e12 --- /dev/null +++ b/.notifications/mastodon.txt @@ -0,0 +1 @@ +We have just released v{0} of the Chocolatey GUI! Release notes can be found here: https://docs.chocolatey.org/en-us/chocolatey-gui/release-notes#{1}. \ No newline at end of file diff --git a/.notifications/slack.txt b/.notifications/slack.txt new file mode 100644 index 000000000..84904705d --- /dev/null +++ b/.notifications/slack.txt @@ -0,0 +1,5 @@ +@channel We have just released v{0} of the Chocolatey GUI! + +Release notes can be found here: + +https://docs.chocolatey.org/en-us/chocolatey-gui/release-notes#{1} \ No newline at end of file diff --git a/.notifications/twitter.txt b/.notifications/twitter.txt new file mode 100644 index 000000000..d1c0ee741 --- /dev/null +++ b/.notifications/twitter.txt @@ -0,0 +1,5 @@ +We have just released v{0} of the Chocolatey GUI! + +Release notes can be found here: + +https://docs.chocolatey.org/en-us/chocolatey-gui/release-notes#{1} \ No newline at end of file From 32d0e6e52d85de82ef718ca3e1f5cd805ff2738f Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 28 Mar 2023 13:46:07 +0100 Subject: [PATCH 49/61] (build) Remove unnecessary configuration --- GitVersion.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 2ad7ab274..ddba28c28 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,15 +1 @@ -next-version: 2.0.0 -branches: - support: - mode: ContinuousDeployment - tag: alpha - increment: Minor - prevent-increment-of-merged-branch-version: false - track-merge-target: true - regex: ^support[/-] - source-branches: - - master - tracks-release-branches: true - is-release-branch: false - is-mainline: false - pre-release-weight: 55000 +next-version: 2.0.0 \ No newline at end of file From 350ddeb469b891010cefc53dd2f7f88103f664d3 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 28 Mar 2023 15:02:15 +0100 Subject: [PATCH 50/61] (build) Update to latest Chocolatey.Cake.Recipe This version fixes an issue with not uploading the MSI generated as part of the build. --- recipe.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index a6d08aa29..77a39bcb8 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Chocolatey.Cake.Recipe&version=0.20.2 +#load nuget:?package=Chocolatey.Cake.Recipe&version=0.22.0 /////////////////////////////////////////////////////////////////////////////// // MODULES From 125e77bcf253e95f2a04dd0ef2b74a7742d53a8a Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Wed, 12 Apr 2023 09:42:17 +0100 Subject: [PATCH 51/61] (maint) Update to latest beta Chocolatey packages --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 50fd63cdf..c0dd57857 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 499e62a68..204a6e4f2 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 82e78cc33..c22cdcd12 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 9b7c130c3..5313efcde 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 1618e77fe..fbf86b794 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 3c50c6712..7d5d4f91d 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 3398496fe..e6abc2412 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230321\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index df37d05d3..7f5efd64e 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From 7e5a586af819c659e2633f61a89ae4e69a4fe4d1 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Wed, 12 Apr 2023 10:07:24 +0100 Subject: [PATCH 52/61] (maint) Bump to beta package in nuspec --- nuspec/chocolatey/ChocolateyGUI.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index 2b3515dc7..8e3ca6a13 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -26,7 +26,7 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc chocolateygui chocolatey admin foss - + From 32a897316ef16775d12a6ea2a220bb579abbcc4e Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 13 Apr 2023 07:24:01 +0100 Subject: [PATCH 53/61] (maint) Remove @everyone from Discord notification We got some push back from the community after the last round of beta releases that there were too many @everyone notifications, as not everyone is interested in them. For now, until we potentially setup roles that folks can subscribe to, let's remove the everyone notification. --- .notifications/discord.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.notifications/discord.txt b/.notifications/discord.txt index 61aa0af0a..d1c0ee741 100644 --- a/.notifications/discord.txt +++ b/.notifications/discord.txt @@ -1,4 +1,4 @@ -@everyone We have just released v{0} of the Chocolatey GUI! +We have just released v{0} of the Chocolatey GUI! Release notes can be found here: From 0c0e10585aea5f33344c9c6b60f1470e7afbb1ca Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 21 Apr 2023 16:39:53 +0100 Subject: [PATCH 54/61] (maint) Update to latest beta Chocolatey packages This includes an update to NuGet.Client for fixing the count query that is emitted to a v2 feed. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index c0dd57857..a356ac2a0 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 204a6e4f2..453b21cec 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index c22cdcd12..124616dab 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 5313efcde..2d6e8402a 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index fbf86b794..4b005ceed 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index 7d5d4f91d..bef578900 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index e6abc2412..ebca4e88e 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230412\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 7f5efd64e..ed8a6d060 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From 1d2d27fafbe74cf61595fcdb16f9e2daf4d99796 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 21 Apr 2023 16:42:02 +0100 Subject: [PATCH 55/61] (maint) Switch from int to long When testing usage of nuget.org, there is a single package that has over 3 billion downloads. When attempting to view this package in Chocolatey GUI, there is a convert error, when it tries to convert this nubmer into an int. This is a similar change to what was done in CCR, when we crossed over the 1B mark for downloads. --- .../ViewModels/Items/PackageViewModel.cs | 8 ++++---- Source/ChocolateyGui.Common/Models/Package.cs | 4 ++-- .../ViewModels/Items/IPackageViewModel.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs index 5334e505d..61218a17e 100644 --- a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs +++ b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs @@ -60,7 +60,7 @@ public class PackageViewModel : private string _description; - private int _downloadCount; + private long _downloadCount; private string _galleryDetailsUrl; @@ -112,7 +112,7 @@ public class PackageViewModel : private NuGetVersion _version; - private int _versionDownloadCount; + private long _versionDownloadCount; public PackageViewModel( IChocolateyService chocolateyService, @@ -199,7 +199,7 @@ public string Description set { SetPropertyValue(ref _description, value); } } - public int DownloadCount + public long DownloadCount { get { return _downloadCount; } set { SetPropertyValue(ref _downloadCount, value); } @@ -384,7 +384,7 @@ public NuGetVersion Version set { SetPropertyValue(ref _version, value); } } - public int VersionDownloadCount + public long VersionDownloadCount { get { return _versionDownloadCount; } set { SetPropertyValue(ref _versionDownloadCount, value); } diff --git a/Source/ChocolateyGui.Common/Models/Package.cs b/Source/ChocolateyGui.Common/Models/Package.cs index 7720d2a08..b516c13df 100644 --- a/Source/ChocolateyGui.Common/Models/Package.cs +++ b/Source/ChocolateyGui.Common/Models/Package.cs @@ -20,7 +20,7 @@ public class Package public string Description { get; set; } - public int DownloadCount { get; set; } + public long DownloadCount { get; set; } public string GalleryDetailsUrl { get; set; } @@ -68,6 +68,6 @@ public class Package public NuGetVersion Version { get; set; } - public int VersionDownloadCount { get; set; } + public long VersionDownloadCount { get; set; } } } \ No newline at end of file diff --git a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs index d97c41de7..49dcffb8c 100644 --- a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs +++ b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs @@ -23,7 +23,7 @@ public interface IPackageViewModel string Description { get; set; } - int DownloadCount { get; set; } + long DownloadCount { get; set; } string GalleryDetailsUrl { get; set; } @@ -73,7 +73,7 @@ public interface IPackageViewModel NuGetVersion Version { get; set; } - int VersionDownloadCount { get; set; } + long VersionDownloadCount { get; set; } Task Install(); From 9b3e88f41542b4010a176049316604a15b2dd651 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Wed, 26 Apr 2023 07:23:47 +0100 Subject: [PATCH 56/61] (maint) Update to released beta packages This includes a bump in the dependency in the nuspec to point at the newly released beta package for Chocolatey CLI itself. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- nuspec/chocolatey/ChocolateyGUI.nuspec | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index a356ac2a0..cb3445add 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index 453b21cec..e7ff753ec 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 124616dab..5b9785ad6 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 2d6e8402a..11dab9ab9 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 4b005ceed..8b5889642 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index bef578900..e4d3f96b5 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index ebca4e88e..15f802256 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230421-1136\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index ed8a6d060..f05352dc4 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index 8e3ca6a13..a26cea515 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -26,7 +26,7 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc chocolateygui chocolatey admin foss - + From 79271ceb438e57a2b6c1b1721785f93593249ef1 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 11 May 2023 12:47:33 +0100 Subject: [PATCH 57/61] (build) Updated GRM config file Made it consistent with what is defined within Chocolatey CLI repository. That way, things will be consistent when doing releases. --- GitReleaseManager.yaml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index 92931966c..e1d1067c1 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -1,17 +1,6 @@ -create: - include-footer: true - footer-heading: Where to get it - footer-content: You can download this release from [chocolatey](https://chocolatey.org/packages/chocolateyGUI/{milestone}) - footer-includes-milestone: true - milestone-replace-text: '{milestone}' -export: - include-created-date-in-title: true - created-date-string-format: MMMM dd, yyyy - perform-regex-removal: true - regex-text: '### Where to get it(\r\n)*You can .*\)' - multiline-regex: true issue-labels-include: -- Breaking change +- Breaking Change +- Deprecate - Feature - C4B Feature - Bug @@ -20,10 +9,17 @@ issue-labels-include: issue-labels-exclude: - Internal Refactoring - Build +- NO RELEASE NOTES issue-labels-alias: - name: Documentation header: Documentation plural: Documentation + - name: Bug + header: Bug Fix + plural: Bug Fixes + - name: Deprecate + header: Deprecated Feature + plural: Deprecated Features create: include-sha-section: true sha-section-heading: "SHA256 Hashes of the release artifacts" @@ -38,4 +34,10 @@ close: - [GitHub Release](https://github.com/{owner}/{repository}/releases/tag/{milestone}) - [Chocolatey Package](https://chocolatey.org/packages/chocolateygui/{milestone}) - Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket: \ No newline at end of file + Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket: +export: + include-created-date-in-title: true + created-date-string-format: MMMM dd, yyyy + perform-regex-removal: true + regex-text: '### Where to get it(\r\n)*You can .*\)' + multiline-regex: true \ No newline at end of file From 6ba0e83c64a20a9a081945457773bf055ff8bee5 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 11 May 2023 12:50:26 +0100 Subject: [PATCH 58/61] (maint) Added copyright to nuspec file --- nuspec/chocolatey/ChocolateyGUI.nuspec | 1 + 1 file changed, 1 insertion(+) diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index a26cea515..dfbf66a2a 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -13,6 +13,7 @@ https://raw.githubusercontent.com/chocolatey/ChocolateyGUI/develop/LICENSE.txt https://github.com/chocolatey/ChocolateyGUI/issues false + 2017-2023 Chocolatey Software, Inc Chocolatey GUI is a delicious GUI on top of the Chocolatey command line tool. From 531a7a0b366225c0aaf1f237569e0679b87ae4a3 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 11 May 2023 17:11:03 +0100 Subject: [PATCH 59/61] (build) Re-enable release notes export Now that we are getting ready to ship the stable release of Chocolatey GUI, we need to re-enable the release notes export. There are still two underlying issues with Chocolatey.Cake.Recipe where the export doesn't work when it is an alpha/beta tag, and also when running on a support branch, but neither of these should prevent the export when we ship 2.0.0. --- recipe.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index 77a39bcb8..a003d74a1 100644 --- a/recipe.cake +++ b/recipe.cake @@ -101,7 +101,7 @@ BuildParameters.SetParameters(context: Context, title: "Chocolatey GUI", repositoryOwner: "chocolatey", repositoryName: "ChocolateyGUI", - shouldDownloadMilestoneReleaseNotes: false, + shouldDownloadMilestoneReleaseNotes: true, treatWarningsAsErrors: false, productName: "Chocolatey GUI", productDescription: "Chocolatey GUI is a product of Chocolatey Software, Inc. - All Rights Reserved", From b5713be1b9cd2e6dcc0f392d07fae92202bc112e Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Tue, 16 May 2023 21:05:48 +0100 Subject: [PATCH 60/61] (maint) Update to latest Chocolatey package Doing a round of testing, and want to make sure that the latest is being used. --- .../ChocolateyGui.Common.Windows.csproj | 2 +- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 2 +- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 2 +- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 2 +- Source/ChocolateyGuiCli/packages.config | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index cb3445add..17e1d3ee5 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index e7ff753ec..b72335570 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 5b9785ad6..5fbfee9eb 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index 11dab9ab9..c5d0c749b 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 8b5889642..916012139 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index e4d3f96b5..f5d75e1c2 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index 15f802256..ae8615321 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230426\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index f05352dc4..86b4215d8 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + From 82b34fe4c35c938407568728ce568624352b8361 Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Fri, 19 May 2023 09:48:15 -0700 Subject: [PATCH 61/61] (maint) Update to latest Chocolatey NuGet package --- .../ChocolateyGui.Common.Windows.csproj | 4 ++-- Source/ChocolateyGui.Common.Windows/packages.config | 2 +- Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj | 4 ++-- Source/ChocolateyGui.Common/packages.config | 2 +- Source/ChocolateyGui/ChocolateyGui.csproj | 4 ++-- Source/ChocolateyGui/packages.config | 2 +- Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj | 4 ++-- Source/ChocolateyGuiCli/packages.config | 2 +- nuspec/chocolatey/ChocolateyGUI.nuspec | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj index 17e1d3ee5..7067166d5 100644 --- a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj +++ b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj @@ -1,4 +1,4 @@ - + @@ -68,7 +68,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config index b72335570..0407ee0ea 100644 --- a/Source/ChocolateyGui.Common.Windows/packages.config +++ b/Source/ChocolateyGui.Common.Windows/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj index 5fbfee9eb..5e06ea85c 100644 --- a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj +++ b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj @@ -1,4 +1,4 @@ - + @@ -55,7 +55,7 @@ ..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config index c5d0c749b..f636e71aa 100644 --- a/Source/ChocolateyGui.Common/packages.config +++ b/Source/ChocolateyGui.Common/packages.config @@ -3,7 +3,7 @@ - + diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj index 916012139..20b305839 100644 --- a/Source/ChocolateyGui/ChocolateyGui.csproj +++ b/Source/ChocolateyGui/ChocolateyGui.csproj @@ -1,4 +1,4 @@ - + @@ -114,7 +114,7 @@ ..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config index f5d75e1c2..cb66bc128 100644 --- a/Source/ChocolateyGui/packages.config +++ b/Source/ChocolateyGui/packages.config @@ -5,7 +5,7 @@ - + diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj index ae8615321..dd2c9dadd 100644 --- a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj +++ b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj @@ -1,4 +1,4 @@ - + @@ -57,7 +57,7 @@ ..\packages\Autofac.4.6.1\lib\net45\Autofac.dll - ..\packages\chocolatey.lib.2.0.0-beta-20230516-1228\lib\net48\chocolatey.dll + ..\packages\chocolatey.lib.2.0.0\lib\net48\chocolatey.dll False False diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config index 86b4215d8..d9137d44f 100644 --- a/Source/ChocolateyGuiCli/packages.config +++ b/Source/ChocolateyGuiCli/packages.config @@ -2,7 +2,7 @@ - + diff --git a/nuspec/chocolatey/ChocolateyGUI.nuspec b/nuspec/chocolatey/ChocolateyGUI.nuspec index dfbf66a2a..606a90b15 100644 --- a/nuspec/chocolatey/ChocolateyGUI.nuspec +++ b/nuspec/chocolatey/ChocolateyGUI.nuspec @@ -27,7 +27,7 @@ All release notes for Chocolatey GUI can be found on the docs site - https://doc chocolateygui chocolatey admin foss - +