Merge branch 'release/8.0.2xx'

Author: Jason Zhai

eng/restore-toolset.ps1

@@ -154,7 +154,7 @@ function CleanOutStage0ToolsetsAndRuntimes {
       Remove-Item (Join-Path $aspnetRuntimePath "$majorVersion.*") -Recurse
       Remove-Item (Join-Path $coreRuntimePath "$majorVersion.*") -Recurse
       Remove-Item (Join-Path $wdRuntimePath "$majorVersion.*") -Recurse
-      Remove-Item (Join-Path $sdkPath "$majorVersion.*") -Recurse
+      Remove-Item (Join-Path $sdkPath "*") -Recurse
       Remove-Item (Join-Path $dotnetRoot "packs") -Recurse
       Remove-Item (Join-Path $dotnetRoot "sdk-manifests") -Recurse
       Remove-Item (Join-Path $dotnetRoot "templates") -Recurse

eng/restore-toolset.sh

@@ -94,7 +94,7 @@ function CleanOutStage0ToolsetsAndRuntimes {
   local aspnetRuntimePath="$dotnetRoot/shared/Microsoft.AspNetCore.App/$majorVersion.*"
   local coreRuntimePath="$dotnetRoot/shared/Microsoft.NETCore.App/$majorVersion.*"
   local wdRuntimePath="$dotnetRoot/shared/Microsoft.WindowsDesktop.App/$majorVersion.*"
-  local sdkPath="$dotnetRoot/sdk/$majorVersion.*"
+  local sdkPath="$dotnetRoot/sdk/*"
 
   if [ -f "$versionPath" ]; then
     local lastInstalledSDK=$(cat $versionPath)

src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx

@@ -235,4 +235,7 @@ If you would like to create a manifest, use `dotnet new tool-manifest`, usually
   <data name="CreateManifestIfNeededOptionDescription" xml:space="preserve">
     <value>Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed</value>
   </data>
+  <data name="AllowPackageDowngradeOptionDescription" xml:space="preserve">
+    <value>Allow package downgrade when installing a .NET tool package.</value>
+  </data>
 </root>

src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs

@@ -48,6 +48,11 @@ internal static class ToolInstallCommandParser
             Description = LocalizableStrings.CreateManifestIfNeededOptionDescription
         };
 
+        public static readonly CliOption<bool> AllowPackageDowngradeOption = new("--allow-downgrade")
+        {
+            Description = LocalizableStrings.AllowPackageDowngradeOptionDescription
+        }; 
+
         public static readonly CliOption<VerbosityOptions> VerbosityOption = CommonOptions.VerbosityOption;
 
         // Don't use the common options version as we don't want this to be a forwarded option
@@ -77,6 +82,19 @@ private static CliCommand ConstructCommand()
         {
             CliCommand command = new("install", LocalizableStrings.CommandDescription);
 
+            AddCommandOptions(command);
+
+            command.Options.Add(ArchitectureOption);
+            command.Options.Add(CreateManifestIfNeededOption);
+            command.Options.Add(AllowPackageDowngradeOption);
+
+            command.SetAction((parseResult) => new ToolInstallCommand(parseResult).Execute());
+
+            return command;
+        }
+
+        public static CliCommand AddCommandOptions(CliCommand command)
+        {
             command.Arguments.Add(PackageIdArgument);
             command.Options.Add(GlobalOption.WithHelpDescription(command, LocalizableStrings.GlobalOptionDescription));
             command.Options.Add(LocalOption.WithHelpDescription(command, LocalizableStrings.LocalOptionDescription));
@@ -93,12 +111,7 @@ private static CliCommand ConstructCommand()
             command.Options.Add(ToolCommandRestorePassThroughOptions.NoHttpCacheOption);
             command.Options.Add(ToolCommandRestorePassThroughOptions.InteractiveRestoreOption);
             command.Options.Add(VerbosityOption);
-            command.Options.Add(ArchitectureOption);
-            command.Options.Add(CreateManifestIfNeededOption);
-
-            command.SetAction((parseResult) => new ToolInstallCommand(parseResult).Execute());
-
             return command;
-        }
+        } 
     }
 }