98dd811aa8
This reverts commit f9b939fe89.
That fix caused a regression that prevented a single `/property` option to
define multiple properties using the `/property:First=foo;Second=bar` syntax.
Users that want literal semicolons in the property values should use escaped
quotes around the property value, e.g. `/property:Prop='"foo;bar;baz"'`.
Fixes #9369.
42 lines
2.4 KiB
C#
42 lines
2.4 KiB
C#
// Copyright (c) .NET Foundation and contributors. All rights reserved.
|
|
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
|
|
|
using Microsoft.DotNet.Tools.Restore;
|
|
using FluentAssertions;
|
|
using Xunit;
|
|
using System;
|
|
|
|
namespace Microsoft.DotNet.Cli.MSBuild.Tests
|
|
{
|
|
public class GivenDotnetRestoreInvocation
|
|
{
|
|
private const string ExpectedPrefix =
|
|
"exec <msbuildpath> -maxcpucount -verbosity:m -nologo -target:Restore";
|
|
|
|
[Theory]
|
|
[InlineData(new string[] { }, "")]
|
|
[InlineData(new string[] { "-s", "<source>" }, "-property:RestoreSources=<source>")]
|
|
[InlineData(new string[] { "--source", "<source>" }, "-property:RestoreSources=<source>")]
|
|
[InlineData(new string[] { "-s", "<source0>", "-s", "<source1>" }, "-property:RestoreSources=<source0>%3B<source1>")]
|
|
[InlineData(new string[] { "-r", "<runtime>" }, "-property:RuntimeIdentifiers=<runtime>")]
|
|
[InlineData(new string[] { "--runtime", "<runtime>" }, "-property:RuntimeIdentifiers=<runtime>")]
|
|
[InlineData(new string[] { "-r", "<runtime0>", "-r", "<runtime1>" }, "-property:RuntimeIdentifiers=<runtime0>%3B<runtime1>")]
|
|
[InlineData(new string[] { "--packages", "<packages>" }, "-property:RestorePackagesPath=<packages>")]
|
|
[InlineData(new string[] { "--disable-parallel" }, "-property:RestoreDisableParallel=true")]
|
|
[InlineData(new string[] { "--configfile", "<config>" }, "-property:RestoreConfigFile=<config>")]
|
|
[InlineData(new string[] { "--no-cache" }, "-property:RestoreNoCache=true")]
|
|
[InlineData(new string[] { "--ignore-failed-sources" }, "-property:RestoreIgnoreFailedSources=true")]
|
|
[InlineData(new string[] { "--no-dependencies" }, "-property:RestoreRecursive=false")]
|
|
[InlineData(new string[] { "-v", "minimal" }, @"-verbosity:minimal")]
|
|
[InlineData(new string[] { "--verbosity", "minimal" }, @"-verbosity:minimal")]
|
|
public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
|
|
{
|
|
expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}");
|
|
|
|
var msbuildPath = "<msbuildpath>";
|
|
RestoreCommand.FromArgs(args, msbuildPath)
|
|
.GetProcessStartInfo().Arguments
|
|
.Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
|
|
}
|
|
}
|
|
}
|