(chocolatey#2468) Remove choco version command

This command is no longer required, and has been replaced by either the choco list or the choco upgrade --noop commands depending on whether you are attempting to get locally installed items, or checking to see what upgrades are available. In addition, the cver shim has also been removed.
gep13 · Mar 14, 2022 · 2c32292 · 2c32292
1 parent cb5d5f1
commit 2c32292
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 141 deletions.
diff --git a/nuget/chocolatey/tools/chocolateysetup.psm1 b/nuget/chocolatey/tools/chocolateysetup.psm1
@@ -76,19 +76,19 @@ function Remove-ShimWithAuthenticodeSignature {
 function Remove-UnsupportedShimFiles {
   param([string[]]$Paths)
 
-  $shims = @('cpack.exe')
+  $shims = @("cpack.exe", "cver.exe")
 
   $Paths | ForEach-Object {
     $path = $_
     $shims | ForEach-Object { Join-Path $path $_ } | Where-Object { Test-Path $_ } | ForEach-Object {
-      $path = $_
-      Write-Debug "Removing shim from '$path'."
+      $shimPath = $_
+      Write-Debug "Removing shim from '$shimPath'."
 
       try {
-        Remove-ShimWithAuthenticodeSignature -filePath $path
+        Remove-ShimWithAuthenticodeSignature -filePath $shimPath
       }
       catch {
-        Write-ChocolateyWarning "Unable to remove '$path'. Please remove the file manually."
+        Write-ChocolateyWarning "Unable to remove '$shimPath'. Please remove the file manually."
       }
     }
   }
@@ -387,7 +387,7 @@ param(
     $from = "$chocolateyPathOld\bin"
     $to = "$chocolateyPath\bin"
     # TODO: This exclusion list needs to be updated once shims are removed
-    $exclude = @("choco.exe", "chocolatey.exe", "cinst.exe", "clist.exe", "cpush.exe", "cuninst.exe", "cup.exe", "cver.exe", "RefreshEnv.cmd")
+    $exclude = @("choco.exe", "chocolatey.exe", "cinst.exe", "clist.exe", "cpush.exe", "cuninst.exe", "cup.exe", "RefreshEnv.cmd")
     Get-ChildItem -Path $from -recurse -Exclude $exclude |
       % {
         Write-Debug "Copying $_ `n to $to"

diff --git a/src/chocolatey.resources/chocolatey.resources.csproj b/src/chocolatey.resources/chocolatey.resources.csproj
@@ -91,7 +91,6 @@
     <EmbeddedResource Include="redirects\cpush.exe.ignore" />
     <EmbeddedResource Include="redirects\cuninst.exe.ignore" />
     <EmbeddedResource Include="redirects\cup.exe.ignore" />
-    <EmbeddedResource Include="redirects\cver.exe.ignore" />
     <EmbeddedResource Include="tools\checksum.exe.ignore" />
     <EmbeddedResource Include="tools\shimgen.exe.ignore" />
   </ItemGroup>
@@ -104,7 +103,6 @@
     <EmbeddedResource Include="redirects\cpush.exe" />
     <EmbeddedResource Include="redirects\cuninst.exe" />
     <EmbeddedResource Include="redirects\cup.exe" />
-    <EmbeddedResource Include="redirects\cver.exe" />
     <EmbeddedResource Include="tools\7zip.license.txt" />
     <EmbeddedResource Include="tools\checksum.exe" />
     <EmbeddedResource Include="tools\checksum.license.txt" />

diff --git a/src/chocolatey.resources/redirects/cver.exe b/src/chocolatey.resources/redirects/cver.exe
diff --git a/src/chocolatey.resources/redirects/cver.exe.ignore b/src/chocolatey.resources/redirects/cver.exe.ignore
diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -175,7 +175,6 @@
     <Compile Include="infrastructure.app\commands\ChocolateyUninstallCommand.cs" />
     <Compile Include="infrastructure.app\commands\ChocolateyUpdateCommand.cs" />
     <Compile Include="infrastructure.app\commands\ChocolateyUpgradeCommand.cs" />
-    <Compile Include="infrastructure.app\commands\ChocolateyVersionCommand.cs" />
     <Compile Include="infrastructure.app\configuration\ChocolateySource.cs" />
     <Compile Include="infrastructure.app\configuration\ConfigFileConfigSetting.cs" />
     <Compile Include="infrastructure.app\configuration\ConfigFileFeatureSetting.cs" />

diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyVersionCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyVersionCommand.cs
diff --git a/src/chocolatey/infrastructure.app/registration/ContainerBinding.cs b/src/chocolatey/infrastructure.app/registration/ContainerBinding.cs
@@ -95,7 +95,6 @@ public void RegisterComponents(Container container)
                             new ChocolateyFeatureCommand(container.GetInstance<IChocolateyConfigSettingsService>()),
                             new ChocolateyApiKeyCommand(container.GetInstance<IChocolateyConfigSettingsService>()),
                             new ChocolateyUnpackSelfCommand(container.GetInstance<IFileSystem>()),
-                            new ChocolateyVersionCommand(container.GetInstance<IChocolateyPackageService>()),
                             new ChocolateyUpdateCommand(container.GetInstance<IChocolateyPackageService>()),
                             new ChocolateyExportCommand(container.GetInstance<INugetService>(), container.GetInstance<IFileSystem>()),
                             new ChocolateyTemplateCommand(container.GetInstance<ITemplateService>())