Merge pull request #6319 from smadala/tp-insert-0414

TestPlatform 15.1.0-preview-20170414-04 insertion
dotnet · Apr 19, 2017 · 12dbed6 · 12dbed6
2 parents 33b83ee + 3f82e11
commit 12dbed6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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/build/DependencyVersions.props b/build/DependencyVersions.props
@@ -7,7 +7,7 @@
     <CLI_NETSDK_Version>2.0.0-alpha-20170414-1</CLI_NETSDK_Version>
     <CLI_NuGet_Version>4.3.0-beta1-2418</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-rel-20170413-451</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.1.0-preview-20170316-05</CLI_TestPlatform_Version>
+    <CLI_TestPlatform_Version>15.1.0-preview-20170414-04</CLI_TestPlatform_Version>
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>

diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -8,6 +8,7 @@
 using Microsoft.DotNet.Cli.Utils;
 using System.IO;
 using System;
+using System.Runtime.CompilerServices;
 
 namespace Microsoft.DotNet.Cli.Test.Tests
 {
@@ -89,7 +90,7 @@ public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven()
                                        .ExecuteWithCapturedOutput("--no-build");
 
             // Verify
-            result.StdOut.Should().Contain(expectedError); 
+            result.StdErr.Should().Contain(expectedError);
         }
 
         [Fact]
@@ -185,11 +186,12 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory()
             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;