From 4bb4f6b56f63bfb3912a1e33296ec421d8cd6386 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 07:42:38 -0700 Subject: [PATCH 01/13] [release/8.0.4xx] Update dependencies from dotnet/roslyn (#41471) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 85fdef69c596..a340250eb0c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 32b81fa7a51d0fa630b534ead8ded8c7432f2c2b - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a - + https://github.com/dotnet/roslyn - bc5ea08f3b4b150bd08b8ec1fe3bcafa5b683102 + bcc2a181652894b74d241864c2ca3663de0e4d3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4846112513c3..89c0a1d2cd3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.11.0-3.24304.2 - 4.11.0-3.24304.2 - 4.11.0-3.24304.2 - 4.11.0-3.24304.2 - 4.11.0-3.24304.2 - 4.11.0-3.24304.2 - 4.11.0-3.24304.2 + 4.11.0-3.24306.10 + 4.11.0-3.24306.10 + 4.11.0-3.24306.10 + 4.11.0-3.24306.10 + 4.11.0-3.24306.10 + 4.11.0-3.24306.10 + 4.11.0-3.24306.10 $(MicrosoftNetCompilersToolsetPackageVersion) From 04141ef4d387b2aa70a8f7a29a991b63a5c40a5d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 07:43:42 -0700 Subject: [PATCH 02/13] [release/8.0.4xx] Update dependencies from dotnet/razor (#41473) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a340250eb0c5..56e836dc8706 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -281,18 +281,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/razor - e21a78ebe85acdf69472c08441265a57520ee300 + ed752fd8e39987e59e6adf1b71bb80568207cb68 - + https://github.com/dotnet/razor - e21a78ebe85acdf69472c08441265a57520ee300 + ed752fd8e39987e59e6adf1b71bb80568207cb68 - + https://github.com/dotnet/razor - e21a78ebe85acdf69472c08441265a57520ee300 + ed752fd8e39987e59e6adf1b71bb80568207cb68 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 89c0a1d2cd3e..e6ea9c1260a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ - 9.0.0-preview.24305.3 - 9.0.0-preview.24305.3 - 9.0.0-preview.24305.3 + 9.0.0-preview.24306.1 + 9.0.0-preview.24306.1 + 9.0.0-preview.24306.1 From 66da9105e0a3a385169d197cdf3d6f6d99419c59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 07:44:02 -0700 Subject: [PATCH 03/13] [release/8.0.4xx] Update dependencies from nuget/nuget.client (#41474) Co-authored-by: dotnet-maestro[bot] --- 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 56e836dc8706..f8fbd983eebe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,73 +115,73 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 - + https://github.com/nuget/nuget.client - e793b1c948be3ae2413bf48d6ed2b4231d4166a6 + dc2e3b27170c779e3c01a7306504fb83cb4ef147 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e6ea9c1260a9..1faf8d626092 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,18 +83,18 @@ - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 - 6.11.0-preview.2.86 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 + 6.11.0-rc.87 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From c60bff3a32461ed6afdb881749309e25db1a0bde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 15:35:08 +0000 Subject: [PATCH 04/13] [release/8.0.4xx] Update dependencies from dotnet/msbuild (#41472) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8fbd983eebe..729c1cb7da8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,17 +51,17 @@ https://github.com/dotnet/emsdk 71359b18c2d83c01a68bf155244a65962a7e8c8e - + https://github.com/dotnet/msbuild - 9bea8026aad964cb36f3ec9d93bd95a941487690 + b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e - + https://github.com/dotnet/msbuild - 9bea8026aad964cb36f3ec9d93bd95a941487690 + b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e - + https://github.com/dotnet/msbuild - 9bea8026aad964cb36f3ec9d93bd95a941487690 + b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e diff --git a/eng/Versions.props b/eng/Versions.props index 1faf8d626092..218efa6a5b25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.11.0-preview-24304-04 + 17.11.0-preview-24306-01 $(MicrosoftBuildPackageVersion) - 4.11.0-3.24306.10 - 4.11.0-3.24306.10 - 4.11.0-3.24306.10 - 4.11.0-3.24306.10 - 4.11.0-3.24306.10 - 4.11.0-3.24306.10 - 4.11.0-3.24306.10 + 4.11.0-3.24307.2 + 4.11.0-3.24307.2 + 4.11.0-3.24307.2 + 4.11.0-3.24307.2 + 4.11.0-3.24307.2 + 4.11.0-3.24307.2 + 4.11.0-3.24307.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 8de407d281140f178677db499a6a27cdb9100ca1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:51:48 -0700 Subject: [PATCH 07/13] [release/8.0.4xx] Update dependencies from dotnet/msbuild (#41496) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9703fe46cfc5..287cd96ce880 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,17 +51,17 @@ https://github.com/dotnet/emsdk 71359b18c2d83c01a68bf155244a65962a7e8c8e - + https://github.com/dotnet/msbuild - b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e + 74e23a98d12885d3f43c2caeb852dc21096db824 - + https://github.com/dotnet/msbuild - b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e + 74e23a98d12885d3f43c2caeb852dc21096db824 - + https://github.com/dotnet/msbuild - b8e5cce93e2e664eaf470c0fed9f5b84b8591e1e + 74e23a98d12885d3f43c2caeb852dc21096db824 diff --git a/eng/Versions.props b/eng/Versions.props index c9a3c91b3918..352a52d1bb84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.11.0-preview-24306-01 + 17.11.0-preview-24310-01 $(MicrosoftBuildPackageVersion) - 9.0.0-preview.24306.1 - 9.0.0-preview.24306.1 - 9.0.0-preview.24306.1 + 9.0.0-preview.24311.2 + 9.0.0-preview.24311.2 + 9.0.0-preview.24311.2 From e394cdd656ecc20c439a37ad4bdac2fd225552c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 16:02:00 -0700 Subject: [PATCH 12/13] [release/8.0.4xx] Update dependencies from dotnet/roslyn (#41521) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f307882acc0..736434dcc94d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 32b81fa7a51d0fa630b534ead8ded8c7432f2c2b - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 - + https://github.com/dotnet/roslyn - f0a5241acc0a87edc69f342664c9ed1945fcf3dc + 32b7b6b1859185c3ad0e48d40746ad44c06faf86 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a61ea7876ed7..0bd5bc1dea35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,13 +155,13 @@ - 4.11.0-3.24307.2 - 4.11.0-3.24307.2 - 4.11.0-3.24307.2 - 4.11.0-3.24307.2 - 4.11.0-3.24307.2 - 4.11.0-3.24307.2 - 4.11.0-3.24307.2 + 4.11.0-3.24310.10 + 4.11.0-3.24310.10 + 4.11.0-3.24310.10 + 4.11.0-3.24310.10 + 4.11.0-3.24310.10 + 4.11.0-3.24310.10 + 4.11.0-3.24310.10 $(MicrosoftNetCompilersToolsetPackageVersion) From 5d4dadb4c436ed83dbe03e72f8d8d028879b0efa Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 11 Jun 2024 21:35:57 -0500 Subject: [PATCH 13/13] Add missing Restore option for ArtifactsPath and tests (#41532) --- .../dotnet-restore/RestoreCommandParser.cs | 8 ++- .../commands/dotnet-run/RunCommandParser.cs | 1 + .../BuildRelatedCommandParserTests.cs | 62 +++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 src/Tests/dotnet.Tests/ParserTests/BuildRelatedCommandParserTests.cs diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index bce6bc18d5c7..079851a9a157 100644 --- a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -25,11 +25,12 @@ internal static class RestoreCommandParser }.ForwardAsSingle(o => $"-property:RestoreSources={string.Join("%3B", o)}") .AllowSingleArgPerToken(); - private static IEnumerable FullRestoreOptions() => + private static IEnumerable FullRestoreOptions() => ImplicitRestoreOptions(true, true, true, true).Concat( - new CliOption[] { + [ CommonOptions.VerbosityOption, CommonOptions.InteractiveMsBuildForwardOption, + CommonOptions.ArtifactsPathOption, new ForwardedOption("--use-lock-file") { Description = LocalizableStrings.CmdUseLockFileOptionDescription, @@ -46,7 +47,8 @@ private static IEnumerable FullRestoreOptions() => new ForwardedOption("--force-evaluate") { Description = LocalizableStrings.CmdReevaluateOptionDescription - }.ForwardAs("-property:RestoreForceEvaluate=true") }); + }.ForwardAs("-property:RestoreForceEvaluate=true"), + ]); private static readonly CliCommand Command = ConstructCommand(); diff --git a/src/Cli/dotnet/commands/dotnet-run/RunCommandParser.cs b/src/Cli/dotnet/commands/dotnet-run/RunCommandParser.cs index d1ae11ed5aee..137599163bf9 100644 --- a/src/Cli/dotnet/commands/dotnet-run/RunCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-run/RunCommandParser.cs @@ -83,6 +83,7 @@ private static CliCommand ConstructCommand() command.Options.Add(CommonOptions.ArchitectureOption); command.Options.Add(CommonOptions.OperatingSystemOption); command.Options.Add(CommonOptions.DisableBuildServersOption); + command.Options.Add(CommonOptions.ArtifactsPathOption); command.Arguments.Add(ApplicationArguments); diff --git a/src/Tests/dotnet.Tests/ParserTests/BuildRelatedCommandParserTests.cs b/src/Tests/dotnet.Tests/ParserTests/BuildRelatedCommandParserTests.cs new file mode 100644 index 000000000000..b3a4042afaac --- /dev/null +++ b/src/Tests/dotnet.Tests/ParserTests/BuildRelatedCommandParserTests.cs @@ -0,0 +1,62 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.CommandLine; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.CommandLineValidation; +using Microsoft.DotNet.Tools.Common; +using Parser = Microsoft.DotNet.Cli.Parser; + +namespace Microsoft.DotNet.Tests.ParserTests +{ + public class BuildRelatedCommandParserTests + { + + /// + /// These commands all implicitly use MSBuild under the covers and generally should expose + /// the same set of property- and behavior-impacting options. + /// + private static string[] BuildRelatedCommands = [ + "build", + "clean", + "pack", + "publish", + "restore", + "run", + "test" + ]; + + private static string[] OptionsToVerify = [ + "--artifacts-path" + ]; + + public static TheoryData BuildRelatedCommandsAndOptions() + { + var data = new TheoryData(); + foreach (var cmd in BuildRelatedCommands) + { + foreach (var opt in OptionsToVerify) + { + data.Add(cmd, opt); + } + } + return data; + } + + [MemberData(nameof(BuildRelatedCommandsAndOptions))] + [Theory] + public void Build(string command, string option) + { + var cliCommand = Parser.Instance.RootCommand.Children.OfType().FirstOrDefault(c => c.Name == command); + if (cliCommand is null) + { + throw new ArgumentException($"Command {command} not found in the dotnet CLI"); + } + var cliOption = cliCommand.Children.OfType().FirstOrDefault(o => o.Name == option || o.Aliases.Contains(option)); + if (cliOption is null) + { + throw new ArgumentException($"Option {option} not found in the {command} command"); + } + } + } +}