98dd811aa8This 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.
57 lines
2.5 KiB
C#
57 lines
2.5 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 FluentAssertions;
|
|
using Microsoft.DotNet.Tools.Store;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using Xunit;
|
|
|
|
namespace Microsoft.DotNet.Cli.MSBuild.Tests
|
|
{
|
|
public class GivenDotnetStoreInvocation
|
|
{
|
|
const string ExpectedPrefix = "exec <msbuildpath> -maxcpucount -verbosity:m -target:ComposeStore <project>";
|
|
static readonly string[] ArgsPrefix = { "--manifest", "<project>" };
|
|
|
|
[Theory]
|
|
[InlineData("-m")]
|
|
[InlineData("--manifest")]
|
|
public void ItAddsProjectToMsbuildInvocation(string optionName)
|
|
{
|
|
var msbuildPath = "<msbuildpath>";
|
|
string[] args = new string[] { optionName, "<project>" };
|
|
StoreCommand.FromArgs(args, msbuildPath)
|
|
.GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}");
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(new string[] { "-f", "<tfm>" }, @"-property:TargetFramework=<tfm>")]
|
|
[InlineData(new string[] { "--framework", "<tfm>" }, @"-property:TargetFramework=<tfm>")]
|
|
[InlineData(new string[] { "-r", "<rid>" }, @"-property:RuntimeIdentifier=<rid>")]
|
|
[InlineData(new string[] { "--runtime", "<rid>" }, @"-property:RuntimeIdentifier=<rid>")]
|
|
[InlineData(new string[] { "--manifest", "one.xml", "--manifest", "two.xml", "--manifest", "three.xml" }, @"-property:AdditionalProjects=one.xml%3Btwo.xml%3Bthree.xml")]
|
|
public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
|
|
{
|
|
args = ArgsPrefix.Concat(args).ToArray();
|
|
expectedAdditionalArgs = (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}");
|
|
|
|
var msbuildPath = "<msbuildpath>";
|
|
StoreCommand.FromArgs(args, msbuildPath)
|
|
.GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData("-o")]
|
|
[InlineData("--output")]
|
|
public void ItAddsOutputPathToMsBuildInvocation(string optionName)
|
|
{
|
|
string path = "/some/path";
|
|
var args = ArgsPrefix.Concat(new string[] { optionName, path }).ToArray();
|
|
|
|
var msbuildPath = "<msbuildpath>";
|
|
StoreCommand.FromArgs(args, msbuildPath)
|
|
.GetProcessStartInfo().Arguments.Should().Be($"{ExpectedPrefix} -property:ComposeDir={Path.GetFullPath(path)}");
|
|
}
|
|
}
|
|
}
|