From 4e0238bb1378f018604ada773dec21324223f572 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 05:01:42 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/roslyn build 20250414.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.PublicApiAnalyzers , Microsoft.CodeAnalysis.Workspaces.Common , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 5.0.0-1.25213.1 -> To Version 5.0.0-1.25214.5 --- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 868108d492c8..543db5be94ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -120,47 +120,47 @@ 4ba36db1f42f33a66d9677f0b9d589d39b204a9c - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 https://github.com/nuget/nuget.client @@ -462,9 +462,9 @@ https://github.com/dotnet/roslyn-analyzers 729249ec799901c8949ab4eb9394dd35b2f571cd - + https://github.com/dotnet/roslyn - e2700e893c8884ccdcb15bdb294c89d624f597af + 959bcb76028fa383d6e1388c60bef630c75470d3 diff --git a/eng/Versions.props b/eng/Versions.props index a563a848f7f1..78f1dc560de2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,16 +221,16 @@ - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 5.0.0-1.25213.1 - 3.12.0-beta1.25213.1 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 5.0.0-1.25214.5 + 3.12.0-beta1.25214.5 From 20bffaa5b3926f3cf82cc517095668e6c49be78a Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Tue, 15 Apr 2025 08:38:57 +0200 Subject: [PATCH 02/14] bump System.CommandLine version, remove dependency to System.CommandLine.Rendering (will no longer be supported) --- eng/Version.Details.xml | 12 ++++-------- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 543db5be94ad..9213e7bdf882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -472,13 +472,9 @@ 729249ec799901c8949ab4eb9394dd35b2f571cd - + https://github.com/dotnet/command-line-api - 3bbb940ceeb3254790899d751a8d418348563d40 - - - https://github.com/dotnet/command-line-api - 3bbb940ceeb3254790899d751a8d418348563d40 + 48bd86bdcd926a194e1581a60d820d12a64ef3c6 - + https://github.com/dotnet/command-line-api - 3bbb940ceeb3254790899d751a8d418348563d40 + 48bd86bdcd926a194e1581a60d820d12a64ef3c6 diff --git a/eng/Versions.props b/eng/Versions.props index 78f1dc560de2..78c5977f6efc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,7 +59,7 @@ 4.8.6 1.2.0-beta.435 4.0.5 - 2.0.0-beta4.25071.2 + 2.0.0-beta5.25208.1 1.1.2-beta1.22216.1 10.3.0 3.2.2146 From 158c0e8a3eb773b5f6246287de868e8af203089b Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Tue, 15 Apr 2025 08:40:58 +0200 Subject: [PATCH 03/14] adjust to breaking changes: the removal of Cli prefix --- src/BlazorWasmSdk/Tool/Program.cs | 10 +- .../Commands/FormatAnalyzersCommand.cs | 6 +- .../Commands/FormatCommandCommon.cs | 30 ++-- .../Commands/FormatStyleCommand.cs | 6 +- .../Commands/FormatWhitespaceCommand.cs | 6 +- .../Commands/RootFormatCommand.cs | 6 +- .../dotnet-watch/CommandLineOptions.cs | 32 ++-- .../ChoiceTemplateParameter.cs | 4 +- .../CliTemplateParameter.cs | 32 ++-- .../Commands/BaseCommand.cs | 19 ++- .../Commands/CommandLineUtils.cs | 16 +- .../Commands/Example.cs | 34 ++-- .../Commands/Extensions.cs | 10 +- .../Commands/FilterOptionDefinition.cs | 8 +- .../Commands/GlobalArgs.cs | 2 +- .../Commands/ICommandArgs.cs | 4 +- .../Commands/ICommandDocument.cs | 2 +- .../Commands/ICustomHelp.cs | 2 +- .../Commands/IFilterableCommand.cs | 2 +- .../Commands/ITabularOutputCommand.cs | 4 +- .../Commands/NewCommand.Legacy.cs | 32 ++-- .../Commands/NewCommand.cs | 18 +- .../Commands/NewCommandArgs.cs | 2 +- .../Commands/ParserFactory.cs | 4 +- .../Commands/SharedOptions.cs | 14 +- .../Commands/SharedOptionsFactory.cs | 34 ++-- .../create/InstantiateCommand.Help.cs | 27 +-- .../InstantiateCommand.NoMatchHandling.cs | 12 +- .../InstantiateCommand.TabCompletion.cs | 2 +- .../Commands/create/InstantiateCommand.cs | 8 +- .../Commands/create/TemplateCommand.cs | 19 ++- .../Commands/create/TemplateCommandArgs.cs | 8 +- .../Commands/create/TemplateOption.cs | 4 +- .../Commands/details/DetailsCommand.cs | 8 +- .../Commands/install/BaseInstallCommand.cs | 8 +- .../Commands/install/LegacyInstallCommand.cs | 6 +- .../Commands/list/BaseListCommand.cs | 10 +- .../Commands/list/LegacyListCommand.cs | 8 +- .../Commands/search/BaseSearchCommand.cs | 8 +- .../Commands/search/LegacySearchCommand.cs | 8 +- .../uninstall/BaseUninstallCommand.cs | 2 +- .../Commands/update/BaseUpdateCommand.cs | 4 +- .../update/LegacyUpdateApplyCommand.cs | 6 +- .../update/LegacyUpdateCheckCommand.cs | 6 +- .../Commands/update/UpdateCommand.cs | 2 +- .../NewCommandFactory.cs | 2 +- .../SymbolExtensions.cs | 4 +- .../Commands/Build/BuildCommandParser.cs | 28 ++-- .../BuildServer/BuildServerCommandParser.cs | 6 +- .../BuildServerShutdownCommandParser.cs | 14 +- .../Commands/Clean/CleanCommandParser.cs | 16 +- .../Commands/Format/FormatCommandParser.cs | 8 +- .../dotnet/Commands/Fsi/FsiCommandParser.cs | 8 +- .../dotnet/Commands/Help/HelpCommandParser.cs | 8 +- .../Commands/Hidden/Add/AddCommandParser.cs | 8 +- .../Add/Package/AddPackageCommandParser.cs | 8 +- .../Reference/AddReferenceCommandParser.cs | 8 +- .../Hidden/Complete/CompleteCommandParser.cs | 12 +- ...ternalReportInstallSuccessCommandParser.cs | 10 +- .../Commands/Hidden/List/ListCommandParser.cs | 12 +- .../List/Package/ListPackageCommandParser.cs | 8 +- .../Reference/ListReferenceCommandParser.cs | 10 +- .../Hidden/Parse/ParseCommandParser.cs | 8 +- .../Package/RemovePackageCommandParser.cs | 8 +- .../Reference/RemoveReferenceCommandParser.cs | 8 +- .../Hidden/Remove/RemoveCommandParser.cs | 8 +- .../Commands/MSBuild/MSBuildCommandParser.cs | 8 +- .../dotnet/Commands/New/NewCommandParser.cs | 15 +- .../Commands/NuGet/NuGetCommandParser.cs | 154 +++++++++--------- .../dotnet/Commands/Pack/PackCommandParser.cs | 24 +-- .../Package/Add/PackageAddCommandParser.cs | 24 +-- .../Package/List/PackageListCommand.cs | 4 +- .../Package/List/PackageListCommandParser.cs | 38 ++--- .../Commands/Package/PackageCommandParser.cs | 6 +- .../Remove/PackageRemoveCommandParser.cs | 12 +- .../Search/PackageSearchCommandParser.cs | 28 ++-- .../Convert/ProjectConvertCommandParser.cs | 8 +- .../Commands/Project/ProjectCommandParser.cs | 4 +- .../Commands/Publish/PublishCommandParser.cs | 28 ++-- .../Add/ReferenceAddCommandParser.cs | 14 +- .../List/ReferenceListCommandParser.cs | 8 +- .../Reference/ReferenceCommandParser.cs | 8 +- .../Remove/ReferenceRemoveCommandParser.cs | 12 +- .../Commands/Restore/RestoreCommandParser.cs | 20 +-- .../dotnet/Commands/Run/CommonRunHelpers.cs | 4 +- .../dotnet/Commands/Run/RunCommandParser.cs | 34 ++-- .../Sdk/Check/SdkCheckCommandParser.cs | 8 +- .../dotnet/Commands/Sdk/SdkCommandParser.cs | 6 +- .../Solution/Add/SolutionAddCommandParser.cs | 14 +- .../List/SolutionListCommandParser.cs | 10 +- .../Migrate/SolutionMigrateCommandParser.cs | 8 +- .../Remove/SolutionRemoveCommandParser.cs | 10 +- .../Solution/SolutionCommandParser.cs | 8 +- .../Commands/Store/StoreCommandParser.cs | 20 +-- .../dotnet/Commands/Test/TestCommandParser.cs | 60 +++---- .../Test/TestingPlatformCommand.Help.cs | 6 +- .../Commands/Test/TestingPlatformCommand.cs | 2 +- .../Commands/Test/TestingPlatformOptions.cs | 32 ++-- .../Commands/Tool/Common/ToolAppliedOption.cs | 12 +- .../Tool/Install/ToolInstallCommandParser.cs | 42 ++--- .../ToolInstallGlobalOrToolPathCommand.cs | 2 +- .../Tool/List/ToolListCommandParser.cs | 18 +- .../Tool/Restore/ToolRestoreCommandParser.cs | 16 +- .../Commands/Tool/Run/ToolRunCommandParser.cs | 14 +- .../Tool/Search/ToolSearchCommandParser.cs | 18 +- .../dotnet/Commands/Tool/ToolCommandParser.cs | 6 +- .../ToolCommandRestorePassThroughOptions.cs | 10 +- .../Uninstall/ToolUninstallCommandParser.cs | 18 +- .../Tool/Update/ToolUpdateCommandParser.cs | 14 +- .../Commands/VSTest/VSTestCommandParser.cs | 6 +- .../Clean/WorkloadCleanCommandParser.cs | 10 +- .../Config/WorkloadConfigCommandParser.cs | 10 +- .../Elevate/WorkloadElevateCommandParser.cs | 8 +- .../History/WorkloadHistoryCommandParser.cs | 8 +- .../Install/WorkloadInstallCommandParser.cs | 18 +- .../Workload/InstallingWorkloadCommand.cs | 21 +-- .../List/WorkloadListCommandParser.cs | 16 +- .../Repair/WorkloadRepairCommandParser.cs | 14 +- .../Restore/WorkloadRestoreCommandParser.cs | 8 +- .../Search/WorkloadSearchCommandParser.cs | 12 +- .../WorkloadSearchVersionsCommandParser.cs | 16 +- .../WorkloadUninstallCommandParser.cs | 12 +- .../Update/WorkloadUpdateCommandParser.cs | 20 +-- .../Commands/Workload/WorkloadCommandBase.cs | 2 +- ...dCommandNuGetRestoreActionConfigOptions.cs | 22 +-- .../Workload/WorkloadCommandParser.cs | 11 +- src/Cli/dotnet/CommonArguments.cs | 2 +- src/Cli/dotnet/CommonOptions.cs | 58 +++---- src/Cli/dotnet/CommonOptionsFactory.cs | 2 +- src/Cli/dotnet/DocumentedCommand.cs | 2 +- src/Cli/dotnet/DotNetCommandFactory.cs | 2 +- .../Extensions/OptionForwardingExtensions.cs | 20 +-- .../Extensions/ParseResultExtensions.cs | 14 +- src/Cli/dotnet/Extensions/ParserExtensions.cs | 2 +- .../NugetSearch/NugetSearchApiParameter.cs | 2 +- src/Cli/dotnet/Parser.cs | 33 ++-- .../Telemetry/AllowListToSendFirstArgument.cs | 2 +- ...owListToSendVerbSecondVerbFirstArgument.cs | 4 +- .../TopLevelCommandNameAndOptionToLog.cs | 4 +- .../Program.cs | 64 ++++---- .../Microsoft.DotNet.GenAPI.Tool/Program.cs | 20 +-- .../containerize/ContainerizeCommand.cs | 54 +++--- .../eng/tools/BinaryToolKit/Program.cs | 16 +- .../eng/tools/BuildComparer/Program.cs | 16 +- .../tools/CreateBaselineUpdatePR/Program.cs | 24 +-- src/StaticWebAssetsSdk/Tool/Program.cs | 10 +- .../CompletionsCommand.cs | 8 +- .../HelpGenerationExtensions.cs | 22 +-- .../shells/BashShellProvider.cs | 10 +- .../shells/FishShellProvider.cs | 2 +- .../shells/NuShellShellProvider.cs | 2 +- .../shells/PowershellShellProvider.cs | 16 +- .../shells/ShellProvider.cs | 2 +- .../shells/ZshShellProvider.cs | 26 +-- .../ParserTests/InstallTests.cs | 2 +- .../InstantiateTests.Subcommand.cs | 14 +- .../ParserTests/InstantiateTests.cs | 28 ++-- .../ParserTests/ListTests.cs | 2 +- .../ParserTests/MiscTests.cs | 10 +- .../ParserTests/SearchTests.cs | 6 +- .../TabCompletionTests.Approval.cs | 20 +-- .../ParserTests/TabCompletionTests.cs | 12 +- .../ParserTests/UninstallTests.cs | 2 +- .../ParserTests/UpdateTests.cs | 2 +- .../ListTemplateResolverTests.cs | 2 +- .../BashShellProviderTests.cs | 10 +- .../HelpExtensionsTests.cs | 18 +- .../PowershellProviderTests.cs | 10 +- .../TestHelpers.cs | 4 +- .../VerifyExtensions.cs | 2 +- .../ZshShellProviderTests.cs | 22 +-- .../Build/BuildRelatedCommandParserTests.cs | 4 +- .../Build/GivenDotnetBuildBuildsCsproj.cs | 4 +- .../MSBuildArgumentCommandLineParserTests.cs | 2 +- .../ParserTests/CommonOptionsTests.cs | 12 +- 175 files changed, 1176 insertions(+), 1169 deletions(-) diff --git a/src/BlazorWasmSdk/Tool/Program.cs b/src/BlazorWasmSdk/Tool/Program.cs index c4f497eef7e3..7b9d504df849 100644 --- a/src/BlazorWasmSdk/Tool/Program.cs +++ b/src/BlazorWasmSdk/Tool/Program.cs @@ -12,20 +12,20 @@ internal static class Program { public static int Main(string[] args) { - CliRootCommand rootCommand = new(); - CliCommand brotli = new("brotli"); + RootCommand rootCommand = new(); + Command brotli = new("brotli"); - CliOption compressionLevelOption = new("-c") + Option compressionLevelOption = new("-c") { DefaultValueFactory = _ => CompressionLevel.SmallestSize, Description = "System.IO.Compression.CompressionLevel for the Brotli compression algorithm.", }; - CliOption> sourcesOption = new("-s") + Option> sourcesOption = new("-s") { Description = "A list of files to compress.", AllowMultipleArgumentsPerToken = false }; - CliOption> outputsOption = new("-o") + Option> outputsOption = new("-o") { Description = "The filenames to output the compressed file to.", AllowMultipleArgumentsPerToken = false diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs b/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs index 1fc765d41cf5..c8da566ff3a9 100644 --- a/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs +++ b/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs @@ -12,9 +12,9 @@ internal static class FormatAnalyzersCommand { private static readonly FormatAnalyzersHandler s_analyzerHandler = new(); - internal static CliCommand GetCommand() + internal static Command GetCommand() { - var command = new CliCommand("analyzers", Resources.Run_3rd_party_analyzers__and_apply_fixes) + var command = new Command("analyzers", Resources.Run_3rd_party_analyzers__and_apply_fixes) { DiagnosticsOption, ExcludeDiagnosticsOption, @@ -25,7 +25,7 @@ internal static CliCommand GetCommand() return command; } - private class FormatAnalyzersHandler : AsynchronousCliAction + private class FormatAnalyzersHandler : AsynchronousCommandLineAction { public override async Task InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken) { diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs index 48acb26267d4..63e764517474 100644 --- a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs +++ b/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs @@ -19,67 +19,67 @@ internal static class FormatCommandCommon private static string[] VerbosityLevels => new[] { "q", "quiet", "m", "minimal", "n", "normal", "d", "detailed", "diag", "diagnostic" }; private static string[] SeverityLevels => new[] { "info", "warn", "error" }; - public static readonly CliArgument SlnOrProjectArgument = new CliArgument(Resources.SolutionOrProjectArgumentName) + public static readonly Argument SlnOrProjectArgument = new Argument(Resources.SolutionOrProjectArgumentName) { Description = Resources.SolutionOrProjectArgumentDescription, Arity = ArgumentArity.ZeroOrOne }.DefaultToCurrentDirectory(); - internal static readonly CliOption FolderOption = new("--folder") + internal static readonly Option FolderOption = new("--folder") { Description = Resources.Whether_to_treat_the_workspace_argument_as_a_simple_folder_of_files, }; - internal static readonly CliOption NoRestoreOption = new("--no-restore") + internal static readonly Option NoRestoreOption = new("--no-restore") { Description = Resources.Doesnt_execute_an_implicit_restore_before_formatting, }; - internal static readonly CliOption VerifyNoChanges = new("--verify-no-changes") + internal static readonly Option VerifyNoChanges = new("--verify-no-changes") { Description = Resources.Verify_no_formatting_changes_would_be_performed_Terminates_with_a_non_zero_exit_code_if_any_files_would_have_been_formatted, }; - internal static readonly CliOption DiagnosticsOption = new("--diagnostics") + internal static readonly Option DiagnosticsOption = new("--diagnostics") { AllowMultipleArgumentsPerToken = true, DefaultValueFactory = _ => Array.Empty(), Description = Resources.A_space_separated_list_of_diagnostic_ids_to_use_as_a_filter_when_fixing_code_style_or_3rd_party_issues, }; - internal static readonly CliOption ExcludeDiagnosticsOption = new("--exclude-diagnostics") + internal static readonly Option ExcludeDiagnosticsOption = new("--exclude-diagnostics") { AllowMultipleArgumentsPerToken = true, DefaultValueFactory = _ => Array.Empty(), Description = Resources.A_space_separated_list_of_diagnostic_ids_to_ignore_when_fixing_code_style_or_3rd_party_issues, }; - internal static readonly CliOption SeverityOption = new CliOption("--severity") + internal static readonly Option SeverityOption = new Option("--severity") { Description = Resources.The_severity_of_diagnostics_to_fix_Allowed_values_are_info_warn_and_error, }; - internal static readonly CliOption IncludeOption = new("--include") + internal static readonly Option IncludeOption = new("--include") { AllowMultipleArgumentsPerToken = true, DefaultValueFactory = _ => Array.Empty(), Description = Resources.A_list_of_relative_file_or_folder_paths_to_include_in_formatting_All_files_are_formatted_if_empty, }; - internal static readonly CliOption ExcludeOption = new("--exclude") + internal static readonly Option ExcludeOption = new("--exclude") { AllowMultipleArgumentsPerToken = true, DefaultValueFactory = _ => Array.Empty(), Description = Resources.A_list_of_relative_file_or_folder_paths_to_exclude_from_formatting, }; - internal static readonly CliOption IncludeGeneratedOption = new("--include-generated") + internal static readonly Option IncludeGeneratedOption = new("--include-generated") { Description = Resources.Format_files_generated_by_the_SDK, }; - internal static readonly CliOption VerbosityOption = new CliOption("--verbosity", "-v") + internal static readonly Option VerbosityOption = new Option("--verbosity", "-v") { Description = Resources.Set_the_verbosity_level_Allowed_values_are_quiet_minimal_normal_detailed_and_diagnostic, }; - internal static readonly CliOption BinarylogOption = new CliOption("--binarylog") + internal static readonly Option BinarylogOption = new Option("--binarylog") { HelpName = "binary-log-path", Arity = ArgumentArity.ZeroOrOne, Description = Resources.Log_all_project_or_solution_load_information_to_a_binary_log_file, }; - internal static readonly CliOption ReportOption = new CliOption("--report") + internal static readonly Option ReportOption = new Option("--report") { HelpName = "report-path", Arity = ArgumentArity.ZeroOrOne, @@ -118,7 +118,7 @@ internal static async Task FormatAsync(FormatOptions formatOptions, ILogger return formatResult.GetExitCode(formatOptions.ChangesAreErrors); } - public static void AddCommonOptions(this CliCommand command) + public static void AddCommonOptions(this Command command) { command.Arguments.Add(SlnOrProjectArgument); command.Options.Add(NoRestoreOption); @@ -131,7 +131,7 @@ public static void AddCommonOptions(this CliCommand command) command.Options.Add(ReportOption); } - public static CliArgument DefaultToCurrentDirectory(this CliArgument arg) + public static Argument DefaultToCurrentDirectory(this Argument arg) { arg.DefaultValueFactory = _ => EnsureTrailingSlash(Directory.GetCurrentDirectory()); return arg; diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs b/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs index 12d96959c6bc..bd33b2708e83 100644 --- a/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs +++ b/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs @@ -12,9 +12,9 @@ internal static class FormatStyleCommand { private static readonly FormatStyleHandler s_styleHandler = new(); - internal static CliCommand GetCommand() + internal static Command GetCommand() { - var command = new CliCommand("style", Resources.Run_code_style_analyzers_and_apply_fixes) + var command = new Command("style", Resources.Run_code_style_analyzers_and_apply_fixes) { DiagnosticsOption, ExcludeDiagnosticsOption, @@ -25,7 +25,7 @@ internal static CliCommand GetCommand() return command; } - private class FormatStyleHandler : AsynchronousCliAction + private class FormatStyleHandler : AsynchronousCommandLineAction { public override async Task InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken) { diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs b/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs index 0885f96f284d..b5179f379ef1 100644 --- a/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs +++ b/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs @@ -12,9 +12,9 @@ internal static class FormatWhitespaceCommand { private static readonly FormatWhitespaceHandler s_formattingHandler = new(); - internal static CliCommand GetCommand() + internal static Command GetCommand() { - var command = new CliCommand("whitespace", Resources.Run_whitespace_formatting) + var command = new Command("whitespace", Resources.Run_whitespace_formatting) { FolderOption }; @@ -45,7 +45,7 @@ internal static void EnsureFolderNotSpecifiedWhenLoggingBinlog(CommandResult sym } } - private class FormatWhitespaceHandler : AsynchronousCliAction + private class FormatWhitespaceHandler : AsynchronousCommandLineAction { public override async Task InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken) { diff --git a/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs b/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs index 66d036f85c2b..050c12622402 100644 --- a/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs +++ b/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs @@ -12,9 +12,9 @@ internal static class RootFormatCommand { private static readonly FormatCommandDefaultHandler s_formatCommandHandler = new(); - public static CliRootCommand GetCommand() + public static RootCommand GetCommand() { - var formatCommand = new CliRootCommand(Resources.Formats_code_to_match_editorconfig_settings) + var formatCommand = new RootCommand(Resources.Formats_code_to_match_editorconfig_settings) { FormatWhitespaceCommand.GetCommand(), FormatStyleCommand.GetCommand(), @@ -28,7 +28,7 @@ public static CliRootCommand GetCommand() return formatCommand; } - private class FormatCommandDefaultHandler : AsynchronousCliAction + private class FormatCommandDefaultHandler : AsynchronousCommandLineAction { public override async Task InvokeAsync(ParseResult parseResult, CancellationToken cancellationToken) { diff --git a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs index e193514a1269..d31633af7d91 100644 --- a/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs +++ b/src/BuiltInTools/dotnet-watch/CommandLineOptions.cs @@ -31,15 +31,15 @@ internal sealed class CommandLineOptions public string Command => ExplicitCommand ?? DefaultCommand; // this option is referenced from inner logic and so needs to be reference-able - public static CliOption NonInteractiveOption = new CliOption("--non-interactive") { Description = Resources.Help_NonInteractive, Arity = ArgumentArity.Zero }; + public static Option NonInteractiveOption = new Option("--non-interactive") { Description = Resources.Help_NonInteractive, Arity = ArgumentArity.Zero }; public static CommandLineOptions? Parse(IReadOnlyList args, IReporter reporter, TextWriter output, out int errorCode) { // dotnet watch specific options: - var quietOption = new CliOption("--quiet", "-q") { Description = Resources.Help_Quiet, Arity = ArgumentArity.Zero }; - var verboseOption = new CliOption("--verbose") { Description = Resources.Help_Verbose, Arity = ArgumentArity.Zero }; - var listOption = new CliOption("--list") { Description = Resources.Help_List, Arity = ArgumentArity.Zero }; - var noHotReloadOption = new CliOption("--no-hot-reload") { Description = Resources.Help_NoHotReload, Arity = ArgumentArity.Zero }; + var quietOption = new Option("--quiet", "-q") { Description = Resources.Help_Quiet, Arity = ArgumentArity.Zero }; + var verboseOption = new Option("--verbose") { Description = Resources.Help_Verbose, Arity = ArgumentArity.Zero }; + var listOption = new Option("--list") { Description = Resources.Help_List, Arity = ArgumentArity.Zero }; + var noHotReloadOption = new Option("--no-hot-reload") { Description = Resources.Help_NoHotReload, Arity = ArgumentArity.Zero }; verboseOption.Validators.Add(v => { @@ -49,7 +49,7 @@ internal sealed class CommandLineOptions } }); - CliOption[] watchOptions = + Option[] watchOptions = [ quietOption, verboseOption, @@ -59,12 +59,12 @@ internal sealed class CommandLineOptions ]; // Options we need to know about that are passed through to the subcommand: - var shortProjectOption = new CliOption("-p") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; - var longProjectOption = new CliOption("--project") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; - var launchProfileOption = new CliOption("--launch-profile", "-lp") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; - var noLaunchProfileOption = new CliOption("--no-launch-profile") { Hidden = true, Arity = ArgumentArity.Zero }; + var shortProjectOption = new Option("-p") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; + var longProjectOption = new Option("--project") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; + var launchProfileOption = new Option("--launch-profile", "-lp") { Hidden = true, Arity = ArgumentArity.ZeroOrOne, AllowMultipleArgumentsPerToken = false }; + var noLaunchProfileOption = new Option("--no-launch-profile") { Hidden = true, Arity = ArgumentArity.Zero }; - var rootCommand = new CliRootCommand(Resources.Help) + var rootCommand = new RootCommand(Resources.Help) { Directives = { new EnvironmentVariablesDirective() }, }; @@ -90,7 +90,7 @@ internal sealed class CommandLineOptions var rootCommandInvoked = false; rootCommand.SetAction(parseResult => rootCommandInvoked = true); - var cliConfig = new CliConfiguration(rootCommand) + var cliConfig = new CommandLineConfiguration(rootCommand) { Output = output, Error = output, @@ -148,7 +148,7 @@ internal sealed class CommandLineOptions // We assume that forwarded options, if any, are intended for dotnet build. var buildArguments = buildOptions.Select(option => ((IForwardedOption)option).GetForwardingFunction()(parseResult)).SelectMany(args => args).ToArray(); - var targetFrameworkOption = (CliOption?)buildOptions.SingleOrDefault(option => option.Name == "--framework"); + var targetFrameworkOption = (Option?)buildOptions.SingleOrDefault(option => option.Name == "--framework"); return new() { @@ -174,8 +174,8 @@ internal sealed class CommandLineOptions private static IReadOnlyList GetCommandArguments( ParseResult parseResult, - IReadOnlyList watchOptions, - CliCommand? explicitCommand) + IReadOnlyList - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 diff --git a/eng/Versions.props b/eng/Versions.props index 78c5977f6efc..330b9437ab27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -282,12 +282,12 @@ - 10.0.0-beta.25212.1 - 10.0.0-beta.25212.1 - 10.0.0-beta.25212.1 - 10.0.0-beta.25212.1 - 10.0.0-beta.25212.1 - 10.0.0-beta.25212.1 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 diff --git a/global.json b/global.json index d586ecd1ad07..c35c9a7d860a 100644 --- a/global.json +++ b/global.json @@ -14,8 +14,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From bdd41bce56b34259a977510ea56f2200decac948 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 06:27:02 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/templating build 20250414.7 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Authoring.TemplateVerifier , Microsoft.TemplateEngine.Edge , Microsoft.TemplateEngine.Mocks , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.TestHelper , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common , Microsoft.TemplateSearch.TemplateDiscovery From Version 10.0.100-preview.4.25214.2 -> To Version 10.0.100-preview.4.25214.7 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0677a7db07e8..49555b38de60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 - + https://github.com/dotnet/templating - d92055f1223d7c91b96cbea90afe0f7ca7f0542b + 671afc53eeaa867df016312a6683762ba62f43b9 diff --git a/eng/Versions.props b/eng/Versions.props index 330b9437ab27..5c8d40221f30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,16 +204,16 @@ - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 - 10.0.100-preview.4.25214.2 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.7 From f101c823408de2e6b3aad192c691ef4525b8683a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 07:31:46 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/templating build 20250414.8 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Authoring.TemplateVerifier , Microsoft.TemplateEngine.Edge , Microsoft.TemplateEngine.Mocks , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.TestHelper , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common , Microsoft.TemplateSearch.TemplateDiscovery From Version 10.0.100-preview.4.25214.2 -> To Version 10.0.100-preview.4.25214.8 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49555b38de60..5f67abea13d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/templating - 671afc53eeaa867df016312a6683762ba62f43b9 + c11fe71ebb773ca6070fb078a5eda02406831667 diff --git a/eng/Versions.props b/eng/Versions.props index 5c8d40221f30..ce2b16d4ee6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,16 +204,16 @@ - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 - 10.0.100-preview.4.25214.7 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 + 10.0.100-preview.4.25214.8 From 6320064ce929dcf16bbef4f86c8d7fda915b3413 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 09:21:53 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/sourcelink build 20250414.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 10.0.0-beta.25203.1 -> To Version 10.0.0-beta.25214.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f67abea13d3..a65c265f3e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -506,34 +506,34 @@ https://github.com/dotnet/deployment-tools dd4d34c5adceabc4a02c345473a5baaece64d8bd - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 - + https://github.com/dotnet/sourcelink - ccdd470400fb56274ddaafc64ee1bbd1f953f361 + 9a5858c6363b00b244aeddeac982a33b7e660f68 diff --git a/eng/Versions.props b/eng/Versions.props index ce2b16d4ee6a..0b923efacad8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -291,12 +291,12 @@ - 10.0.0-beta.25203.1 - 10.0.0-beta.25203.1 - 10.0.0-beta.25203.1 - 10.0.0-beta.25203.1 - 10.0.0-beta.25203.1 - 10.0.0-beta.25203.1 + 10.0.0-beta.25214.2 + 10.0.0-beta.25214.2 + 10.0.0-beta.25214.2 + 10.0.0-beta.25214.2 + 10.0.0-beta.25214.2 + 10.0.0-beta.25214.2 From 2e39f666641be601a316fdb3ba091f56624d3c4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 19:44:51 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/nuget/nuget.client build 6.15.0.7 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.102 -> To Version 6.15.0-preview.1.7 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46a060590813..7df7cf9ed92b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -162,74 +162,74 @@ https://github.com/dotnet/roslyn 959bcb76028fa383d6e1388c60bef630c75470d3 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 - + https://github.com/nuget/nuget.client - 7f50923823cb8fe4dab9b6565ece9516407de498 + d535886475b1eeda1813eb1947af23bd046abb25 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b5f4d7e9248a..f91bcdb57e25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,18 +155,18 @@ - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 - 6.14.0-preview.1.102 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 + 6.15.0-preview.1.7 From 1e24e3b28165dfbcd30f7658e6edde778e314f55 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 16 Apr 2025 08:00:21 +0200 Subject: [PATCH 09/14] Temporarily synchronize sourcelink again --- src/VirtualMonoRepo/source-mappings.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 3c486bcab22d..5175b4ffe8e8 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -150,9 +150,7 @@ }, { "name": "sourcelink", - "defaultRemote": "https://github.com/dotnet/sourcelink", - // Migrated onto the flat flow - "disableSynchronization": true + "defaultRemote": "https://github.com/dotnet/sourcelink" }, { "name": "symreader", From 4bbe56d4abebc6f21f342ac02867ba8d4b1b8d24 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Apr 2025 05:02:00 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/runtime build 20250415.12 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.IO.Hashing , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.TargetingPack.x64.10.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-preview.4.25211.19 -> To Version 10.0.0-preview.4.25215.12 --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 72 +++++++++---------- 2 files changed, 110 insertions(+), 110 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7df7cf9ed92b..79afecd84094 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -43,46 +43,46 @@ c11fe71ebb773ca6070fb078a5eda02406831667 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 @@ -249,29 +249,29 @@ 92a3cb95e0d1b901ab0eb77f511e4cabe76edd61 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 https://github.com/dotnet/windowsdesktop @@ -549,85 +549,85 @@ - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 @@ -669,9 +669,9 @@ 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 https://github.com/dotnet/arcade-services @@ -708,9 +708,9 @@ https://github.com/microsoft/testfx b993be6114886799a9064a33175b37f2a1f2604b - + https://github.com/dotnet/runtime - 464e5fe6fbe499012445cbd6371010748b89dba3 + d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02 diff --git a/eng/Versions.props b/eng/Versions.props index f91bcdb57e25..04b759a58a39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -96,44 +96,44 @@ - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 8.0.0-rc.1.23414.4 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 2.1.0 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 - 10.0.0-preview.4.25211.19 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 + 10.0.0-preview.4.25215.12 8.0.0 From f5258c8a3d82356d2546c205941877f099db2549 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 16 Apr 2025 08:17:22 +0200 Subject: [PATCH 11/14] Delete src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch --- ...targetos-and-rid-as-local-properties.patch | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch diff --git a/src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch b/src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch deleted file mode 100644 index 0371dae42b4a..000000000000 --- a/src/SourceBuild/patches/runtime/0001-treat-targetos-and-rid-as-local-properties.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e230fef55109e2e16716136443d8fd5c83bdfae Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Fri, 21 Mar 2025 09:09:52 -0700 -Subject: [PATCH] Allow TargetOS and TargetRid to be overridden in - DotNetBuild.props - -This is needed to fix the linux-bionic builds in the VMR -Backport: https://github.com/dotnet/runtime/pull/113765 ---- -diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props -index 1631f76ce95..7b88a2177d0 100644 ---- a/eng/DotNetBuild.props -+++ b/eng/DotNetBuild.props -@@ -1,6 +1,6 @@ - - -- -+ - - - runtime -diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props -index 7b88a2177d0deb..5403d38e544465 100644 ---- a/eng/DotNetBuild.props -+++ b/eng/DotNetBuild.props -@@ -16,6 +16,7 @@ - <_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-')) - $(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-')) - $(TargetRid.Substring(0, $(_targetRidPlatformIndex))) -+ windows - - <_hostRidPlatformIndex>$(_hostRid.LastIndexOf('-')) - <_hostArch>$(_hostRid.Substring($(_hostRidPlatformIndex)).TrimStart('-')) From dff9bad796644b23f76ed17fa8142d53393bea49 Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Wed, 16 Apr 2025 10:22:35 +0200 Subject: [PATCH 12/14] revert changes under src/SourceBuild --- .../eng/tools/BinaryToolKit/Program.cs | 16 ++++++------- .../eng/tools/BuildComparer/Program.cs | 16 ++++++------- .../tools/CreateBaselineUpdatePR/Program.cs | 24 +++++++++---------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/SourceBuild/content/eng/tools/BinaryToolKit/Program.cs b/src/SourceBuild/content/eng/tools/BinaryToolKit/Program.cs index 768e76e36d0a..5feb90aad74a 100644 --- a/src/SourceBuild/content/eng/tools/BinaryToolKit/Program.cs +++ b/src/SourceBuild/content/eng/tools/BinaryToolKit/Program.cs @@ -9,20 +9,20 @@ namespace BinaryToolKit; public class Program { - public static readonly Argument TargetDirectory = new("target-directory") + public static readonly CliArgument TargetDirectory = new("target-directory") { Description = "The directory to run the binary tooling on.", Arity = ArgumentArity.ExactlyOne }; - public static readonly Option OutputReportDirectory = new("--output-directory", "-o") + public static readonly CliOption OutputReportDirectory = new("--output-directory", "-o") { Description = "The directory to output the report to.", Arity = ArgumentArity.ZeroOrOne, DefaultValueFactory = _ => Path.Combine(Directory.GetCurrentDirectory(), "binary-report") }; - public static readonly Option Level = new("--log-level", "-l") + public static readonly CliOption Level = new("--log-level", "-l") { Description = "The log level to run the tool in.", Arity = ArgumentArity.ZeroOrOne, @@ -30,7 +30,7 @@ public class Program Recursive = true }; - public static readonly Option AllowedBinariesFile = new("--allowed-binaries-file", "-ab") + public static readonly CliOption AllowedBinariesFile = new("--allowed-binaries-file", "-ab") { Description = "The file containing the list of allowed binaries that are ignored for cleaning or validating.\n", Arity = ArgumentArity.ZeroOrOne @@ -43,7 +43,7 @@ public static async Task Main(string[] args) var cleanCommand = CreateCommand("clean", "Clean the binaries in the target directory."); var validateCommand = CreateCommand("validate", "Detect new binaries in the target directory."); - var rootCommand = new RootCommand("Tool for detecting, validating, and cleaning binaries in the target directory.") + var rootCommand = new CliRootCommand("Tool for detecting, validating, and cleaning binaries in the target directory.") { Level, cleanCommand, @@ -58,9 +58,9 @@ public static async Task Main(string[] args) return ExitCode; } - private static Command CreateCommand(string name, string description) + private static CliCommand CreateCommand(string name, string description) { - return new Command(name, description) + return new CliCommand(name, description) { TargetDirectory, OutputReportDirectory, @@ -68,7 +68,7 @@ private static Command CreateCommand(string name, string description) }; } - private static void SetCommandAction(Command command, Modes mode) + private static void SetCommandAction(CliCommand command, Modes mode) { command.SetAction(async (result, CancellationToken) => { diff --git a/src/SourceBuild/content/eng/tools/BuildComparer/Program.cs b/src/SourceBuild/content/eng/tools/BuildComparer/Program.cs index 2e0528abc8f0..4c5f938173e8 100644 --- a/src/SourceBuild/content/eng/tools/BuildComparer/Program.cs +++ b/src/SourceBuild/content/eng/tools/BuildComparer/Program.cs @@ -24,43 +24,43 @@ public class Program /// Return code indicating success (0) or failure (non-zero). static int Main(string[] args) { - var vmrManifestPathArgument = new Option("-vmrManifestPath") + var vmrManifestPathArgument = new CliOption("-vmrManifestPath") { Description = "Path to the manifest file", Required = true }; - var vmrAssetBasePathArgument = new Option("-vmrAssetBasePath") + var vmrAssetBasePathArgument = new CliOption("-vmrAssetBasePath") { Description = "Path to the manifest file", Required = true }; - var msftAssetBasePathArgument = new Option("-msftAssetBasePath") + var msftAssetBasePathArgument = new CliOption("-msftAssetBasePath") { Description = "Path to the asset base path", Required = true }; - var issuesReportArgument = new Option("-issuesReport") + var issuesReportArgument = new CliOption("-issuesReport") { Description = "Path to output xml file for non-baselined issues.", Required = true }; - var noIssuesReportArgument = new Option("-noIssuesReport") + var noIssuesReportArgument = new CliOption("-noIssuesReport") { Description = "Path to output xml file for baselined issues and assets without issues.", Required = true }; - var parallelismArgument = new Option("-parallel") + var parallelismArgument = new CliOption("-parallel") { Description = "Amount of parallelism used while analyzing the builds.", DefaultValueFactory = _ => 8, Required = true }; - var baselineArgument = new Option("-baseline") + var baselineArgument = new CliOption("-baseline") { Description = "Path to the baseline build manifest.", Required = true }; - var rootCommand = new RootCommand(description: "Tool for comparing Microsoft builds with VMR builds.") + var rootCommand = new CliRootCommand(description: "Tool for comparing Microsoft builds with VMR builds.") { vmrManifestPathArgument, vmrAssetBasePathArgument, diff --git a/src/SourceBuild/content/eng/tools/CreateBaselineUpdatePR/Program.cs b/src/SourceBuild/content/eng/tools/CreateBaselineUpdatePR/Program.cs index bdf940673386..641f3b20df18 100644 --- a/src/SourceBuild/content/eng/tools/CreateBaselineUpdatePR/Program.cs +++ b/src/SourceBuild/content/eng/tools/CreateBaselineUpdatePR/Program.cs @@ -9,52 +9,52 @@ namespace CreateBaselineUpdatePR; public class Program { - public static readonly Argument Repo = new("repo") + public static readonly CliArgument Repo = new("repo") { Description = "The GitHub repository to create the PR in. Should be in the form '/'", Arity = ArgumentArity.ExactlyOne }; - public static readonly Argument OriginalFilesDirectory = new("original-files-directory") + public static readonly CliArgument OriginalFilesDirectory = new("original-files-directory") { Description = "The directory where the original test files are located. Should be relative to the repo", Arity = ArgumentArity.ExactlyOne }; - public static readonly Argument UpdatedFilesDirectory = new("updated-files-directory") + public static readonly CliArgument UpdatedFilesDirectory = new("updated-files-directory") { Description = "The directory containing the updated test files published by the associated test. Should be absolute or relative to the working directory of the tool.", Arity = ArgumentArity.ExactlyOne }; - public static readonly Argument BuildId = new("build-id") + public static readonly CliArgument BuildId = new("build-id") { Description = "The id of the build that published the updated test files.", Arity = ArgumentArity.ExactlyOne }; - public static readonly Option Title = new("--title", "-t") + public static readonly CliOption Title = new("--title", "-t") { Description = "The title of the PR.", Arity = ArgumentArity.ZeroOrOne, DefaultValueFactory = _ => "Update Test Baselines and Exclusions" }; - public static readonly Option Branch = new("--branch", "-b") + public static readonly CliOption Branch = new("--branch", "-b") { Description = "The target branch of the PR.", Arity = ArgumentArity.ZeroOrOne, DefaultValueFactory = _ => "main" }; - public static readonly Option GitHubToken = new("--github-token", "-g") + public static readonly CliOption GitHubToken = new("--github-token", "-g") { Description = "The GitHub token to use to create the PR.", Arity = ArgumentArity.ZeroOrOne, DefaultValueFactory = _ => Environment.GetEnvironmentVariable("GH_TOKEN") ?? throw new ArgumentException("GitHub token not provided.") }; - public static readonly Option Level = new("--log-level", "-l") + public static readonly CliOption Level = new("--log-level", "-l") { Description = "The log level to run the tool in.", Arity = ArgumentArity.ZeroOrOne, @@ -69,7 +69,7 @@ public static async Task Main(string[] args) var sdkDiffTestsCommand = CreateCommand("sdk", "Creates a PR that updates baselines and exclusion files published by the sdk diff tests."); var licenseScanTestsCommand = CreateCommand("license", "Creates a PR that updates baselines and exclusion files published by the license scan tests."); - var rootCommand = new RootCommand("Tool for creating PRs that update baselines and exclusion files.") + var rootCommand = new CliRootCommand("Tool for creating PRs that update baselines and exclusion files.") { Level, sdkDiffTestsCommand, @@ -84,9 +84,9 @@ public static async Task Main(string[] args) return ExitCode; } - private static Command CreateCommand(string name, string description) + private static CliCommand CreateCommand(string name, string description) { - return new Command(name, description) + return new CliCommand(name, description) { Repo, OriginalFilesDirectory, @@ -98,7 +98,7 @@ private static Command CreateCommand(string name, string description) }; } - private static void SetCommandAction(Command command, Pipelines pipeline) + private static void SetCommandAction(CliCommand command, Pipelines pipeline) { command.SetAction(async (result, CancellationToken) => { From 0c3615c144473186186500dd031e967bad55edb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 16 Apr 2025 11:55:29 +0200 Subject: [PATCH 13/14] Add runtime patch --- ...ice-for-windows-in-DotNetBuild.props.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch diff --git a/src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch b/src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch new file mode 100644 index 000000000000..d2f3d1c33d81 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-Don-t-pass-os-twice-for-windows-in-DotNetBuild.props.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= +Date: Wed, 16 Apr 2025 11:51:04 +0200 +Subject: [PATCH] Don't pass -os twice for windows in DotNetBuild.props + +Backport: https://github.com/dotnet/runtime/pull/114732 + +--- + eng/DotNetBuild.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props +index 135b972c32b..1e3137ec241 100644 +--- a/eng/DotNetBuild.props ++++ b/eng/DotNetBuild.props +@@ -32,7 +32,7 @@ + + $(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArchitecture) + $(InnerBuildArgs) $(FlagParameterPrefix)os windows +- $(InnerBuildArgs) $(FlagParameterPrefix)os $(_portableOS) ++ $(InnerBuildArgs) $(FlagParameterPrefix)os $(_portableOS) + + $(InnerBuildArgs) $(FlagParameterPrefix)cross + $(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration) From fd9cddebea7e75770e2fc627294899db42023b0e Mon Sep 17 00:00:00 2001 From: Adam Sitnik Date: Wed, 16 Apr 2025 13:39:01 +0200 Subject: [PATCH 14/14] Revert "Update dependencies from https://github.com/dotnet/arcade build 20250414.8" This reverts commit c2a6e14b29d302b66b4e7b018c33627c92090880. --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ global.json | 4 ++-- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79afecd84094..17c364a2981a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -631,42 +631,42 @@ - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 87401be5731aa537bbf4cb71d7800d1c74d5e429 diff --git a/eng/Versions.props b/eng/Versions.props index 04b759a58a39..9c984adaa70e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -282,12 +282,12 @@ - 10.0.0-beta.25214.8 - 10.0.0-beta.25214.8 - 10.0.0-beta.25214.8 - 10.0.0-beta.25214.8 - 10.0.0-beta.25214.8 - 10.0.0-beta.25214.8 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 diff --git a/global.json b/global.json index c35c9a7d860a..d586ecd1ad07 100644 --- a/global.json +++ b/global.json @@ -14,8 +14,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }