Merge branch 'release/2.2.1xx' into merges/release/2.1.4xx-to-release/2.2.1xx

This commit is contained in:
Nick Guerrera 2018-07-18 21:52:01 -07:00 committed by GitHub
commit d71eb98fde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
120 changed files with 435 additions and 442 deletions

View file

@ -172,7 +172,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
var testProjectDirectory = this.CopyAndRestoreVSTestDotNetCoreTestApp("5");
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
string expectedError = Path.Combine(testProjectDirectory, "bin",
configuration, "netcoreapp2.1", "VSTestCore.dll");
configuration, "netcoreapp2.2", "VSTestCore.dll");
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
// Call test