From b98dccb1f7d44e36ea7cecbd0af11f541ae46d45 Mon Sep 17 00:00:00 2001
From: faahmad <faahmad@FAAHMAD-RTW3>
Date: Mon, 17 Apr 2017 07:31:03 -0700
Subject: [PATCH] Fix tests

---
 .../VSTestXunitDesktopAndNetCore.csproj                   | 1 -
 .../GivenDotnetTestBuildsAndRunsTestfromCsproj.cs         | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
index 625d5a0d7..3c971a5e9 100644
--- a/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
+++ b/TestAssets/TestProjects/VSTestXunitDesktopAndNetCore/VSTestXunitDesktopAndNetCore.csproj
@@ -2,7 +2,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
     <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier>
diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index cab93d0f2..c3630da20 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -8,6 +8,7 @@ using Microsoft.DotNet.TestFramework;
 using Microsoft.DotNet.Cli.Utils;
 using System.IO;
 using System;
+using System.Runtime.CompilerServices;
 
 namespace Microsoft.DotNet.Cli.Test.Tests
 {
@@ -89,7 +90,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
                                        .ExecuteWithCapturedOutput("--no-build");
 
             // Verify
-            result.StdOut.Should().Contain(expectedError); 
+            result.StdErr.Should().Contain(expectedError);
         }
 
         [Fact]
@@ -185,11 +186,12 @@ namespace Microsoft.DotNet.Cli.Test.Tests
             result.StdOut.Should().Contain("Failed   TestNamespace.VSTestTests.VSTestFailTest");
         }
 
-        private string CopyAndRestoreVSTestDotNetCoreTestApp(){
+        private string CopyAndRestoreVSTestDotNetCoreTestApp([CallerMemberName] string callingMethod = "")
+        {
             // Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests
             string testAppName = "VSTestDotNetCore";
             var testInstance = TestAssets.Get(testAppName)
-                            .CreateInstance()
+                            .CreateInstance(callingMethod)
                             .WithSourceFiles();
 
             var testProjectDirectory = testInstance.Root.FullName;