Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit b1fca8c

Browse files
livarcocclivarcocc
committed
Replacing the short form version of implicit msbuild parameters with longform ones.
1 parent 1028950 commit b1fca8c

31 files changed

+173
-161
lines changed

‎build_projects/dotnet-cli-build/DotNetPack.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private string GetRuntime()
8585
{
8686
if (!string.IsNullOrEmpty(Runtime))
8787
{
88-
return $"-p:RuntimeIdentifier={Runtime}";
88+
return $"-property:RuntimeIdentifier={Runtime}";
8989
}
9090

9191
return null;

‎build_projects/dotnet-cli-build/DotNetRestore.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private string GetSkipInvalidConfigurations()
7171
{
7272
if (SkipInvalidConfigurations)
7373
{
74-
return "-p:SkipInvalidConfigurations=true";
74+
return "-property:SkipInvalidConfigurations=true";
7575
}
7676

7777
return null;
@@ -81,7 +81,7 @@ private string GetRuntime()
8181
{
8282
if (!string.IsNullOrEmpty(Runtime))
8383
{
84-
return $"-p:RuntimeIdentifier={Runtime}";
84+
return $"-property:RuntimeIdentifier={Runtime}";
8585
}
8686

8787
return null;

‎src/Microsoft.DotNet.Cli.Utils/CommandResolution/ProjectToolsCommandResolver.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,12 @@ internal void GenerateDepsJsonFile(
354354
var args = new List<string>();
355355

356356
args.Add(toolDepsJsonGeneratorProject);
357-
args.Add($"-p:ProjectAssetsFile=\"{toolLockFile.Path}\"");
358-
args.Add($"-p:ToolName={toolLibrary.Name}");
359-
args.Add($"-p:ProjectDepsFilePath={tempDepsFile}");
357+
args.Add($"-property:ProjectAssetsFile=\"{toolLockFile.Path}\"");
358+
args.Add($"-property:ToolName={toolLibrary.Name}");
359+
args.Add($"-property:ProjectDepsFilePath={tempDepsFile}");
360360

361361
var toolTargetFramework = toolLockFile.Targets.First().TargetFramework.GetShortFolderName();
362-
args.Add($"-p:TargetFramework={toolTargetFramework}");
362+
args.Add($"-property:TargetFramework={toolTargetFramework}");
363363

364364

365365
// Look for the .props file in the Microsoft.NETCore.App package, until NuGet
@@ -384,7 +384,7 @@ internal void GenerateDepsJsonFile(
384384

385385
if (platformLibraryPropsFile != null)
386386
{
387-
args.Add($"-p:AdditionalImport={platformLibraryPropsFile}");
387+
args.Add($"-property:AdditionalImport={platformLibraryPropsFile}");
388388
}
389389
}
390390
}

‎src/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ internal class MSBuildForwardingAppWithoutLogging
2828
};
2929

3030
private readonly IEnumerable<string> _msbuildRequiredParameters =
31-
new List<string> { "-m", "-v:m" };
31+
new List<string> { "-maxcpucount", "-verbosity:m" };
3232

3333
public MSBuildForwardingAppWithoutLogging(IEnumerable<string> argsToForward, string msbuildPath = null)
3434
{
@@ -51,7 +51,7 @@ public int Execute()
5151

5252
private static string Escape(string arg) =>
5353
// this is a workaround for https://github.com/Microsoft/msbuild/issues/1622
54-
(arg.StartsWith("-p:RestoreSources=", StringComparison.OrdinalIgnoreCase)) ?
54+
IsRestoreSources(arg) ?
5555
arg.Replace(";", "%3B")
5656
.Replace("://", ":%2F%2F") :
5757
arg;
@@ -81,6 +81,14 @@ private static string GetDotnetPath()
8181
{
8282
return new Muxer().MuxerPath;
8383
}
84+
85+
private static bool IsRestoreSources(string arg)
86+
{
87+
return arg.StartsWith("/p:RestoreSources=", StringComparison.OrdinalIgnoreCase) ||
88+
arg.StartsWith("/property:RestoreSources=", StringComparison.OrdinalIgnoreCase) ||
89+
arg.StartsWith("-p:RestoreSources=", StringComparison.OrdinalIgnoreCase) ||
90+
arg.StartsWith("-property:RestoreSources=", StringComparison.OrdinalIgnoreCase);
91+
}
8492
}
8593
}
8694

‎src/dotnet/CommonOptions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static Option FrameworkOption() =>
3434
Accept.ExactlyOneArgument()
3535
.WithSuggestionsFrom(_ => Suggest.TargetFrameworksFromProjectFile())
3636
.With(name: "FRAMEWORK")
37-
.ForwardAsSingle(o => $"-p:TargetFramework={o.Arguments.Single()}"));
37+
.ForwardAsSingle(o => $"-property:TargetFramework={o.Arguments.Single()}"));
3838

3939
public static Option RuntimeOption() =>
4040
Create.Option(
@@ -43,7 +43,7 @@ public static Option RuntimeOption() =>
4343
Accept.ExactlyOneArgument()
4444
.WithSuggestionsFrom(_ => Suggest.RunTimesFromProjectFile())
4545
.With(name: "RUNTIME_IDENTIFIER")
46-
.ForwardAsSingle(o => $"-p:RuntimeIdentifier={o.Arguments.Single()}"));
46+
.ForwardAsSingle(o => $"-property:RuntimeIdentifier={o.Arguments.Single()}"));
4747

4848
public static Option ConfigurationOption() =>
4949
Create.Option(
@@ -52,15 +52,15 @@ public static Option ConfigurationOption() =>
5252
Accept.ExactlyOneArgument()
5353
.With(name: "CONFIGURATION")
5454
.WithSuggestionsFrom("DEBUG", "RELEASE")
55-
.ForwardAsSingle(o => $"-p:Configuration={o.Arguments.Single()}"));
55+
.ForwardAsSingle(o => $"-property:Configuration={o.Arguments.Single()}"));
5656

5757
public static Option VersionSuffixOption() =>
5858
Create.Option(
5959
"--version-suffix",
6060
CommonLocalizableStrings.CmdVersionSuffixDescription,
6161
Accept.ExactlyOneArgument()
6262
.With(name: "VERSION_SUFFIX")
63-
.ForwardAsSingle(o => $"-p:VersionSuffix={o.Arguments.Single()}"));
63+
.ForwardAsSingle(o => $"-property:VersionSuffix={o.Arguments.Single()}"));
6464

6565
public static ArgumentsRule DefaultToCurrentDirectory(this ArgumentsRule rule) =>
6666
rule.With(defaultValue: () => PathUtility.EnsureTrailingSlash(Directory.GetCurrentDirectory()));

‎src/dotnet/commands/RestoringCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private static bool HasArgumentToExcludeFromRestore(IEnumerable<string> argument
7070
=> arguments.Any(a => IsExcludedFromRestore(a));
7171

7272
private static bool IsExcludedFromRestore(string argument)
73-
=> argument.StartsWith("-p:TargetFramework=", StringComparison.Ordinal);
73+
=> argument.StartsWith("-property:TargetFramework=", StringComparison.Ordinal);
7474

7575
public override int Execute()
7676
{

‎src/dotnet/commands/dotnet-add/dotnet-add-package/Program.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ private void GetProjectDependencyGraph(string projectFilePath, string dgFilePath
9999
args.Add(projectFilePath);
100100

101101
// Pass the task as generate restore Dependency Graph file
102-
args.Add("-t:GenerateRestoreGraphFile");
102+
args.Add("-target:GenerateRestoreGraphFile");
103103

104104
// Pass Dependency Graph file output path
105-
args.Add($"-p:RestoreGraphOutputPath=\"{dgFilePath}\"");
105+
args.Add($"-property:RestoreGraphOutputPath=\"{dgFilePath}\"");
106106

107107
// Turn off recursive restore
108-
args.Add($"-p:RestoreRecursive=false");
108+
args.Add($"-property:RestoreRecursive=false");
109109

110110
// Turn off restore for Dotnet cli tool references so that we do not generate extra dg specs
111-
args.Add($"-p:RestoreDotnetCliToolReferences=false");
111+
args.Add($"-property:RestoreDotnetCliToolReferences=false");
112112

113113
// Output should not include MSBuild version header
114114
args.Add("-nologo");

‎src/dotnet/commands/dotnet-build/BuildCommand.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public static BuildCommand FromArgs(string[] args, string msbuildPath = null)
3737

3838
var appliedBuildOptions = result["dotnet"]["build"];
3939

40-
msbuildArgs.Add($"-clp:Summary");
40+
msbuildArgs.Add($"-consoleloggerparameters:Summary");
4141

4242
if (appliedBuildOptions.HasOption("--no-incremental"))
4343
{
44-
msbuildArgs.Add("-t:Rebuild");
44+
msbuildArgs.Add("-target:Rebuild");
4545
}
4646
else
4747
{
48-
msbuildArgs.Add("-t:Build");
48+
msbuildArgs.Add("-target:Build");
4949
}
5050

5151
msbuildArgs.AddRange(appliedBuildOptions.OptionValuesToBeForwarded());

‎src/dotnet/commands/dotnet-build/BuildCommandParser.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static Command Build() =>
2525
LocalizableStrings.OutputOptionDescription,
2626
Accept.ExactlyOneArgument()
2727
.With(name: LocalizableStrings.OutputOptionName)
28-
.ForwardAsSingle(o => $"-p:OutputPath={o.Arguments.Single()}")),
28+
.ForwardAsSingle(o => $"-property:OutputPath={o.Arguments.Single()}")),
2929
CommonOptions.FrameworkOption(),
3030
CommonOptions.RuntimeOption(),
3131
CommonOptions.ConfigurationOption(),
@@ -37,7 +37,7 @@ public static Command Build() =>
3737
"--no-dependencies",
3838
LocalizableStrings.NoDependenciesOptionDescription,
3939
Accept.NoArguments()
40-
.ForwardAs("-p:BuildProjectReferences=false")),
40+
.ForwardAs("-property:BuildProjectReferences=false")),
4141
CommonOptions.NoRestoreOption(),
4242
CommonOptions.VerbosityOption());
4343
}

‎src/dotnet/commands/dotnet-clean/CleanCommandParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public static Command Clean() =>
1919
LocalizableStrings.CmdOutputDirDescription,
2020
Accept.ExactlyOneArgument()
2121
.With(name: LocalizableStrings.CmdOutputDir)
22-
.ForwardAsSingle(o => $"-p:OutputPath={o.Arguments.Single()}")),
22+
.ForwardAsSingle(o => $"-property:OutputPath={o.Arguments.Single()}")),
2323
CommonOptions.FrameworkOption(),
2424
CommonOptions.RuntimeOption(),
2525
CommonOptions.ConfigurationOption(),

0 commit comments

Comments
 (0)