mirrors/dotnet-installer
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into merges/release/2.1.3xx-to-master

Browse source
This commit is contained in:
Livar 2018-04-04 10:16:22 -07:00 • committed by GitHub
commit a7bfaacf99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 3658 additions and 755 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs
View file

@ -354,12 +354,12 @@ namespace Microsoft.DotNet.Cli.Utils
var args = new List<string>();
args.Add(toolDepsJsonGeneratorProject);
args.Add($"/p:ProjectAssetsFile=\"{toolLockFile.Path}\"");
args.Add($"/p:ToolName={toolLibrary.Name}");
args.Add($"/p:ProjectDepsFilePath={tempDepsFile}");
args.Add($"-property:ProjectAssetsFile=\"{toolLockFile.Path}\"");
args.Add($"-property:ToolName={toolLibrary.Name}");
args.Add($"-property:ProjectDepsFilePath={tempDepsFile}");
var toolTargetFramework = toolLockFile.Targets.First().TargetFramework.GetShortFolderName();
args.Add($"/p:TargetFramework={toolTargetFramework}");
args.Add($"-property:TargetFramework={toolTargetFramework}");
// Look for the .props file in the Microsoft.NETCore.App package, until NuGet
@ -384,7 +384,7 @@ namespace Microsoft.DotNet.Cli.Utils
if (platformLibraryPropsFile != null)
{
args.Add($"/p:AdditionalImport={platformLibraryPropsFile}");
args.Add($"-property:AdditionalImport={platformLibraryPropsFile}");
}
}
}

12
src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
View file

@ -28,7 +28,7 @@ namespace Microsoft.DotNet.Cli.Utils
};
private readonly IEnumerable<string> _msbuildRequiredParameters =
new List<string> { "/m", "/v:m" };
new List<string> { "-maxcpucount", "-verbosity:m" };
public MSBuildForwardingAppWithoutLogging(IEnumerable<string> argsToForward, string msbuildPath = null)
{
@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Cli.Utils
private static string Escape(string arg) =>
// this is a workaround for https://github.com/Microsoft/msbuild/issues/1622
(arg.StartsWith("/p:RestoreSources=", StringComparison.OrdinalIgnoreCase)) ?
IsRestoreSources(arg) ?
arg.Replace(";", "%3B")
.Replace("://", ":%2F%2F") :
arg;
@ -81,6 +81,14 @@ namespace Microsoft.DotNet.Cli.Utils
{
return new Muxer().MuxerPath;
}
private static bool IsRestoreSources(string arg)
{
return arg.StartsWith("/p:RestoreSources=", StringComparison.OrdinalIgnoreCase) ||
arg.StartsWith("/property:RestoreSources=", StringComparison.OrdinalIgnoreCase) ||
arg.StartsWith("-p:RestoreSources=", StringComparison.OrdinalIgnoreCase) ||
arg.StartsWith("-property:RestoreSources=", StringComparison.OrdinalIgnoreCase);
}
}
}

10
src/dotnet/CommonOptions.cs
View file

@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli
"n", "normal",
"d", "detailed",
"diag", "diagnostic")
.ForwardAsSingle(o => $"/verbosity:{o.Arguments.Single()}"));
.ForwardAsSingle(o => $"-verbosity:{o.Arguments.Single()}"));
public static Option FrameworkOption() =>
Create.Option(
@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Cli
Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile())
.With(name: "FRAMEWORK")
.ForwardAsSingle(o => $"/p:TargetFramework={o.Arguments.Single()}"));
.ForwardAsSingle(o => $"-property:TargetFramework={o.Arguments.Single()}"));
public static Option RuntimeOption() =>
Create.Option(
@ -43,7 +43,7 @@ namespace Microsoft.DotNet.Cli
Accept.ExactlyOneArgument()
.WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
.With(name: "RUNTIME_IDENTIFIER")
.ForwardAsSingle(o => $"/p:RuntimeIdentifier={o.Arguments.Single()}"));
.ForwardAsSingle(o => $"-property:RuntimeIdentifier={o.Arguments.Single()}"));
public static Option ConfigurationOption() =>
Create.Option(
@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Cli
Accept.ExactlyOneArgument()
.With(name: "CONFIGURATION")
.WithSuggestionsFrom("DEBUG", "RELEASE")
.ForwardAsSingle(o => $"/p:Configuration={o.Arguments.Single()}"));
.ForwardAsSingle(o => $"-property:Configuration={o.Arguments.Single()}"));
public static Option VersionSuffixOption() =>
Create.Option(
@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Cli
CommonLocalizableStrings.CmdVersionSuffixDescription,
Accept.ExactlyOneArgument()
.With(name: "VERSION_SUFFIX")
.ForwardAsSingle(o => $"/p:VersionSuffix={o.Arguments.Single()}"));
.ForwardAsSingle(o => $"-property:VersionSuffix={o.Arguments.Single()}"));
public static ArgumentsRule DefaultToCurrentDirectory(this ArgumentsRule rule) =>
rule.With(defaultValue: () => PathUtility.EnsureTrailingSlash(Directory.GetCurrentDirectory()));

6
src/dotnet/commands/RestoringCommand.cs
View file

@ -36,10 +36,10 @@ namespace Microsoft.DotNet.Tools
if (HasArgumentToExcludeFromRestore(parsedArguments))
{
return Prepend("/nologo", msbuildArgs);
return Prepend("-nologo", msbuildArgs);
}
return Prepend("/restore", msbuildArgs);
return Prepend("-restore", msbuildArgs);
}
private static RestoreCommand GetSeparateRestoreCommand(
@ -70,7 +70,7 @@ namespace Microsoft.DotNet.Tools
=> arguments.Any(a => IsExcludedFromRestore(a));
private static bool IsExcludedFromRestore(string argument)
=> argument.StartsWith("/p:TargetFramework=", StringComparison.Ordinal);
=> argument.StartsWith("-property:TargetFramework=", StringComparison.Ordinal);
public override int Execute()
{

10
src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs
View file

@ -99,19 +99,19 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference
args.Add(projectFilePath);
// Pass the task as generate restore Dependency Graph file
args.Add("/t:GenerateRestoreGraphFile");
args.Add("-target:GenerateRestoreGraphFile");
// Pass Dependency Graph file output path
args.Add($"/p:RestoreGraphOutputPath=\"{dgFilePath}\"");
args.Add($"-property:RestoreGraphOutputPath=\"{dgFilePath}\"");
// Turn off recursive restore
args.Add($"/p:RestoreRecursive=false");
args.Add($"-property:RestoreRecursive=false");
// Turn off restore for Dotnet cli tool references so that we do not generate extra dg specs
args.Add($"/p:RestoreDotnetCliToolReferences=false");
args.Add($"-property:RestoreDotnetCliToolReferences=false");
// Output should not include MSBuild version header
args.Add("/nologo");
args.Add("-nologo");
var result = new MSBuildForwardingApp(args).Execute();

6
src/dotnet/commands/dotnet-build/BuildCommand.cs
View file

@ -37,15 +37,15 @@ namespace Microsoft.DotNet.Tools.Build
var appliedBuildOptions = result["dotnet"]["build"];
msbuildArgs.Add($"/clp:Summary");
msbuildArgs.Add($"-consoleloggerparameters:Summary");
if (appliedBuildOptions.HasOption("--no-incremental"))
{
msbuildArgs.Add("/t:Rebuild");
msbuildArgs.Add("-target:Rebuild");
}
else
{
msbuildArgs.Add("/t:Build");
msbuildArgs.Add("-target:Build");
}
msbuildArgs.AddRange(appliedBuildOptions.OptionValuesToBeForwarded());

4
src/dotnet/commands/dotnet-build/BuildCommandParser.cs
View file

@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.OutputOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.OutputOptionName)
.ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:OutputPath={o.Arguments.Single()}")),
CommonOptions.FrameworkOption(),
CommonOptions.RuntimeOption(),
CommonOptions.ConfigurationOption(),
@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Cli
"--no-dependencies",
LocalizableStrings.NoDependenciesOptionDescription,
Accept.NoArguments()
.ForwardAs("/p:BuildProjectReferences=false")),
.ForwardAs("-property:BuildProjectReferences=false")),
CommonOptions.NoRestoreOption(),
CommonOptions.VerbosityOption());
}

2
src/dotnet/commands/dotnet-clean/CleanCommandParser.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.CmdOutputDirDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:OutputPath={o.Arguments.Single()}")),
CommonOptions.FrameworkOption(),
CommonOptions.RuntimeOption(),
CommonOptions.ConfigurationOption(),

4
src/dotnet/commands/dotnet-clean/Program.cs
View file

@ -21,7 +21,7 @@ namespace Microsoft.DotNet.Tools.Clean
{
var msbuildArgs = new List<string>
{
"/v:normal"
"-verbosity:normal"
};
var parser = Parser.Instance;
@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Tools.Clean
msbuildArgs.AddRange(parsedClean.Arguments);
msbuildArgs.Add("/t:Clean");
msbuildArgs.Add("-target:Clean");
msbuildArgs.AddRange(parsedClean.OptionValuesToBeForwarded());

2
src/dotnet/commands/dotnet-help/LocalizableStrings.resx
View file

@ -232,7 +232,7 @@
<value>The path to an application .dll file to execute.</value>
</data>
<data name="SDKVersionCommandDefinition" xml:space="preserve">
<value>Display .NET Core SDK version.</value>
<value>Display .NET Core SDK version in use.</value>
</data>
<data name="SDKInfoCommandDefinition" xml:space="preserve">
<value>Display .NET Core information.</value>

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.cs.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Zobrazí verzi sady .NET Core SDK.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Zobrazí verzi sady .NET Core SDK.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.de.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">.NET Core SDK-Version anzeigen.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">.NET Core SDK-Version anzeigen.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.es.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Muestra la versión del SDK de .NET Core.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Muestra la versión del SDK de .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.fr.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Affichez la version du SDK .NET Core.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Affichez la version du SDK .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.it.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Visualizza la versione di .NET Core SDK.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Visualizza la versione di .NET Core SDK.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ja.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">.NET Core SDK バージョンを表示します。</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">.NET Core SDK バージョンを表示します。</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ko.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">.NET Core SDK 버전을 표시합니다.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">.NET Core SDK 버전을 표시합니다.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pl.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Wyświetl wersję zestawu SDK programu .NET Core.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Wyświetl wersję zestawu SDK programu .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.pt-BR.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Exibir versão do SDK do .NET Core.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Exibir versão do SDK do .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.ru.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">Отображение версии пакета SDK для .NET Core.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">Отображение версии пакета SDK для .NET Core.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.tr.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">.NET Core SDK sürümünü gösterir.</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">.NET Core SDK sürümünü gösterir.</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hans.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">显示 .NET Core SDK 版本。</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">显示 .NET Core SDK 版本。</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

4
src/dotnet/commands/dotnet-help/xlf/LocalizableStrings.zh-Hant.xlf
View file

@ -188,8 +188,8 @@
<note />
</trans-unit>
<trans-unit id="SDKVersionCommandDefinition">
<source>Display .NET Core SDK version.</source>
<target state="translated">顯示 .NET Core SDK 版本。</target>
<source>Display .NET Core SDK version in use.</source>
<target state="needs-review-translation">顯示 .NET Core SDK 版本。</target>
<note />
</trans-unit>
<trans-unit id="SDKInfoCommandDefinition">

2
src/dotnet/commands/dotnet-msbuild/MSBuildForwardingApp.cs
View file

@ -33,7 +33,7 @@ namespace Microsoft.DotNet.Tools.MSBuild
return argsToForward
.Concat(new[]
{
$"/distributedlogger:{loggerType.FullName},{loggerType.GetTypeInfo().Assembly.Location}*{forwardingLoggerType.FullName},{forwardingLoggerType.GetTypeInfo().Assembly.Location}"
$"-distributedlogger:{loggerType.FullName},{loggerType.GetTypeInfo().Assembly.Location}*{forwardingLoggerType.FullName},{forwardingLoggerType.GetTypeInfo().Assembly.Location}"
});
}
catch (Exception)

2
src/dotnet/commands/dotnet-pack/PackCommand.cs
View file

@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Tools.Pack
var msbuildArgs = new List<string>()
{
"/t:pack"
"-target:pack"
};
msbuildArgs.AddRange(parsedPack.OptionValuesToBeForwarded());

10
src/dotnet/commands/dotnet-pack/PackCommandParser.cs
View file

@ -22,25 +22,25 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.CmdOutputDirDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAsSingle(o => $"/p:PackageOutputPath={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:PackageOutputPath={o.Arguments.Single()}")),
Create.Option(
"--no-build",
LocalizableStrings.CmdNoBuildOptionDescription,
Accept.NoArguments().ForwardAs("/p:NoBuild=true")),
Accept.NoArguments().ForwardAs("-property:NoBuild=true")),
Create.Option(
"--include-symbols",
LocalizableStrings.CmdIncludeSymbolsDescription,
Accept.NoArguments().ForwardAs("/p:IncludeSymbols=true")),
Accept.NoArguments().ForwardAs("-property:IncludeSymbols=true")),
Create.Option(
"--include-source",
LocalizableStrings.CmdIncludeSourceDescription,
Accept.NoArguments().ForwardAs("/p:IncludeSource=true")),
Accept.NoArguments().ForwardAs("-property:IncludeSource=true")),
CommonOptions.ConfigurationOption(),
CommonOptions.VersionSuffixOption(),
Create.Option(
"-s|--serviceable",
LocalizableStrings.CmdServiceableDescription,
Accept.NoArguments().ForwardAs("/p:Serviceable=true")),
Accept.NoArguments().ForwardAs("-property:Serviceable=true")),
CommonOptions.NoRestoreOption(),
CommonOptions.VerbosityOption());
}

2
src/dotnet/commands/dotnet-publish/Program.cs
View file

@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Tools.Publish
result.ShowHelpOrErrorIfAppropriate();
msbuildArgs.Add("/t:Publish");
msbuildArgs.Add("-target:Publish");
var appliedPublishOption = result["dotnet"]["publish"];

6
src/dotnet/commands/dotnet-publish/PublishCommandParser.cs
View file

@ -22,7 +22,7 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.OutputOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.OutputOption)
.ForwardAsSingle(o => $"/p:PublishDir={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:PublishDir={o.Arguments.Single()}")),
CommonOptions.FrameworkOption(),
CommonOptions.RuntimeOption(),
CommonOptions.ConfigurationOption(),
@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.ManifestOptionDescription,
Accept.OneOrMoreArguments()
.With(name: LocalizableStrings.ManifestOption)
.ForwardAsSingle(o => $"/p:TargetManifestFiles={string.Join("%3B", o.Arguments)}")),
.ForwardAsSingle(o => $"-property:TargetManifestFiles={string.Join("%3B", o.Arguments)}")),
Create.Option(
"--self-contained",
LocalizableStrings.SelfContainedOptionDescription,
@ -41,7 +41,7 @@ namespace Microsoft.DotNet.Cli
.ForwardAsSingle(o =>
{
string value = o.Arguments.Any() ? o.Arguments.Single() : "true";
return $"/p:SelfContained={value}";
return $"-property:SelfContained={value}";
})),
CommonOptions.NoRestoreOption(),
CommonOptions.VerbosityOption());

4
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -35,10 +35,10 @@ namespace Microsoft.DotNet.Tools.Restore
if (noLogo)
{
msbuildArgs.Add("/nologo");
msbuildArgs.Add("-nologo");
}
msbuildArgs.Add("/t:Restore");
msbuildArgs.Add("-target:Restore");
msbuildArgs.AddRange(parsedRestore.OptionValuesToBeForwarded());

18
src/dotnet/commands/dotnet-restore/RestoreCommandParser.cs
View file

@ -47,51 +47,51 @@ namespace Microsoft.DotNet.Cli
showHelp ? LocalizableStrings.CmdSourceOptionDescription : string.Empty,
Accept.OneOrMoreArguments()
.With(name: LocalizableStrings.CmdSourceOption)
.ForwardAsSingle(o => $"/p:RestoreSources={string.Join("%3B", o.Arguments)}")),
.ForwardAsSingle(o => $"-property:RestoreSources={string.Join("%3B", o.Arguments)}")),
Create.Option(
useShortOptions ? "-r|--runtime" : "--runtime" ,
LocalizableStrings.CmdRuntimeOptionDescription,
Accept.OneOrMoreArguments()
.WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
.With(name: LocalizableStrings.CmdRuntimeOption)
.ForwardAsSingle(o => $"/p:RuntimeIdentifiers={string.Join("%3B", o.Arguments)}")),
.ForwardAsSingle(o => $"-property:RuntimeIdentifiers={string.Join("%3B", o.Arguments)}")),
Create.Option(
"--packages",
showHelp ? LocalizableStrings.CmdPackagesOptionDescription : string.Empty,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdPackagesOption)
.ForwardAsSingle(o => $"/p:RestorePackagesPath={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:RestorePackagesPath={o.Arguments.Single()}")),
Create.Option(
"--disable-parallel",
showHelp ? LocalizableStrings.CmdDisableParallelOptionDescription : string.Empty,
Accept.NoArguments()
.ForwardAs("/p:RestoreDisableParallel=true")),
.ForwardAs("-property:RestoreDisableParallel=true")),
Create.Option(
"--configfile",
showHelp ? LocalizableStrings.CmdConfigFileOptionDescription : string.Empty,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdConfigFileOption)
.ForwardAsSingle(o => $"/p:RestoreConfigFile={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:RestoreConfigFile={o.Arguments.Single()}")),
Create.Option(
"--no-cache",
showHelp ? LocalizableStrings.CmdNoCacheOptionDescription : string.Empty,
Accept.NoArguments()
.ForwardAs("/p:RestoreNoCache=true")),
.ForwardAs("-property:RestoreNoCache=true")),
Create.Option(
"--ignore-failed-sources",
showHelp ? LocalizableStrings.CmdIgnoreFailedSourcesOptionDescription : string.Empty,
Accept.NoArguments()
.ForwardAs("/p:RestoreIgnoreFailedSources=true")),
.ForwardAs("-property:RestoreIgnoreFailedSources=true")),
Create.Option(
"--no-dependencies",
LocalizableStrings.CmdNoDependenciesOptionDescription,
Accept.NoArguments()
.ForwardAs("/p:RestoreRecursive=false")),
.ForwardAs("-property:RestoreRecursive=false")),
Create.Option(
useShortOptions ? "-f|--force" : "--force",
LocalizableStrings.CmdForceRestoreOptionDescription,
Accept.NoArguments()
.ForwardAs("/p:RestoreForce=true"))
.ForwardAs("-property:RestoreForce=true"))
};
}
}

6
src/dotnet/commands/dotnet-run/RunCommand.cs
View file

@ -167,12 +167,12 @@ namespace Microsoft.DotNet.Tools.Run
{
List<string> args = new List<string>()
{
"/nologo"
"-nologo"
};
if (!RestoreArgs.Any(a => a.StartsWith("/verbosity:")))
if (!RestoreArgs.Any(a => a.StartsWith("-verbosity:")))
{
args.Add("/verbosity:quiet");
args.Add("-verbosity:quiet");
}
args.AddRange(RestoreArgs);

2
src/dotnet/commands/dotnet-store/Program.cs
View file

@ -34,7 +34,7 @@ namespace Microsoft.DotNet.Tools.Store
throw new GracefulException(LocalizableStrings.SpecifyManifests);
}
msbuildArgs.Add("/t:ComposeStore");
msbuildArgs.Add("-target:ComposeStore");
msbuildArgs.AddRange(appliedBuildOptions.OptionValuesToBeForwarded());

12
src/dotnet/commands/dotnet-store/StoreCommandParser.cs
View file

@ -37,7 +37,7 @@ namespace Microsoft.DotNet.Cli
return new[]
{
materializedString,
$"/p:AdditionalProjects={string.Join("%3B", o.Arguments.Skip(1))}"
$"-property:AdditionalProjects={string.Join("%3B", o.Arguments.Skip(1))}"
};
}
})),
@ -47,30 +47,30 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.FrameworkVersionOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.FrameworkVersionOption)
.ForwardAsSingle(o => $"/p:RuntimeFrameworkVersion={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:RuntimeFrameworkVersion={o.Arguments.Single()}")),
CommonOptions.RuntimeOption(),
Create.Option(
"-o|--output",
LocalizableStrings.OutputOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.OutputOption)
.ForwardAsSingle(o => $"/p:ComposeDir={Path.GetFullPath(o.Arguments.Single())}")),
.ForwardAsSingle(o => $"-property:ComposeDir={Path.GetFullPath(o.Arguments.Single())}")),
Create.Option(
"-w|--working-dir",
LocalizableStrings.IntermediateWorkingDirOptionDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.IntermediateWorkingDirOption)
.ForwardAsSingle(o => $"/p:ComposeWorkingDir={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:ComposeWorkingDir={o.Arguments.Single()}")),
Create.Option(
"--skip-optimization",
LocalizableStrings.SkipOptimizationOptionDescription,
Accept.NoArguments()
.ForwardAs("/p:SkipOptimization=true")),
.ForwardAs("-property:SkipOptimization=true")),
Create.Option(
"--skip-symbols",
LocalizableStrings.SkipSymbolsOptionDescription,
Accept.NoArguments()
.ForwardAs("/p:CreateProfilingSymbols=false")),
.ForwardAs("-property:CreateProfilingSymbols=false")),
CommonOptions.VerbosityOption());
}
}

14
src/dotnet/commands/dotnet-test/Program.cs
View file

@ -30,10 +30,10 @@ namespace Microsoft.DotNet.Tools.Test
{
var msbuildArgs = new List<string>()
{
"/t:VSTest",
"/v:quiet",
"/nodereuse:false", // workaround for https://github.com/Microsoft/vstest/issues/1503
"/nologo"
"-target:VSTest",
"-verbosity:quiet",
"-nodereuse:false", // workaround for https://github.com/Microsoft/vstest/issues/1503
"-nologo"
};
var parser = Parser.Instance;
@ -57,17 +57,17 @@ namespace Microsoft.DotNet.Tools.Test
{
var runSettingsArg = string.Join(";", runSettingsOptions);
msbuildArgs.Add($"/p:VSTestCLIRunSettings=\"{runSettingsArg}\"");
msbuildArgs.Add($"-property:VSTestCLIRunSettings=\"{runSettingsArg}\"");
}
var verbosityArg = msbuildArgs.LastOrDefault(arg => arg.StartsWith("/verbosity"));
var verbosityArg = msbuildArgs.LastOrDefault(arg => arg.StartsWith("-verbosity"));
if (!string.IsNullOrEmpty(verbosityArg))
{
var verbosity = verbosityArg.Split(':');
if (verbosity.Length == 2)
{
msbuildArgs.Add($"/p:VSTestVerbosity={verbosity[1]}");
msbuildArgs.Add($"-property:VSTestVerbosity={verbosity[1]}");
}
}

22
src/dotnet/commands/dotnet-test/TestCommandParser.cs
View file

@ -25,24 +25,24 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.CmdSettingsDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdSettingsFile)
.ForwardAsSingle(o => $"/p:VSTestSetting={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:VSTestSetting={o.Arguments.Single()}")),
Create.Option(
"-t|--list-tests",
LocalizableStrings.CmdListTestsDescription,
Accept.NoArguments()
.ForwardAsSingle(o => "/p:VSTestListTests=true")),
.ForwardAsSingle(o => "-property:VSTestListTests=true")),
Create.Option(
"--filter",
LocalizableStrings.CmdTestCaseFilterDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdTestCaseFilterExpression)
.ForwardAsSingle(o => $"/p:VSTestTestCaseFilter={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:VSTestTestCaseFilter={o.Arguments.Single()}")),
Create.Option(
"-a|--test-adapter-path",
LocalizableStrings.CmdTestAdapterPathDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdTestAdapterPath)
.ForwardAsSingle(o => $"/p:VSTestTestAdapterPath={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:VSTestTestAdapterPath={o.Arguments.Single()}")),
Create.Option(
"-l|--logger",
LocalizableStrings.CmdLoggerDescription,
@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Cli
{
var loggersString = string.Join(";", GetSemiColonEscapedArgs(o.Arguments));
return $"/p:VSTestLogger={loggersString}";
return $"-property:VSTestLogger={loggersString}";
})),
CommonOptions.ConfigurationOption(),
CommonOptions.FrameworkOption(),
@ -61,35 +61,35 @@ namespace Microsoft.DotNet.Cli
LocalizableStrings.CmdOutputDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdOutputDir)
.ForwardAsSingle(o => $"/p:OutputPath={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:OutputPath={o.Arguments.Single()}")),
Create.Option(
"-d|--diag",
LocalizableStrings.CmdPathTologFileDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdPathToLogFile)
.ForwardAsSingle(o => $"/p:VSTestDiag={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:VSTestDiag={o.Arguments.Single()}")),
Create.Option(
"--no-build",
LocalizableStrings.CmdNoBuildDescription,
Accept.NoArguments()
.ForwardAsSingle(o => "/p:VSTestNoBuild=true")),
.ForwardAsSingle(o => "-property:VSTestNoBuild=true")),
Create.Option(
"-r|--results-directory",
LocalizableStrings.CmdResultsDirectoryDescription,
Accept.ExactlyOneArgument()
.With(name: LocalizableStrings.CmdPathToResultsDirectory)
.ForwardAsSingle(o => $"/p:VSTestResultsDirectory={o.Arguments.Single()}")),
.ForwardAsSingle(o => $"-property:VSTestResultsDirectory={o.Arguments.Single()}")),
Create.Option(
"--collect",
LocalizableStrings.cmdCollectDescription,
Accept.OneOrMoreArguments()
.With(name: LocalizableStrings.cmdCollectFriendlyName)
.ForwardAsSingle(o => $"/p:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")),
.ForwardAsSingle(o => $"-property:VSTestCollect=\"{string.Join(";", o.Arguments)}\"")),
Create.Option(
"--blame",
LocalizableStrings.CmdBlameDescription,
Accept.NoArguments()
.ForwardAsSingle(o => "/p:VSTestBlame=true")),
.ForwardAsSingle(o => "-property:VSTestBlame=true")),
CommonOptions.NoRestoreOption(),
CommonOptions.VerbosityOption());

4
src/dotnet/commands/dotnet-tool/install/ProjectRestorer.cs
View file

@ -44,10 +44,10 @@ namespace Microsoft.DotNet.Tools.Tool.Install
{
"--runtime",
AnyRid,
$"/p:BaseIntermediateOutputPath={assetJsonOutput.ToXmlEncodeString()}"
$"-property:BaseIntermediateOutputPath={assetJsonOutput.ToXmlEncodeString()}"
});
argsToPassToRestore.Add($"/verbosity:{verbosity ?? "quiet"}");
argsToPassToRestore.Add($"-verbosity:{verbosity ?? "quiet"}");
var command = new DotNetCommandFactory(alwaysRunOutOfProc: true)
.Create("restore", argsToPassToRestore);