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

Reduce line lengths

Browse source
This commit is contained in:
Jeff Kluge 2016-11-02 13:06:44 -07:00
parent 9c10867194
commit a2d438288e
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/dotnet/commands/dotnet-msbuild/MSBuildLogger.cs
View file

@ -18,7 +18,8 @@ namespace Microsoft.DotNet.Tools.MSBuild
{ {
try try
{ {
string sessionId = Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName); string sessionId =
Environment.GetEnvironmentVariable(MSBuildForwardingApp.TelemetrySessionIdEnvironmentVariableName);
if (sessionId != null) if (sessionId != null)
{ {

16
test/dotnet-msbuild.Tests/GivenDotnetMSBuildBuildsProjects.cs
View file

@ -84,7 +84,9 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
allArgs.Should().NotBeNull(); allArgs.Should().NotBeNull();
allArgs.Should().Contain(value => value.StartsWith("\"/Logger:"), "The MSBuild logger argument should be specified when telemetry is enabled."); allArgs.Should().Contain(
value => value.StartsWith("\"/Logger:"),
"The MSBuild logger argument should be specified when telemetry is enabled.");
} }
[Fact] [Fact]
@ -94,7 +96,9 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
allArgs.Should().NotBeNull(); allArgs.Should().NotBeNull();
allArgs.Should().NotContain(value => value.IndexOf("/Logger", StringComparison.OrdinalIgnoreCase) >= 0, $"The MSBuild logger argument should not be specified when telemetry is disabled."); allArgs.Should().NotContain(
value => value.IndexOf("/Logger", StringComparison.OrdinalIgnoreCase) >= 0,
$"The MSBuild logger argument should not be specified when telemetry is disabled.");
} }
private string[] GetArgsForMSBuild(Func<bool> sentinelExists) private string[] GetArgsForMSBuild(Func<bool> sentinelExists)
@ -103,11 +107,15 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
MSBuildForwardingApp msBuildForwardingApp = new MSBuildForwardingApp(Enumerable.Empty<string>()); MSBuildForwardingApp msBuildForwardingApp = new MSBuildForwardingApp(Enumerable.Empty<string>());
FieldInfo forwardingAppFieldInfo = msBuildForwardingApp.GetType().GetField("_forwardingApp", BindingFlags.Instance | BindingFlags.NonPublic); FieldInfo forwardingAppFieldInfo = msBuildForwardingApp
.GetType()
.GetField("_forwardingApp", BindingFlags.Instance | BindingFlags.NonPublic);
ForwardingApp forwardingApp = forwardingAppFieldInfo?.GetValue(msBuildForwardingApp) as ForwardingApp; ForwardingApp forwardingApp = forwardingAppFieldInfo?.GetValue(msBuildForwardingApp) as ForwardingApp;
FieldInfo allArgsFieldinfo = forwardingApp?.GetType().GetField("_allArgs", BindingFlags.Instance | BindingFlags.NonPublic); FieldInfo allArgsFieldinfo = forwardingApp?
.GetType()
.GetField("_allArgs", BindingFlags.Instance | BindingFlags.NonPublic);
return allArgsFieldinfo?.GetValue(forwardingApp) as string[]; return allArgsFieldinfo?.GetValue(forwardingApp) as string[];
} }