From ef8e59231a79174cdac3d24a5b76e9dfeb014aa6 Mon Sep 17 00:00:00 2001
From: Faizan Ahmad <faahmad@microsoft.com>
Date: Thu, 3 Nov 2016 19:20:56 +0530
Subject: [PATCH] Fix for issue  https://github.com/Microsoft/vstest/issues/175

---
 .../ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets | 4 +++-
 .../ImportAfter/Microsoft.TestPlatform.ImportAfter.targets    | 1 +
 src/redist/redist.csproj                                      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/MSBuildImports/15.0/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets b/resources/MSBuildImports/15.0/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets
index 89a55d128..3ec63dfea 100644
--- a/resources/MSBuildImports/15.0/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets
+++ b/resources/MSBuildImports/15.0/Microsoft.Common.CrossTargeting.targets/ImportAfter/Microsoft.TestPlatform.CrossTargeting.targets
@@ -10,7 +10,9 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
   <!--
   ===================================================================================
                DispatchToInnerBuildsWithVSTestTarget
diff --git a/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets
index 97f203482..d1572027e 100644
--- a/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets
+++ b/resources/MSBuildImports/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.TestPlatform.ImportAfter.targets
@@ -13,6 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Import Microsoft.TestPlatform.targets for VSTest target -->
   <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <VSTestTargets Condition="'$(VSTestTargets)'==''">$(MSBuildExtensionsPath)\Microsoft.TestPlatform.targets</VSTestTargets>
   </PropertyGroup>
   <Import Condition="Exists('$(VSTestTargets)')" Project="$(VSTestTargets)" />
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 59fd617c9..c6c3f6ab3 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -36,7 +36,7 @@
       <Version>15.0.0-preview-20161102-02</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.TestPlatform.Build">
-      <Version>15.0.0-preview-20161028-03</Version>
+      <Version>15.0.0-preview-20161103-02</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">