[main] Source code updates from dotnet/dotnet

eng/Packages.props

@@ -4,9 +4,10 @@
   <!-- Packages must be set to their package version property if it exists (ex. BenchmarkDotNetVersion) since source-build uses
   these properties to override package versions if necessary. -->
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-    <PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
-    <PackageVersion Update="Verify.DiffPlex" Condition="'$(VerifyDiffPlexVersion)' != ''" Version="$(VerifyDiffPlexVersion)" />
+    <PackageVersion Update="DiffPlex" Condition="'$(DiffPlexVersion)' != ''" Version="$(DiffPlexVersion)" />
     <PackageVersion Update="FakeItEasy" Condition="'$(FakeItEasyVersion)' != ''" Version="$(FakeItEasyVersion)" />
+    <PackageVersion Update="Verify.DiffPlex" Condition="'$(VerifyDiffPlexVersion)' != ''" Version="$(VerifyDiffPlexVersion)" />
+    <PackageVersion Update="Verify.XUnit" Condition="'$(VerifyXUnitVersion)' != ''" Version="$(VerifyXUnitVersion)" />
     <PackageVersion Update="Wcwidth.Sources" Condition="'$(WcwidthSourcesVersion)' != ''" Version="$(WcwidthSourcesVersion)" />
   </ItemGroup>
 </Project>

eng/dependabot/Packages.props

@@ -4,9 +4,10 @@
 
   <ItemGroup>
     <!--Test dependencies-->
-    <PackageVersion Include="Verify.Xunit" Version="28.7.0" />
-    <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
+    <PackageVersion Include="DiffPlex" Version="1.8.0" />
     <PackageVersion Include="FakeItEasy" Version="8.0.0" />
+    <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
+    <PackageVersion Include="Verify.Xunit" Version="28.7.0" />
     <PackageVersion Include="Wcwidth.Sources" Version="2.0.0" />
   </ItemGroup>
 </Project>

global.json

@@ -7,7 +7,7 @@
     "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
   },
   "tools": {
-    "dotnet": "10.0.100-preview.7.25322.101",
+    "dotnet": "10.0.100-preview.7.25367.101",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25359.101",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25359.101",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs

@@ -164,18 +164,18 @@ public static FormatOptions ParseVerbosityOption(this ParseResult parseResult, F
 
         public static FormatOptions ParseCommonOptions(this ParseResult parseResult, FormatOptions formatOptions, ILogger logger)
         {
-            if (parseResult.GetResult(NoRestoreOption) is not null)
+            if (parseResult.GetValue(NoRestoreOption))
             {
                 formatOptions = formatOptions with { NoRestore = true };
             }
 
-            if (parseResult.GetResult(VerifyNoChanges) is not null)
+            if (parseResult.GetValue(VerifyNoChanges))
             {
                 formatOptions = formatOptions with { ChangesAreErrors = true };
                 formatOptions = formatOptions with { SaveFormattedFiles = false };
             }
 
-            if (parseResult.GetResult(IncludeGeneratedOption) is not null)
+            if (parseResult.GetValue(IncludeGeneratedOption))
             {
                 formatOptions = formatOptions with { IncludeGeneratedFiles = true };
             }
@@ -300,7 +300,7 @@ public static FormatOptions ParseWorkspaceOptions(this ParseResult parseResult,
 
             if (parseResult.GetValue<string>(SlnOrProjectArgument) is string { Length: > 0 } slnOrProject)
             {
-                if (parseResult.GetResult(FolderOption) is not null)
+                if (parseResult.GetValue(FolderOption))
                 {
                     formatOptions = formatOptions with { WorkspaceFilePath = slnOrProject };
                     formatOptions = formatOptions with { WorkspaceType = WorkspaceType.Folder };

src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs

@@ -28,8 +28,8 @@ internal static Command GetCommand()
         internal static void EnsureFolderNotSpecifiedWithNoRestore(CommandResult symbolResult)
         {
             var folder = symbolResult.GetValue(FolderOption);
-            var noRestore = symbolResult.GetResult(NoRestoreOption);
-            if (folder && noRestore != null)
+            var noRestore = symbolResult.GetValue(NoRestoreOption);
+            if (folder && noRestore)
             {
                 symbolResult.AddError(Resources.Cannot_specify_the_folder_option_with_no_restore);
             }

src/BuiltInTools/dotnet-format/Program.cs

@@ -9,7 +9,7 @@ internal class Program
         private static async Task<int> Main(string[] args)
         {
             var rootCommand = RootFormatCommand.GetCommand();
-            return await rootCommand.Parse(args).InvokeAsync(CancellationToken.None);
+            return await rootCommand.Parse(args).InvokeAsync(null, CancellationToken.None);
         }
     }
 }

src/BuiltInTools/dotnet-watch/CommandLine/CommandLineOptions.cs

@@ -43,7 +43,7 @@ internal sealed class CommandLineOptions
 
         verboseOption.Validators.Add(v =>
         {
-            if (v.GetResult(quietOption) is not null && v.GetResult(verboseOption) is not null)
+            if (v.GetValue(quietOption) && v.GetValue(verboseOption))
             {
                 v.AddError(Resources.Error_QuietAndVerboseSpecified);
             }
@@ -90,17 +90,14 @@ internal sealed class CommandLineOptions
         var rootCommandInvoked = false;
         rootCommand.SetAction(parseResult => rootCommandInvoked = true);
 
-        var cliConfig = new CommandLineConfiguration(rootCommand)
+        ParserConfiguration parseConfig = new()
         {
-            Output = output,
-            Error = output,
-
             // To match dotnet command line parsing (see https://github.com/dotnet/sdk/blob/4712b35b94f2ad672e69ec35097cf86fc16c2e5e/src/Cli/dotnet/Parser.cs#L169):
             EnablePosixBundling = false,
         };
 
         // parse without forwarded options first:
-        var parseResult = rootCommand.Parse(args, cliConfig);
+        var parseResult = rootCommand.Parse(args, parseConfig);
         if (ReportErrors(parseResult, reporter))
         {
             errorCode = 1;
@@ -118,15 +115,19 @@ internal sealed class CommandLineOptions
         }
 
         // reparse with forwarded options:
-        parseResult = rootCommand.Parse(args, cliConfig);
+        parseResult = rootCommand.Parse(args, parseConfig);
         if (ReportErrors(parseResult, reporter))
         {
             errorCode = 1;
             return null;
         }
 
         // invoke to execute default actions for displaying help
-        errorCode = parseResult.Invoke();
+        errorCode = parseResult.Invoke(new()
+        {
+            Output = output,
+            Error = output
+        });
         if (!rootCommandInvoked)
         {
             // help displayed:
@@ -192,9 +193,15 @@ private static IReadOnlyList<string> GetCommandArguments(
                     continue;
                 }
 
+                // skip Option<bool> zero-arity options with an implicit optionresult - these weren't actually specified by the user:
+                if (optionResult.Option is Option<bool> boolOpt && boolOpt.Arity.Equals(ArgumentArity.Zero) && optionResult.Implicit)
+                {
+                    continue;
+                }
+
                 // Some options _may_ be computed or have defaults, so not all may have an IdentifierToken.
-                // For those that do not, use the Option's Name instead.
-                var optionNameToForward = optionResult.IdentifierToken?.Value ?? optionResult.Option.Name;
+                    // For those that do not, use the Option's Name instead.
+                    var optionNameToForward = optionResult.IdentifierToken?.Value ?? optionResult.Option.Name;
                 if (optionResult.Tokens.Count == 0 && !optionResult.Implicit)
                 {
                     arguments.Add(optionNameToForward);

src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs

@@ -18,6 +18,7 @@ internal class IncrementalMSBuildWorkspace : Workspace
     public IncrementalMSBuildWorkspace(IReporter reporter)
         : base(MSBuildMefHostServices.DefaultServices, WorkspaceKind.MSBuild)
     {
+#pragma warning disable CS0618 // https://github.com/dotnet/sdk/issues/49725
         WorkspaceFailed += (_sender, diag) =>
         {
             // Report both Warning and Failure as warnings.
@@ -26,6 +27,7 @@ public IncrementalMSBuildWorkspace(IReporter reporter)
             // https://github.com/dotnet/roslyn/issues/75170
             reporter.Warn($"msbuild: {diag.Diagnostic}", "⚠");
         };
+#pragma warning restore CS0618
 
         _reporter = reporter;
     }

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs

@@ -45,6 +45,14 @@ private MSBuildArgs(ReadOnlyDictionary<string, string>? properties, ReadOnlyDict
     /// </summary>
     public List<string> OtherMSBuildArgs { get; }
 
+    /// <summary>
+    /// Ensures that when we do our MSBuild-property re-parses we parse in the same way as the dotnet CLI's parser.
+    /// </summary>
+    private static readonly ParserConfiguration _analysisParsingConfiguration = new()
+    {
+        EnablePosixBundling = false
+    };
+
     /// <summary>
     /// Takes all of the unstructured properties and arguments that have been accrued from the command line
     /// processing of the SDK and returns a structured set of MSBuild arguments grouped by purpose.
@@ -58,12 +66,8 @@ public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedA
         {
             fakeCommand.Options.Add(option);
         }
-
-        var propertyParsingConfiguration = new CommandLineConfiguration(fakeCommand)
-        {
-            EnablePosixBundling = false
-        };
-        var parseResult = propertyParsingConfiguration.Parse([..forwardedAndUserFacingArgs]);
+;
+        var parseResult = fakeCommand.Parse([.. forwardedAndUserFacingArgs], _analysisParsingConfiguration);
         var globalProperties = parseResult.GetResult("--property") is OptionResult propResult ? propResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;
         var restoreProperties = parseResult.GetResult("--restoreProperty") is OptionResult restoreResult ? restoreResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;
         var requestedTargets = parseResult.GetResult("--target") is OptionResult targetResult ? targetResult.GetValueOrDefault<string[]?>() : null;

src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj

@@ -32,7 +32,7 @@
     for Mac and other VS scenarios. During source-build, we only have access to
     the latest version, which targets NetCurrent. -->
     <PropertyGroup>
-      <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net9.0\MSBuild.dll</MSBuildPathInPackage>
+      <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net10.0\MSBuild.dll</MSBuildPathInPackage>
       <MSBuildPathInPackage Condition="'$(DotNetBuildSourceOnly)' == 'true' and !Exists($(MSBuildPathInPackage))">$(PkgMicrosoft_Build_Runtime)\contentFiles\any\$(NetCurrent)\MSBuild.dll</MSBuildPathInPackage>
     </PropertyGroup>
     <Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />

src/Cli/Microsoft.TemplateEngine.Cli/Commands/ParserFactory.cs

@@ -8,35 +8,22 @@ namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal static class ParserFactory
     {
-        internal static CommandLineConfiguration CreateParser(Command command, bool disableHelp = false)
+        internal static readonly ParserConfiguration ParserConfiguration = new()
         {
-            CommandLineConfiguration config = new(command)
-            //TODO: decide if it's needed to implement it; and implement if needed
-            //.UseParseDirective()
-            //.UseSuggestDirective()
-            {
-                EnablePosixBundling = false
-            };
-
-            for (int i = 0; i < command.Options.Count; i++)
-            {
-                if (command.Options[i] is HelpOption)
-                {
-                    if (disableHelp)
-                    {
-                        command.Options.RemoveAt(i);
-                    }
+            EnablePosixBundling = false,
+        };
 
-                    return config;
-                }
-            }
+        internal static Command CreateParser(Command command, bool disableHelp = false)
+        {
+            // {
+            //     EnablePosixBundling = false
+            // };
 
             if (!disableHelp)
             {
                 command.Options.Add(new HelpOption());
             }
-
-            return config;
+            return command;
         }
     }
 }

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.TabCompletion.cs

@@ -60,11 +60,11 @@ internal static IEnumerable<CompletionItem> GetTemplateCompletions(
                                 templateGroup,
                                 template);
 
-                            CommandLineConfiguration parser = ParserFactory.CreateParser(command);
+                            System.CommandLine.Command parser = ParserFactory.CreateParser(command);
 
                             //it is important to pass raw text to get the completion
                             //completions for args passed as array are not supported
-                            ParseResult parseResult = parser.Parse(context.CommandLineText);
+                            ParseResult parseResult = parser.Parse(context.CommandLineText, ParserFactory.ParserConfiguration);
                             foreach (CompletionItem completion in parseResult.GetCompletions(context.CursorPosition))
                             {
                                 ////TODO: conditionals tab completion here

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs

@@ -435,8 +435,8 @@ private static (TemplateCommand? Command, ParseResult? ParseResult)? ReparseForT
                     template,
                     validateDefaultLanguage);
 
-                CommandLineConfiguration parser = ParserFactory.CreateParser(command);
-                ParseResult parseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>());
+                System.CommandLine.Command parser = ParserFactory.CreateParser(command);
+                ParseResult parseResult = parser.Parse(args.RemainingArguments ?? Array.Empty<string>(), ParserFactory.ParserConfiguration);
                 return (command, parseResult);
             }
             catch (InvalidTemplateParametersException e)

src/Cli/Microsoft.TemplateEngine.Cli/Help/DotnetHelpAction.cs

@@ -25,7 +25,7 @@ public HelpBuilder Builder
     /// <inheritdoc />
     public override int Invoke(ParseResult parseResult)
     {
-        var output = parseResult.Configuration.Output;
+        var output = parseResult.InvocationConfiguration.Output;
 
         var helpContext = new HelpContext(
             Builder,

src/Cli/dotnet/Commands/Build/BuildCommand.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
@@ -12,8 +12,7 @@ public static class BuildCommand
 {
     public static CommandBase FromArgs(string[] args, string? msbuildPath = null)
     {
-        var parser = Parser.Instance;
-        var parseResult = parser.ParseFrom("dotnet build", args);
+        var parseResult = Parser.Parse(["dotnet", "build", ..args]);
         return FromParseResult(parseResult, msbuildPath);
     }
 
@@ -22,10 +21,10 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
         parseResult.ShowHelpOrErrorIfAppropriate();
 
         CommonOptions.ValidateSelfContainedOptions(
-            parseResult.GetResult(BuildCommandParser.SelfContainedOption) is not null,
-            parseResult.GetResult(BuildCommandParser.NoSelfContainedOption) is not null);
+            parseResult.HasOption(BuildCommandParser.SelfContainedOption),
+            parseResult.HasOption(BuildCommandParser.NoSelfContainedOption));
 
-        bool noRestore = parseResult.GetResult(BuildCommandParser.NoRestoreOption) is not null;
+        bool noRestore = parseResult.HasOption(BuildCommandParser.NoRestoreOption);
 
         return CommandFactory.CreateVirtualOrPhysicalCommand(
             BuildCommandParser.GetCommand(),

src/Cli/dotnet/Commands/Clean/CleanCommand.cs

@@ -13,8 +13,7 @@ public class CleanCommand(MSBuildArgs msbuildArgs, string? msbuildPath = null) :
 {
     public static CommandBase FromArgs(string[] args, string? msbuildPath = null)
     {
-        var parser = Parser.Instance;
-        var result = parser.ParseFrom("dotnet clean", args);
+        var result = Parser.Parse(["dotnet", "clean", ..args]);
         return FromParseResult(result, msbuildPath);
     }
 

src/Cli/dotnet/Commands/Format/FormatCommand.cs

@@ -13,8 +13,7 @@ public class FormatCommand(IEnumerable<string> argsToForward) : FormatForwarding
 {
     public static FormatCommand FromArgs(string[] args)
     {
-        var parser = Parser.Instance;
-        var result = parser.ParseFrom("dotnet format", args);
+        var result = Parser.Parse(["dotnet", "format", ..args]);
         return FromParseResult(result);
     }
 

src/Cli/dotnet/Commands/Help/HelpCommand.cs

@@ -105,7 +105,7 @@ public int Execute()
 
     private static bool TryGetDocsLink(string[] command, out string docsLink)
     {
-        var parsedCommand = Parser.Instance.Parse(["dotnet", .. command]);
+        var parsedCommand = Parser.Parse(["dotnet", .. command]);
         if (parsedCommand?.CommandResult?.Command is ICommandDocument dc)
         {
             docsLink = dc.DocsLink;

src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommand.cs

@@ -19,8 +19,7 @@ public static int Run(ParseResult parseResult)
 
     public static int RunWithReporter(string[] args, IReporter reporter)
     {
-        var parser = Parser.Instance;
-        var result = parser.ParseFrom("dotnet complete", args);
+        var result = Parser.Parse(["dotnet", "complete", ..args]);
         return RunWithReporter(result, reporter);
     }
 
@@ -61,7 +60,7 @@ private static CompletionItem[] Completions(ParseResult complete)
             input += " ";
         }
 
-        var result = Parser.Instance.Parse(input);
+        var result = Parser.Parse(input);
 
         return [.. result.GetCompletions(position).Distinct()];
     }

src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs

@@ -25,8 +25,7 @@ public static int Run(ParseResult parseResult)
 
     public static void ProcessInputAndSendTelemetry(string[] args, ITelemetry telemetry)
     {
-        var parser = Parser.Instance;
-        var result = parser.ParseFrom("dotnet internal-reportinstallsuccess", args);
+        var result = Parser.Parse(["dotnet", "internal-reportinstallsuccess", ..args]);
         ProcessInputAndSendTelemetry(result, telemetry);
     }
 

src/Cli/dotnet/Commands/Hidden/Parse/ParseCommand.cs

@@ -15,7 +15,7 @@ public static int Run(ParseResult result)
         result.HandleDebugSwitch();
 
         var tokens = result.Tokens.Skip(1).Select(t => t.Value).ToArray();
-        var reparsed = Parser.Instance.Parse(tokens);
+        var reparsed = Parser.Parse(tokens);
         Console.WriteLine(reparsed.ToString());