From 5752a708ec25abb8f4df6d2e98815e10d3323b58 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 2 Aug 2018 15:46:15 -0700
Subject: [PATCH 1/4] Updating branding to 2.1.500

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index c2309c774..b0b8ad767 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor>2</VersionMajor>
     <VersionMinor>1</VersionMinor>
-    <VersionPatch>401</VersionPatch>
+    <VersionPatch>500</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
 
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>

From b2ceb7e81fc141f60c8c173dc84519c111c23271 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 2 Aug 2018 15:47:31 -0700
Subject: [PATCH 2/4] Update BranchInfo to release/2.1.5xx

---
 build/BranchInfo.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index c7a84c19d..ae502fd1a 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <Channel>release/2.1.4xx</Channel>
-    <BranchName>release/2.1.4xx</BranchName>
+    <Channel>release/2.1.5xx</Channel>
+    <BranchName>release/2.1.5xx</BranchName>
   </PropertyGroup>
 </Project>

From ea47700f7520d0b43a866e52fa6b2681df0801ed Mon Sep 17 00:00:00 2001
From: Vagisha Nidhi <vagisha.nda@gmail.com>
Date: Fri, 10 Aug 2018 14:32:29 +0530
Subject: [PATCH 3/4] TestPlatform 15.9.0-preview Insertion

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 07e237526..abef520fc 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -53,7 +53,7 @@
     <NuGetProjectModelPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetProjectModelPackageVersion>
     <NuGetVersioningPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetVersioningPackageVersion>
     <MicrosoftBuildNuGetSdkResolverPackageVersion>$(NuGetBuildTasksPackageVersion)</MicrosoftBuildNuGetSdkResolverPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.9.0-preview-20180807-05</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
     <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
     <XliffTasksPackageVersion>0.2.0-beta-000042</XliffTasksPackageVersion>

From 00bf470ddbc2a4adbefb0f52c6b8638e3eb842b3 Mon Sep 17 00:00:00 2001
From: Vagisha Nidhi <vagisha.nda@gmail.com>
Date: Fri, 10 Aug 2018 16:26:00 +0530
Subject: [PATCH 4/4] Updated test

---
 .../GivenDotnetTestBuildsAndRunsTestfromCsproj.cs   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index 7121959fe..bc88af2cd 100644
--- a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -152,11 +152,14 @@ namespace Microsoft.DotNet.Cli.Test.Tests
                                        .ExecuteWithCapturedOutput("--logger \"trx;logfilename=custom.trx\" --logger console;verbosity=normal -- RunConfiguration.ResultsDirectory=" + trxLoggerDirectory);
 
             // Verify
-            var trxFilePath = Path.Combine(trxLoggerDirectory, "custom.trx");
-            Assert.True(File.Exists(trxFilePath));
-            result.StdOut.Should().Contain(trxFilePath);
-            result.StdOut.Should().Contain("Passed   VSTestPassTest");
-            result.StdOut.Should().Contain("Failed   VSTestFailTest");
+            if (!DotnetUnderTest.IsLocalized())
+            {
+                var trxFilePath = Path.Combine(trxLoggerDirectory, "custom.trx");
+                Assert.True(File.Exists(trxFilePath));
+                result.StdOut.Should().Contain(trxFilePath);
+                result.StdOut.Should().Contain("Passed   VSTestPassTest");
+                result.StdOut.Should().Contain("Failed   VSTestFailTest");
+            }
 
             // Cleanup trxLoggerDirectory if it exist
             if (Directory.Exists(trxLoggerDirectory))