Skip to content

Commit ed68ce7

Browse files
authored
Remove ArgumentEscaper (#32134)
1 parent e69e96d commit ed68ce7

File tree

4 files changed

+18
-150
lines changed

4 files changed

+18
-150
lines changed

src/Shared/CommandLineUtils/Utilities/ArgumentEscaper.cs

Lines changed: 0 additions & 109 deletions
This file was deleted.

src/Shared/test/Shared.Tests/ArgumentEscaperTests.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/Tools/dotnet-getdocument/src/Exe.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,19 @@ public static int Run(
1818
string workingDirectory = null,
1919
bool interceptOutput = false)
2020
{
21-
var arguments = ArgumentEscaper.EscapeAndConcatenate(args);
22-
23-
reporter.WriteVerbose(executable + " " + arguments);
21+
reporter.WriteVerbose(executable + " " + string.Join(" " , args));
2422

2523
var startInfo = new ProcessStartInfo
2624
{
2725
FileName = executable,
28-
Arguments = arguments,
2926
UseShellExecute = false,
3027
RedirectStandardOutput = interceptOutput
3128
};
29+
foreach (var argument in args)
30+
{
31+
startInfo.ArgumentList.Add(argument);
32+
}
33+
3234
if (workingDirectory != null)
3335
{
3436
startInfo.WorkingDirectory = workingDirectory;

src/Tools/dotnet-user-secrets/src/Internal/ProjectIdResolver.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,24 @@ public string Resolve(string project, string configuration)
4343
var outputFile = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
4444
try
4545
{
46-
var args = new[]
47-
{
48-
"msbuild",
49-
projectFile,
50-
"/nologo",
51-
"/t:_ExtractUserSecretsMetadata", // defined in SecretManager.targets
52-
"/p:_UserSecretsMetadataFile=" + outputFile,
53-
"/p:Configuration=" + configuration,
54-
"/p:CustomAfterMicrosoftCommonTargets=" + _targetsFile,
55-
"/p:CustomAfterMicrosoftCommonCrossTargetingTargets=" + _targetsFile,
56-
"-verbosity:detailed",
57-
};
5846
var psi = new ProcessStartInfo
5947
{
6048
FileName = DotNetMuxer.MuxerPathOrDefault(),
61-
Arguments = ArgumentEscaper.EscapeAndConcatenate(args),
6249
RedirectStandardOutput = true,
6350
RedirectStandardError = true,
6451
UseShellExecute = false,
52+
ArgumentList =
53+
{
54+
"msbuild",
55+
projectFile,
56+
"/nologo",
57+
"/t:_ExtractUserSecretsMetadata", // defined in SecretManager.targets
58+
"/p:_UserSecretsMetadataFile=" + outputFile,
59+
"/p:Configuration=" + configuration,
60+
"/p:CustomAfterMicrosoftCommonTargets=" + _targetsFile,
61+
"/p:CustomAfterMicrosoftCommonCrossTargetingTargets=" + _targetsFile,
62+
"-verbosity:detailed",
63+
}
6564
};
6665

6766
#if DEBUG

0 commit comments

Comments
 (0)