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 @@ + + ../../ + + 15.0.0 net451 @@ -22,7 +26,7 @@ - 15.6.0-preview-1202328 + $(TestPlatformExternalsVersion) All diff --git a/scripts/build.ps1 b/scripts/build.ps1 index afda57c327..6a2b97cc58 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,18 @@ function Create-VsixPackage $testImpactComComponentsDir = Join-Path $extensionsPackageDir "TestImpact" $legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact" + $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\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 @@ 15.0.26201 - 15.3.0-preview-20170628-02 + 15.5.0 1.2.0 1.2.0 @@ -25,5 +25,6 @@ 9.0.1 4.7.63 + 15.6.0-preview-1251113 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 @@ All - 15.6.0-preview-1202328 + $(TestPlatformExternalsVersion) All - 15.6.0-preview-1202328 + $(TestPlatformExternalsVersion) All - 15.6.0-preview-1202328 + $(TestPlatformExternalsVersion) All