dotnet tool run and install roll-forward option

src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandSpecMaker.cs

@@ -20,12 +20,22 @@ internal static CommandSpec CreatePackageCommandSpecUsingMuxer(
             {
                 throw new Exception(LocalizableStrings.UnableToLocateDotnetMultiplexer);
             }
+            IEnumerable<string> modifiedArguments = commandArguments;
+
+            // Add --roll-forward argument first if exists
+            if (commandArguments != null && commandArguments.Any(arg => arg.Equals("--roll-forward", StringComparison.OrdinalIgnoreCase)))
+            {
+                int index = commandArguments.ToList().IndexOf("--roll-forward");
+                arguments.Add(commandArguments.ElementAt(index));
+                arguments.Add(commandArguments.ElementAt(index + 1));
+                modifiedArguments = commandArguments.Where((element, i) => i != index && i != index + 1);
+            }
 
             arguments.Add(commandPath);
 
-            if (commandArguments != null)
+            if (modifiedArguments != null)
             {
-                arguments.AddRange(commandArguments);
+                arguments.AddRange(modifiedArguments);
             }
 
             return CreateCommandSpec(host, arguments);

src/Cli/dotnet/CommonLocalizableStrings.resx

@@ -733,4 +733,7 @@ The default is 'false.' However, when targeting .NET 7 or lower, the default is
   <data name="ArtifactsPathArgumentName" xml:space="preserve">
     <value>ARTIFACTS_DIR</value>
   </data>
+  <data name="ToolSettingsNotFound" xml:space="preserve">
+    <value>Tool settings file does not exist for the tool {0}.</value>
+  </data>
 </root>

src/Cli/dotnet/ToolManifest/IToolManifestEditor.cs

@@ -10,7 +10,7 @@ namespace Microsoft.DotNet.ToolManifest
 {
     internal interface IToolManifestEditor
     {
-        void Add(FilePath manifest, PackageId packageId, NuGetVersion nuGetVersion, ToolCommandName[] toolCommandNames);
+        void Add(FilePath manifest, PackageId packageId, NuGetVersion nuGetVersion, ToolCommandName[] toolCommandNames, bool RollForward = false);
         void Remove(FilePath manifest, PackageId packageId);
         void Edit(FilePath manifest, PackageId packageId, NuGetVersion newNuGetVersion, ToolCommandName[] newToolCommandNames);
     }

src/Cli/dotnet/ToolManifest/LocalizableStrings.resx

@@ -169,4 +169,7 @@ For a list of locations searched, specify the "-d" option before the tool name.<
   <data name="MultipleSamePackageId" xml:space="preserve">
     <value>More than one entry exists for package(s): {0}.</value>
   </data>
+  <data name="ToolMissingRollForward" xml:space="preserve">
+    <value>Missing 'rollForward' entry.</value>
+  </data>
 </root>

src/Cli/dotnet/ToolManifest/ToolManifestEditor.cs

@@ -21,6 +21,7 @@ internal class ToolManifestEditor : IToolManifestEditor
         private const string JsonPropertyIsRoot = "isRoot";
         private const string JsonPropertyCommands = "commands";
         private const string JsonPropertyTools = "tools";
+        private const string JsonPropertyRollForward = "rollForward";
 
         public ToolManifestEditor(IFileSystem fileSystem = null, IDangerousFileDetector dangerousFileDetector = null)
         {
@@ -32,7 +33,8 @@ public void Add(
             FilePath manifest,
             PackageId packageId,
             NuGetVersion nuGetVersion,
-            ToolCommandName[] toolCommandNames)
+            ToolCommandName[] toolCommandNames,
+            bool rollForward = false)
         {
             SerializableLocalToolsManifest deserializedManifest =
                 DeserializeLocalToolsManifest(manifest);
@@ -45,10 +47,14 @@ public void Add(
             {
                 var existingPackage = existing.Single();
 
+                // Update the tool manifest if --roll-forward changes
                 if (existingPackage.PackageId.Equals(packageId)
                     && existingPackage.Version == nuGetVersion
                     && CommandNamesEqual(existingPackage.CommandNames, toolCommandNames))
                 {
+                    var toEdit = deserializedManifest.Tools.Single(t => new PackageId(t.PackageId).Equals(packageId));
+                    toEdit.RollForward = rollForward;
+                    _fileSystem.File.WriteAllText(manifest.Value, deserializedManifest.ToJson());
                     return;
                 }
 
@@ -70,7 +76,8 @@ public void Add(
                 {
                     PackageId = packageId.ToString(),
                     Version = nuGetVersion.ToNormalizedString(),
-                    Commands = toolCommandNames.Select(c => c.Value).ToArray()
+                    Commands = toolCommandNames.Select(c => c.Value).ToArray(),
+                    RollForward = rollForward,
                 });
 
             _fileSystem.File.WriteAllText(manifest.Value, deserializedManifest.ToJson());
@@ -199,6 +206,11 @@ private SerializableLocalToolsManifest DeserializeLocalToolsManifest(FilePath po
                                 serializableLocalToolSinglePackage.Commands = commands.ToArray();
                             }
 
+                            if (toolJson.Value.TryGetStringValue(JsonPropertyRollForward, out var rollForwardJson))
+                            {
+                                serializableLocalToolSinglePackage.RollForward = bool.Parse(rollForwardJson);
+                            }
+
                             serializableLocalToolsManifest.Tools.Add(serializableLocalToolSinglePackage);
                         }
                     }
@@ -269,6 +281,8 @@ private List<ToolManifestPackage> GetToolManifestPackageFromOneManifestFile(
                     packageLevelErrors.Add(LocalizableStrings.FieldCommandsIsMissing);
                 }
 
+                bool rollForward = tools.RollForward;
+
                 if (packageLevelErrors.Any())
                 {
                     var joinedWithIndentation = string.Join(Environment.NewLine,
@@ -282,7 +296,8 @@ private List<ToolManifestPackage> GetToolManifestPackageFromOneManifestFile(
                         packageId,
                         version,
                         ToolCommandName.Convert(tools.Commands),
-                        correspondingDirectory));
+                        correspondingDirectory,
+                        rollForward));
                 }
             }
 
@@ -325,6 +340,7 @@ private class SerializableLocalToolSinglePackage
             public string PackageId { get; set; }
             public string Version { get; set; }
             public string[] Commands { get; set; }
+            public bool RollForward { get; set; }
         }
 
         private static bool CommandNamesEqual(ToolCommandName[] left, ToolCommandName[] right)
@@ -379,8 +395,8 @@ public string ToJson()
                         {
                             writer.WriteStringValue(toolCommandName);
                         }
-
                         writer.WriteEndArray();
+                        writer.WriteString(JsonPropertyRollForward, tool.RollForward.ToString());
                         writer.WriteEndObject();
                     }
 

src/Cli/dotnet/ToolManifest/ToolManifestPackage.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.Eventing.Reader;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.ToolPackage;
 using Microsoft.Extensions.EnvironmentAbstractions;
@@ -13,6 +14,7 @@ internal struct ToolManifestPackage : IEquatable<ToolManifestPackage>
         public PackageId PackageId { get; }
         public NuGetVersion Version { get; }
         public ToolCommandName[] CommandNames { get; }
+        public bool RollForward { get; }
         /// <summary>
         /// The directory that will take effect first.
         /// When it is under .config directory, it is not .config directory
@@ -23,12 +25,14 @@ internal struct ToolManifestPackage : IEquatable<ToolManifestPackage>
         public ToolManifestPackage(PackageId packagePackageId,
             NuGetVersion version,
             ToolCommandName[] toolCommandNames,
-            DirectoryPath firstEffectDirectory)
+            DirectoryPath firstEffectDirectory,
+            bool rollForward)
         {
             FirstEffectDirectory = firstEffectDirectory;
             PackageId = packagePackageId;
             Version = version ?? throw new ArgumentNullException(nameof(version));
             CommandNames = toolCommandNames ?? throw new ArgumentNullException(nameof(toolCommandNames));
+            RollForward = rollForward;
         }
 
         public override bool Equals(object obj)

src/Cli/dotnet/ToolPackage/IToolPackageDownloader.cs

@@ -13,7 +13,8 @@ IToolPackage InstallPackage(PackageLocation packageLocation, PackageId packageId
             VerbosityOptions verbosity,
             VersionRange versionRange = null,
             string targetFramework = null,
-            bool isGlobalTool = false
+            bool isGlobalTool = false,
+            bool isGlobalToolRollForward = false
         );
     }
 }