diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2e4dbd915b0..1cb6fc9cf532 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -604,34 +604,34 @@ - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 - + https://github.com/dotnet/arcade - bbea86c614fcf4380c58c80eacd279a0b8305a79 + 0b971a5e11be58af22ca83fbc111a1207bb62920 diff --git a/eng/Versions.props b/eng/Versions.props index 7d1fe8d4bd85..a186debcacd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 10.0.0-beta.25080.7 - 10.0.0-beta.25080.7 - 10.0.0-beta.25080.7 - 10.0.0-beta.25080.7 + 10.0.0-beta.25103.6 + 10.0.0-beta.25103.6 + 10.0.0-beta.25103.6 + 10.0.0-beta.25103.6 diff --git a/global.json b/global.json index 069338eb4678..716aac7bc79a 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25080.7", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25103.6", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25103.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } diff --git a/src/SourceBuild/patches/arcade/0001-Revert-update-System.CommandLine-15474.patch b/src/SourceBuild/patches/arcade/0001-Revert-update-System.CommandLine-15474.patch new file mode 100644 index 000000000000..5cfbb3afd1ed --- /dev/null +++ b/src/SourceBuild/patches/arcade/0001-Revert-update-System.CommandLine-15474.patch @@ -0,0 +1,188 @@ +From a863f87ecea0409679839a7e28fe225df4c47948 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Tue, 4 Feb 2025 09:49:00 +0100 +Subject: [PATCH] Revert "update System.CommandLine (#15474)" + +This temporarily reverts https://github.com/dotnet/arcade/pull/15474 +to unblock dependency flow. + +--- + eng/Version.Details.xml | 8 ++--- + eng/Versions.props | 2 +- + src/Microsoft.DotNet.MacOsPkg/Program.cs | 30 +++++++++---------- + .../Program.cs | 12 ++++---- + 4 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml +index 89de117bd..3a977442b 100644 +--- a/eng/Version.Details.xml ++++ b/eng/Version.Details.xml +@@ -138,9 +138,9 @@ + + + +- ++ + https://github.com/dotnet/command-line-api +- 060374e56c1b2e741b6525ca8417006efb54fbd7 ++ 5ea97af07263ea3ef68a18557c8aa3f7e3200bda + + + +@@ -178,9 +178,9 @@ + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 990ebf52fc408ca45929fd176d2740675a67fab8 + +- ++ + https://github.com/dotnet/command-line-api +- 060374e56c1b2e741b6525ca8417006efb54fbd7 ++ 5ea97af07263ea3ef68a18557c8aa3f7e3200bda + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index c31b6a103..24590737d 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -15,7 +15,7 @@ + 1.1.0-beta.25081.4 + 1.1.0-beta.25081.4 + +- 2.0.0-beta4.25072.1 ++ 2.0.0-beta4.24126.1 + + 1.1.1 + 4.5.5 +diff --git a/src/Microsoft.DotNet.MacOsPkg/Program.cs b/src/Microsoft.DotNet.MacOsPkg/Program.cs +index 3357d4967..90f13e41a 100644 +--- a/src/Microsoft.DotNet.MacOsPkg/Program.cs ++++ b/src/Microsoft.DotNet.MacOsPkg/Program.cs +@@ -26,20 +26,20 @@ public static int Main(string[] args) + return 1; + } + +- RootCommand rootCommand = Setup(); +- return new CommandLineConfiguration(rootCommand).Invoke(args); ++ CliRootCommand rootCommand = Setup(); ++ return new CliConfiguration(rootCommand).Invoke(args); + } + + /// + /// Set up the command line interface and associated actions. + /// + /// Root cli command +- private static RootCommand Setup() ++ private static CliRootCommand Setup() + { +- var rootCommand = new RootCommand(); +- var unpackSrcArgument = new Argument("src") { Description = "Source path of the .pkg or .app file" }; +- var unpackDestinationArgument = new Argument("dst") { Description = "Destination path to unpack the file" }; +- var unpackCommand = new Command("unpack", "Unpack a .pkg or .app file") ++ var rootCommand = new CliRootCommand(); ++ var unpackSrcArgument = new CliArgument("src") { Description = "Source path of the .pkg or .app file" }; ++ var unpackDestinationArgument = new CliArgument("dst") { Description = "Destination path to unpack the file" }; ++ var unpackCommand = new CliCommand("unpack", "Unpack a .pkg or .app file") + { + Arguments = { unpackSrcArgument, unpackDestinationArgument } + }; +@@ -48,9 +48,9 @@ private static RootCommand Setup() + return UnpackCommand(result, unpackSrcArgument, unpackDestinationArgument); + }); + +- var packSrcArgument = new Argument("src") { Description = "Source path to pack." }; +- var packDstArgument = new Argument("dst") { Description = "Destination path of the .pkg or .app file." }; +- var packCommand = new Command("pack", "Pack a directory into a .pkg or .app file.") ++ var packSrcArgument = new CliArgument("src") { Description = "Source path to pack." }; ++ var packDstArgument = new CliArgument("dst") { Description = "Destination path of the .pkg or .app file." }; ++ var packCommand = new CliCommand("pack", "Pack a directory into a .pkg or .app file.") + { + Arguments = { packSrcArgument, packDstArgument } + }; +@@ -59,8 +59,8 @@ private static RootCommand Setup() + return PackCommand(result, packSrcArgument, packDstArgument); + }); + +- var pkgOrAppArgument = new Argument("src") { Description = "Input pkg or app to verify." }; +- var verifyCommand = new Command("verify", "Verify that a pkg or app is signed.") ++ var pkgOrAppArgument = new CliArgument("src") { Description = "Input pkg or app to verify." }; ++ var verifyCommand = new CliCommand("verify", "Verify that a pkg or app is signed.") + { + Arguments = { pkgOrAppArgument } + }; +@@ -75,7 +75,7 @@ private static RootCommand Setup() + return rootCommand; + } + +- private static int VerifyCommand(ParseResult result, Argument pkgOrAppArgument) ++ private static int VerifyCommand(ParseResult result, CliArgument pkgOrAppArgument) + { + var srcPath = result.GetValue(pkgOrAppArgument) ?? throw new Exception("src must be non-empty"); + try +@@ -103,7 +103,7 @@ private static int VerifyCommand(ParseResult result, Argument pkgOrAppAr + return 0; + } + +- private static int PackCommand(ParseResult result, Argument packSrcArgument, Argument packDstArgument) ++ private static int PackCommand(ParseResult result, CliArgument packSrcArgument, CliArgument packDstArgument) + { + var srcPath = result.GetValue(packSrcArgument) ?? throw new Exception("src must be non-empty"); + var dstPath = result.GetValue(packDstArgument) ?? throw new Exception("dst must be non-empty"); +@@ -141,7 +141,7 @@ private static int PackCommand(ParseResult result, Argument packSrcArgum + return 0; + } + +- private static int UnpackCommand(ParseResult result, Argument unpackSrcArgument, Argument unpackDestinationArgument) ++ private static int UnpackCommand(ParseResult result, CliArgument unpackSrcArgument, CliArgument unpackDestinationArgument) + { + var srcPath = result.GetValue(unpackSrcArgument) ?? throw new Exception("src must be non-empty"); + var dstPath = result.GetValue(unpackDestinationArgument) ?? throw new Exception("dst must be non-empty"); +diff --git a/src/VersionTools/Microsoft.DotNet.VersionTools.Cli/Program.cs b/src/VersionTools/Microsoft.DotNet.VersionTools.Cli/Program.cs +index a3051aa11..9cd7897c0 100644 +--- a/src/VersionTools/Microsoft.DotNet.VersionTools.Cli/Program.cs ++++ b/src/VersionTools/Microsoft.DotNet.VersionTools.Cli/Program.cs +@@ -13,31 +13,31 @@ static int Main(string[] args) + { + //// Global options + +- RootCommand rootCommand = new("Microsoft.DotNet.VersionTools.Cli v" + Environment.Version.ToString(2)) ++ CliRootCommand rootCommand = new("Microsoft.DotNet.VersionTools.Cli v" + Environment.Version.ToString(2)) + { + TreatUnmatchedTokensAsErrors = true + }; + + // Package command +- Option assetsDirectoryOption = new("--assets-path", "-d") ++ CliOption assetsDirectoryOption = new("--assets-path", "-d") + { + Description = "Path to the directory where the assets are located", + Required = true + }; + +- Option searchPatternOption = new("--search-pattern", "-s") ++ CliOption searchPatternOption = new("--search-pattern", "-s") + { + Description = "The search string to match against the names of subdirectories in --assets-path. See Directory.GetFiles for details.", + DefaultValueFactory = _ => "*.nupkg" + }; + +- Option recursiveOption = new("--recursive", "-r") ++ CliOption recursiveOption = new("--recursive", "-r") + { + Description = "Search for assets recursively.", + DefaultValueFactory = _ => true + }; + +- Command trimAssetVersionCommand = new("trim-assets-version", "Trim versions from provided assets. Currently, only NuGet packages are supported."); ++ CliCommand trimAssetVersionCommand = new("trim-assets-version", "Trim versions from provided assets. Currently, only NuGet packages are supported."); + trimAssetVersionCommand.Options.Add(assetsDirectoryOption); + trimAssetVersionCommand.Options.Add(searchPatternOption); + trimAssetVersionCommand.Options.Add(recursiveOption); +@@ -59,6 +59,6 @@ static int Main(string[] args) + }); + + rootCommand.Subcommands.Add(trimAssetVersionCommand); +- return new CommandLineConfiguration(rootCommand).Invoke(args); ++ return new CliConfiguration(rootCommand).Invoke(args); + } + }