From 491fa2a0dda7464384c5b658141ce6a5dfbaa983 Mon Sep 17 00:00:00 2001
From: samadala <samadala@microsoft.com>
Date: Fri, 29 Dec 2017 18:26:32 +0530
Subject: [PATCH 1/2] Fix for coded UI test debug broken

---
 .../Microsoft.TestPlatform.E2ETest.csproj                | 6 +++++-
 scripts/build.ps1                                        | 9 +++++----
 scripts/build/TestPlatform.Dependencies.props            | 3 ++-
 src/package/external/external.csproj                     | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
index c385e7c63e..0152be5498 100644
--- a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
+++ b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+      <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">../../</TestPlatformRoot>
+  </PropertyGroup>
+  <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Dependencies.props" />
   <PropertyGroup>
     <VersionPrefix>15.0.0</VersionPrefix>
     <TargetFramework>net451</TargetFramework>
@@ -22,7 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Internal.TestPlatform.Extensions">
-      <Version>15.6.0-preview-1202328</Version>
+      <Version>$(TestPlatformExternalsVersion)</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <ProjectReference Include="..\..\src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index f248f443b6..3a0904c3d8 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -24,7 +24,7 @@ Param(
 
     [Parameter(Mandatory=$false)]
     [Alias("bn")]
-    [System.String] $BuildNumber = "49999999-99",
+    [System.String] $BuildNumber = "20991231-99",
 
     [Parameter(Mandatory=$false)]
     [Alias("ff")]
@@ -433,16 +433,17 @@ function Create-VsixPackage
     $testImpactComComponentsDir = Join-Path $extensionsPackageDir "TestImpact"
     $legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact"
 
+    $testPlatformExternalsVersion = "15.6.0-preview-1251113"
     # Copy legacy dependencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\15.6.0-preview-1202328\contentFiles\any\any"
+    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\contentFiles\any\any"
     Copy-Item -Recurse $legacyDir\* $packageDir -Force
 
     # Copy QtAgent Related depedencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\15.6.0-preview-1202328\contentFiles\any\any"
+    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools\$testPlatformExternalsVersion\contentFiles\any\any"
     Copy-Item -Recurse $legacyDir\* $packageDir -Force
 
     # Copy Legacy data collectors Related depedencies
-    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools.DataCollectors\15.6.0-preview-1202328\contentFiles\any\any"
+    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools.DataCollectors\$testPlatformExternalsVersion\contentFiles\any\any"
     Copy-Item -Recurse $legacyDir\* $packageDir -Force
 
     # Copy COM Components and their manifests over
diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index 996f17d99b..75c92eb451 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -4,7 +4,7 @@
     <VSSdkBuildToolsVersion>15.0.26201</VSSdkBuildToolsVersion>
 
     <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
-    <NETTestSdkPreviousVersion>15.3.0-preview-20170628-02</NETTestSdkPreviousVersion>
+    <NETTestSdkPreviousVersion>15.5.0</NETTestSdkPreviousVersion>
 
     <MSTestFrameworkVersion>1.2.0</MSTestFrameworkVersion>
     <MSTestAdapterVersion>1.2.0</MSTestAdapterVersion>
@@ -25,5 +25,6 @@
 
     <JsonNetVersion>9.0.1</JsonNetVersion>
     <MoqVersion>4.7.63</MoqVersion>
+    <TestPlatformExternalsVersion>15.6.0-preview-1251113</TestPlatformExternalsVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
index 0eb7b58b84..8bfcbcfab3 100644
--- a/src/package/external/external.csproj
+++ b/src/package/external/external.csproj
@@ -53,15 +53,15 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Internal.TestPlatform.Extensions">
-      <Version>15.6.0-preview-1202328</Version>
+      <Version>$(TestPlatformExternalsVersion)</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.QualityTools">
-      <Version>15.6.0-preview-1202328</Version>
+      <Version>$(TestPlatformExternalsVersion)</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.QualityTools.DataCollectors">
-      <Version>15.6.0-preview-1202328</Version>
+      <Version>$(TestPlatformExternalsVersion)</Version>
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Internal.Intellitrace">

From cb6408c908e694ab89ce1e5667022f7f8222d8d8 Mon Sep 17 00:00:00 2001
From: samadala <samadala@microsoft.com>
Date: Tue, 2 Jan 2018 20:05:59 +0530
Subject: [PATCH 2/2] Read testPlatformExternals version from
 TestPlatform.Dependencies.props

---
 scripts/build.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 3a0904c3d8..e2540879e1 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -433,7 +433,8 @@ function Create-VsixPackage
     $testImpactComComponentsDir = Join-Path $extensionsPackageDir "TestImpact"
     $legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact"
 
-    $testPlatformExternalsVersion = "15.6.0-preview-1251113"
+    $testPlatformExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.TestPlatformExternalsVersion
+
     # Copy legacy dependencies
     $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\$testPlatformExternalsVersion\contentFiles\any\any"
     Copy-Item -Recurse $legacyDir\* $packageDir -Force