From b3701aa67fb9ea574e8762f165ff6bbd22e35638 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Feb 2026 17:26:31 +0000 Subject: [PATCH 1/4] Initial commit for subscription 4514ea6b-c141-4e8c-8eb0-f7dc91caa781 From 756b99e57495ebcf93fd42a5c277b7d17d3da645 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 11 Feb 2026 11:44:28 -0800 Subject: [PATCH 2/4] Resolved merge --- .merge_file_JsDg5L | 51 ++ NuGet.config | 2 - eng/Version.Details.props | 267 +++++---- eng/Version.Details.xml | 534 +++++++++--------- global.json | 6 +- .../CollectionExtensions.cs | 15 + .../CommandDefinitions/CommandDefinition.cs | 492 ++++++++++++++++ .../CommandDefinitionExtensions.cs | 119 ++++ .../Commands/Build/BuildCommandDefinition.cs | 99 ++++ .../BuildServerCommandDefinition.cs | 22 + .../BuildServerShutdownCommandDefinition.cs | 35 ++ .../Commands/Clean/CleanCommandDefinition.cs | 75 +++ ...nFileBasedAppArtifactsCommandDefinition.cs | 43 ++ .../Commands/Dnx/DnxCommandDefinition.cs | 15 + .../Format/FormatCommandDefinition.cs | 21 + .../Commands/Fsi/FsiCommandDefinition.cs | 21 + .../Commands/Help/HelpCommandDefinition.cs | 26 + .../Hidden/Add/AddCommandDefinition.cs | 32 ++ .../Package/AddPackageCommandDefinition.cs | 17 + .../AddReferenceCommandDefinition.cs | 29 + .../Complete/CompleteCommandDefinition.cs | 25 + ...alReportInstallSuccessCommandDefinition.cs | 18 + .../Hidden/List/ListCommandDefinition.cs | 38 ++ .../Package/ListPackageCommandDefinition.cs | 17 + .../ListReferenceCommandDefinition.cs | 33 ++ .../Hidden/Parse/ParseCommandDefinition.cs | 15 + .../Package/RemovePackageCommandDefinition.cs | 11 + .../RemoveReferenceCommandDefinition.cs | 17 + .../Hidden/Remove/RemoveCommandDefinition.cs | 33 ++ .../MSBuild/MSBuildCommandDefinition.cs | 26 + .../Commands/NuGet/NuGetCommandDefinition.cs | 249 ++++++++ .../dotnet/Commands/NuGetRestoreOptions.cs | 52 ++ src/Cli/dotnet/Commands/Pack/PackCommand.cs | 4 +- .../Commands/Pack/PackCommandDefinition.cs | 127 +++++ .../Add/PackageAddCommandDefinition.cs | 95 ++++ .../List/PackageListCommandDefinition.cs | 146 +++++ .../Package/PackageCommandDefinition.cs | 52 ++ .../Remove/PackageRemoveCommandDefinition.cs | 39 ++ .../Search/PackageSearchCommandDefinition.cs | 85 +++ .../ProjectConvertCommandDefinition.cs | 42 ++ .../Project/ProjectCommandDefinition.cs | 18 + .../Publish/PublishCommandDefinition.cs | 101 ++++ .../Add/ReferenceAddCommandDefinition.cs | 55 ++ .../List/ReferenceListCommandDefinition.cs | 18 + .../Reference/ReferenceCommandDefinition.cs | 39 ++ .../ReferenceRemoveCommandDefinition.cs | 43 ++ .../Restore/ImplicitRestoreOptions.cs | 119 ++++ .../Restore/RestoreCommandDefinition.cs | 140 +++++ .../Run/Api/RunApiCommandDefinition.cs | 18 + .../Commands/Run/RunCommandDefinition.cs | 115 ++++ .../Commands/Run/TargetFrameworkSelector.cs | 130 +++++ .../Sdk/Check/SdkCheckCommandDefinition.cs | 11 + .../Commands/Sdk/SdkCommandDefinition.cs | 22 + .../Add/SolutionAddCommandDefinition.cs | 47 ++ .../List/SolutionListCommandDefinition.cs | 23 + .../SolutionMigrateCommandDefinition.cs | 16 + .../Remove/SolutionRemoveCommandDefinition.cs | 24 + .../Solution/SolutionCommandDefinition.cs | 42 ++ .../dotnet/Commands/Test/MTP/OutputOptions.cs | 10 + ...mandDefinition.MicrosoftTestingPlatform.cs | 164 ++++++ .../Test/TestCommandDefinition.VSTest.cs | 195 +++++++ .../Commands/Test/VSTest/VSTestOptions.cs | 69 +++ .../Tool/Common/Store/StoreCommandParser.cs | 22 + .../Tool/Common/ToolLocationOptions.cs | 66 +++ .../ToolUpdateInstallCommandDefinition.cs | 55 ++ .../Execute/ToolExecuteCommandDefinition.cs | 54 ++ .../Install/ToolInstallCommandDefinition.cs | 36 ++ .../Tool/List/ToolListCommandDefinition.cs | 36 ++ .../Restore/ToolRestoreCommandDefinition.cs | 30 + .../Tool/Run/ToolRunCommandDefinition.cs | 36 ++ .../Search/ToolSearchCommandDefinition.cs | 46 ++ .../Commands/Tool/Store/StoreCommand.cs | 8 + .../Commands/Tool/ToolCommandDefinition.cs | 44 ++ .../ToolUninstallCommandDefinition.cs | 31 + .../Update/ToolUpdateCommandDefinition.cs | 19 + .../VSTest/VSTestCommandDefinition.cs | 35 ++ .../Clean/WorkloadCleanCommandDefinition.cs | 22 + .../Config/WorkloadConfigCommandDefinition.cs | 30 + .../WorkloadElevateCommandDefinition.cs | 13 + .../WorkloadHistoryCommandDefinition.cs | 9 + .../WorkloadInstallCommandDefinition.cs | 19 + .../InstallingWorkloadCommandDefinition.cs | 81 +++ .../List/WorkloadListCommandDefinition.cs | 40 ++ .../Repair/WorkloadRepairCommandDefinition.cs | 32 ++ .../WorkloadRestoreCommandDefinition.cs | 24 + .../Search/WorkloadSearchCommandDefinition.cs | 29 + ...WorkloadSearchVersionsCommandDefinition.cs | 65 +++ .../WorkloadUninstallCommandDefinition.cs | 22 + .../Update/WorkloadUpdateCommandDefinition.cs | 48 ++ .../Workload/WorkloadCommandDefinition.cs | 77 +++ .../Workload/WorkloadCommandDefinitionBase.cs | 62 ++ src/Cli/dotnet/TargetPlatformOptions.cs | 136 +++++ 92 files changed, 5281 insertions(+), 410 deletions(-) create mode 100644 .merge_file_JsDg5L create mode 100644 src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CollectionExtensions.cs create mode 100644 src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CommandDefinition.cs create mode 100644 src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CommandDefinitionExtensions.cs create mode 100644 src/Cli/dotnet/Commands/Build/BuildCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/BuildServer/BuildServerCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/BuildServer/Shutdown/BuildServerShutdownCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Clean/CleanCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Clean/FileBasedAppArtifacts/CleanFileBasedAppArtifactsCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Dnx/DnxCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Format/FormatCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Fsi/FsiCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Help/HelpCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Add/AddCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Add/Reference/AddReferenceCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/List/ListCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/List/Package/ListPackageCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/List/Reference/ListReferenceCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Parse/ParseCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Remove/Package/RemovePackageCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Remove/Reference/RemoveReferenceCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Hidden/Remove/RemoveCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/MSBuild/MSBuildCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/NuGet/NuGetCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/NuGetRestoreOptions.cs create mode 100644 src/Cli/dotnet/Commands/Pack/PackCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Package/Add/PackageAddCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Package/List/PackageListCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Package/PackageCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Package/Remove/PackageRemoveCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Package/Search/PackageSearchCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Project/Convert/ProjectConvertCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Project/ProjectCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Publish/PublishCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Reference/Add/ReferenceAddCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Reference/List/ReferenceListCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Reference/ReferenceCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Reference/Remove/ReferenceRemoveCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Restore/ImplicitRestoreOptions.cs create mode 100644 src/Cli/dotnet/Commands/Restore/RestoreCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Run/Api/RunApiCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Run/RunCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Run/TargetFrameworkSelector.cs create mode 100644 src/Cli/dotnet/Commands/Sdk/Check/SdkCheckCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Sdk/SdkCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Solution/List/SolutionListCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Solution/SolutionCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Test/MTP/OutputOptions.cs create mode 100644 src/Cli/dotnet/Commands/Test/TestCommandDefinition.MicrosoftTestingPlatform.cs create mode 100644 src/Cli/dotnet/Commands/Test/TestCommandDefinition.VSTest.cs create mode 100644 src/Cli/dotnet/Commands/Test/VSTest/VSTestOptions.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Common/Store/StoreCommandParser.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Common/ToolLocationOptions.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Common/ToolUpdateInstallCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Install/ToolInstallCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/List/ToolListCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Restore/ToolRestoreCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Run/ToolRunCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Search/ToolSearchCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/ToolCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Tool/Update/ToolUpdateCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/VSTest/VSTestCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Clean/WorkloadCleanCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Config/WorkloadConfigCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Elevate/WorkloadElevateCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/InstallingWorkloadCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/List/WorkloadListCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Search/WorkloadSearchVersionsCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Uninstall/WorkloadUninstallCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/Update/WorkloadUpdateCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/WorkloadCommandDefinition.cs create mode 100644 src/Cli/dotnet/Commands/Workload/WorkloadCommandDefinitionBase.cs create mode 100644 src/Cli/dotnet/TargetPlatformOptions.cs diff --git a/.merge_file_JsDg5L b/.merge_file_JsDg5L new file mode 100644 index 000000000000..8ced53fdb48f --- /dev/null +++ b/.merge_file_JsDg5L @@ -0,0 +1,51 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#nullable disable + +using System.CommandLine; +using Microsoft.DotNet.Cli.Commands.MSBuild; +using Microsoft.DotNet.Cli.CommandLine; +using Microsoft.DotNet.Cli.Extensions; +using Microsoft.DotNet.Cli.Utils; + +namespace Microsoft.DotNet.Cli.Commands.Store; + +public class StoreCommand : MSBuildForwardingApp +{ + private StoreCommand(IEnumerable msbuildArgs, string msbuildPath = null) + : base(msbuildArgs, msbuildPath) + { + } + + public static StoreCommand FromArgs(string[] args, string msbuildPath = null) + { + var result = Parser.Parse(["dotnet", "store", ..args]); + return FromParseResult(result, msbuildPath); + } + + public static StoreCommand FromParseResult(ParseResult result, string msbuildPath = null) + { + List msbuildArgs = ["--target:ComposeStore"]; + + result.ShowHelpOrErrorIfAppropriate(); + + if (!result.HasOption(StoreCommandParser.ManifestOption)) + { + throw new GracefulException(CliCommandStrings.SpecifyManifests); + } + + msbuildArgs.AddRange(result.OptionValuesToBeForwarded(StoreCommandParser.GetCommand())); + + msbuildArgs.AddRange(result.GetValue(StoreCommandParser.Argument) ?? []); + + return new StoreCommand(msbuildArgs, msbuildPath); + } + + public static int Run(ParseResult parseResult) + { + parseResult.HandleDebugSwitch(); + + return FromParseResult(parseResult).Execute(); + } +} diff --git a/NuGet.config b/NuGet.config index ff0d29fb990d..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -40,7 +39,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d6708ed330ab..b0f473e4e5b5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,142 +6,141 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26076.108 - 18.3.0-preview-26076-108 - 18.3.0-preview-26076-108 - 7.3.0-preview.1.7708 - 10.0.300-alpha.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 10.0.0-preview.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 15.2.300-servicing.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 + 10.0.0-preview.26103.116 + 18.3.0-preview-26103-116 + 18.3.0-preview-26103-116 + 7.4.0-rc.10416 + 10.0.300-alpha.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 10.0.0-preview.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 15.2.300-servicing.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 10.0.0-preview.7.25377.103 - 10.0.0-preview.26076.108 - 18.3.0-release-26076-108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 18.3.0-release-26076-108 - 18.3.0-release-26076-108 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 + 10.0.0-preview.26103.116 + 18.3.0-release-26103-116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 18.3.0-release-26103-116 + 18.3.0-release-26103-116 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 2.0.0-preview.1.25569.105 - 2.2.1-beta.25569.105 - 10.0.1 - 10.0.1 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 10.0.1 - 10.0.1 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 3.2.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 2.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 @@ -243,8 +242,8 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cde5e4dcbb9c..c85ec7c9ebaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b @@ -445,129 +445,125 @@ fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa - - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -577,9 +573,9 @@ https://github.com/microsoft/testfx 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b diff --git a/global.json b/global.json index d197f033377b..ecba0c109058 100644 --- a/global.json +++ b/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.101", + "dotnet": "10.0.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.116", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26103.116", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CollectionExtensions.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CollectionExtensions.cs new file mode 100644 index 000000000000..e6fdd134c22d --- /dev/null +++ b/src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CollectionExtensions.cs @@ -0,0 +1,15 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.TemplateEngine.Cli; + +internal static class CollectionExtensions +{ + public static void AddRange(this ICollection collection, IEnumerable items) + { + foreach (T item in items) + { + collection.Add(item); + } + } +} diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CommandDefinition.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CommandDefinition.cs new file mode 100644 index 000000000000..2c63c84ac7bb --- /dev/null +++ b/src/Cli/Microsoft.TemplateEngine.Cli/CommandDefinitions/CommandDefinition.cs @@ -0,0 +1,492 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#pragma warning disable CA1810 // Initialize reference type static fields inline + +using System.CommandLine; +using Microsoft.TemplateEngine.Cli.Commands; + +namespace Microsoft.TemplateEngine.Cli; + +internal class CommandDefinition(string name, string description) : Command(name, description) +{ + public static class New + { + public static readonly Option DebugCustomSettingsLocationOption = new("--debug:custom-hive") + { + Description = SymbolStrings.Option_Debug_CustomSettings, + Hidden = true, + Recursive = true + }; + + public static readonly Option DebugVirtualizeSettingsOption = new("--debug:ephemeral-hive", "--debug:virtual-hive") + { + Description = SymbolStrings.Option_Debug_VirtualSettings, + Hidden = true, + Recursive = true + }; + + public static readonly Option DebugAttachOption = new("--debug:attach") + { + Description = SymbolStrings.Option_Debug_Attach, + Hidden = true, + Recursive = true + }; + + public static readonly Option DebugReinitOption = new("--debug:reinit") + { + Description = SymbolStrings.Option_Debug_Reinit, + Hidden = true, + Recursive = true + }; + + public static readonly Option DebugRebuildCacheOption = new("--debug:rebuild-cache", "--debug:rebuildcache") + { + Description = SymbolStrings.Option_Debug_RebuildCache, + Hidden = true, + Recursive = true + }; + + public static readonly Option DebugShowConfigOption = new("--debug:show-config", "--debug:showconfig") + { + Description = SymbolStrings.Option_Debug_ShowConfig, + Hidden = true, + Recursive = true + }; + + public static readonly Argument ShortNameArgument = new("template-short-name") + { + Description = SymbolStrings.Command_Instantiate_Argument_ShortName, + Arity = new ArgumentArity(0, 1), + Hidden = true + }; + + public static readonly Argument RemainingArguments = new("template-args") + { + Description = SymbolStrings.Command_Instantiate_Argument_TemplateOptions, + Arity = new ArgumentArity(0, 999), + Hidden = true + }; + + public static readonly Option InteractiveOption = SharedOptionsFactory.CreateInteractiveOption().AsHidden(); + + public static readonly Option AddSourceOption = SharedOptionsFactory.CreateAddSourceOption().AsHidden().DisableAllowMultipleArgumentsPerToken(); + + public static readonly Option ColumnsAllOption = SharedOptionsFactory.CreateColumnsAllOption().AsHidden(); + + public static readonly Option ColumnsOption = SharedOptionsFactory.CreateColumnsOption().AsHidden().DisableAllowMultipleArgumentsPerToken(); + + public static IReadOnlyList