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

binding redirects tests: Simplify and get ready for enabling (#4692)

Browse source 
* binding redirects tests: Simplify and get ready for enabling

* fix targets broken during cleanup

* fix non-windows build

* apply pr feedback: remove some not needed code

* remigrate BindingRedirects samples, add x64 to bind redir proj
This commit is contained in:
Krzysztof Wicher 2016-11-14 14:26:03 -08:00 • committed by GitHub
parent 6d57ca7e14
commit 9212605e89
22 changed files with 363 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,13 +80,17 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
[Fact]
public void WhenTelemetryIsEnabledTheLoggerIsAddedToTheCommandLine()
{
string[] allArgs = GetArgsForMSBuild(() => true);
Telemetry telemetry;
string[] allArgs = GetArgsForMSBuild(() => true, out telemetry);
// telemetry will still be disabled if environmental variable is set
if (telemetry.Enabled)
{
allArgs.Should().NotBeNull();
allArgs.Should().NotBeNull();
allArgs.Should().Contain(
value => value.IndexOf("/Logger", StringComparison.OrdinalIgnoreCase) >= 0,
"The MSBuild logger argument should be specified when telemetry is enabled.");
allArgs.Should().Contain(
value => value.IndexOf("/Logger", StringComparison.OrdinalIgnoreCase) >= 0,
"The MSBuild logger argument should be specified when telemetry is enabled.");
}
}
[Fact]
@ -103,7 +107,13 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
private string[] GetArgsForMSBuild(Func<bool> sentinelExists)
{
Telemetry telemetry = new Telemetry(new MockNuGetCacheSentinel(sentinelExists));
Telemetry telemetry;
return GetArgsForMSBuild(sentinelExists, out telemetry);
}
private string[] GetArgsForMSBuild(Func<bool> sentinelExists, out Telemetry telemetry)
{
telemetry = new Telemetry(new MockNuGetCacheSentinel(sentinelExists));
MSBuildForwardingApp msBuildForwardingApp = new MSBuildForwardingApp(Enumerable.Empty<string>());