From a84394d58163cb610a1c22d3dc25060858c066f5 Mon Sep 17 00:00:00 2001 From: gaelcolas Date: Fri, 17 Mar 2023 18:17:50 +0100 Subject: [PATCH] fix Deprecating and removing side-by-side installs from Chocolatey CLI #61 --- CHANGELOG.md | 2 +- README.md | 85 ------------------- .../private/Get-ChocolateyDefaultArgument.ps1 | 14 +-- source/public/Install-ChocolateyPackage.ps1 | 10 --- source/public/Uninstall-ChocolateyPackage.ps1 | 10 --- source/public/Update-ChocolateyPackage.ps1 | 10 --- 6 files changed, 2 insertions(+), 129 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1e12c4..a2a344f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,4 +11,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed -- Emptied psm1 file from source code as dynamically generated. +- Removed SideBySide option as per [#61](https://github.com/chocolatey-community/Chocolatey/issues/61). diff --git a/README.md b/README.md index 800485f..dd900e3 100644 --- a/README.md +++ b/README.md @@ -10,91 +10,6 @@ The module let you install the chocolatey binary from a Nuget feed, optionally s This project has adopted the Microsoft Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments. -## Content - -This is the current content of the module, besides the file used for managing the project. - -```txt -CHOCOLATEY\CHOCOLATEY -│ Chocolatey.psd1 -│ Chocolatey.psm1 -│ -├───docs -├───DscResources -│ │ DSCResourcesDefinitions.json -│ │ -│ ├───ChocolateyFeature -│ │ ChocolateyFeature.psm1 -│ │ ChocolateyFeature.schema.mof -│ │ -│ ├───ChocolateyPackage -│ │ ChocolateyPackage.psm1 -│ │ ChocolateyPackage.schema.mof -│ │ -│ ├───ChocolateyPin -│ │ ChocolateyPin.psm1 -│ │ ChocolateyPin.schema.mof -│ │ -│ ├───ChocolateySetting -│ │ ChocolateySetting.psm1 -│ │ ChocolateySetting.schema.mof -│ │ -│ |───ChocolateySoftware -│ │ ChocolateySoftware.psm1 -│ │ ChocolateySoftware.schema.mof -| | -│ └───ChocolateySource -│ ChocolateySource.psm1 -│ ChocolateySource.schema.mof -│ -├───examples -│ chocolateyConfig.ps1 -│ dsc_configuration.ps1 -│ -├───private -│ Get-ChocolateyDefaultArguments.ps1 -│ Get-Downloader.ps1 -│ Get-RemoteFile.ps1 -│ Get-RemoteString.ps1 -│ Repair-PowerShellOutputRedirectionBug.ps1 -│ Write-Host.ps1 -│ -├───public -│ Add-ChocolateyPin.ps1 -| Disable-ChocolateyFeature.ps1 -│ Disable-ChocolateySource.ps1 -│ Enable-ChocolateyFeature.ps1 -│ Enable-ChocolateySource.ps1 -│ Get-ChocolateyFeature.ps1 -│ Get-ChocolateyPackage.ps1 -| Get-ChocolateyPin.ps1 -│ Get-ChocolateySource.ps1 -│ Get-ChocolateyVersion.ps1 -│ Install-Chocolatey.ps1 -│ Install-ChocolateyPackage.ps1 -│ Install-ChocolateySoftware.ps1 -│ Register-ChocolateySource.ps1 -| Remove-ChocolateyPin.ps1 -│ Test-ChocolateyFeature.ps1 -│ Test-ChocolateyInstall.ps1 -│ Test-ChocolateyPackageIsInstalled.ps1 -| Test-ChocolateyPin.ps1 -│ Test-ChocolateySource.ps1 -│ Uninstall-Chocolatey.ps1 -│ Uninstall-ChocolateyPackage.ps1 -│ Unregister-ChocolateySource.ps1 -│ Update-ChocolateyPackage.ps1 -│ -└───tests - │ - ├───QA - │ - └───Unit - | - |───Private - | - └───Public -``` ## Code of Conduct This project has adopted this [Code of Conduct](CODE_OF_CONDUCT.md). diff --git a/source/private/Get-ChocolateyDefaultArgument.ps1 b/source/private/Get-ChocolateyDefaultArgument.ps1 index 24a508e..a6e9114 100644 --- a/source/private/Get-ChocolateyDefaultArgument.ps1 +++ b/source/private/Get-ChocolateyDefaultArgument.ps1 @@ -73,9 +73,6 @@ Should install arguments be used exclusively without appending to current packag .PARAMETER AllowDowngrade Should an attempt at downgrading be allowed? Defaults to false. -.PARAMETER SideBySide - AllowMultipleVersions - Should multiple versions of a package be installed? - .PARAMETER IgnoreDependencies IgnoreDependencies - Ignore dependencies when installing package(s). @@ -373,12 +370,6 @@ function Get-ChocolateyDefaultArgument [Switch] $AllowDowngrade, - [Parameter( - ValueFromPipelineByPropertyName - )] - [Switch] - $SideBySide, - [Parameter( ValueFromPipelineByPropertyName )] @@ -784,10 +775,7 @@ function Get-ChocolateyDefaultArgument { '--allow-downgrade' } - 'SideBySide' - { - '--side-by-side' - } + 'ignoredependencies' { '--ignore-dependencies' diff --git a/source/public/Install-ChocolateyPackage.ps1 b/source/public/Install-ChocolateyPackage.ps1 index ce36ac2..562de40 100644 --- a/source/public/Install-ChocolateyPackage.ps1 +++ b/source/public/Install-ChocolateyPackage.ps1 @@ -76,10 +76,6 @@ .PARAMETER AllowDowngrade AllowDowngrade - Should an attempt at downgrading be allowed? Defaults to false. -.PARAMETER SideBySide - AllowMultipleVersions - Should multiple versions of a package be - installed? Defaults to false. - .PARAMETER IgnoreDependencies IgnoreDependencies - Ignore dependencies when installing package(s). Defaults to false. @@ -273,12 +269,6 @@ function Install-ChocolateyPackage [switch] $AllowDowngrade, - [Parameter( - ValueFromPipelineByPropertyName - )] - [switch] - $SideBySide, - [Parameter( ValueFromPipelineByPropertyName )] diff --git a/source/public/Uninstall-ChocolateyPackage.ps1 b/source/public/Uninstall-ChocolateyPackage.ps1 index 7ffd14b..3ef8535 100644 --- a/source/public/Uninstall-ChocolateyPackage.ps1 +++ b/source/public/Uninstall-ChocolateyPackage.ps1 @@ -58,10 +58,6 @@ Apply Install Arguments To Dependencies - Should install arguments be applied to dependent packages? Defaults to false. -.PARAMETER SideBySide - AllowMultipleVersions - Should multiple versions of a package be - installed? Defaults to false. - .PARAMETER IgnoreDependencies IgnoreDependencies - Ignore dependencies when installing package(s). Defaults to false. @@ -205,12 +201,6 @@ function Uninstall-ChocolateyPackage [Switch] $ApplyArgsToDependencies, - [Parameter( - ValueFromPipelineByPropertyName - )] - [Switch] - $SideBySide, - [Parameter( ValueFromPipelineByPropertyName )] diff --git a/source/public/Update-ChocolateyPackage.ps1 b/source/public/Update-ChocolateyPackage.ps1 index 89abc0d..9a5c606 100644 --- a/source/public/Update-ChocolateyPackage.ps1 +++ b/source/public/Update-ChocolateyPackage.ps1 @@ -78,10 +78,6 @@ .PARAMETER AllowDowngrade AllowDowngrade - Should an attempt at downgrading be allowed? Defaults to false. -.PARAMETER SideBySide - AllowMultipleVersions - Should multiple versions of a package be - installed? Defaults to false. - .PARAMETER IgnoreDependencies IgnoreDependencies - Ignore dependencies when installing package(s). Defaults to false. @@ -261,12 +257,6 @@ function Update-ChocolateyPackage [Switch] $AllowDowngrade, - [Parameter( - ValueFromPipelineByPropertyName - )] - [Switch] - $SideBySide, - [Parameter( ValueFromPipelineByPropertyName )]