Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for coded UI test debug broken #1352

Merged
merged 3 commits into from
Jan 3, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -22,7 +26,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Internal.TestPlatform.Extensions">
<Version>15.6.0-preview-1202328</Version>
<Version>$(TestPlatformExternalsVersion)</Version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

<PrivateAssets>All</PrivateAssets>
</PackageReference>
<ProjectReference Include="..\..\src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj" />
Expand Down
9 changes: 5 additions & 4 deletions scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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 link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[xml](Get-Content $TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props).Project.PropertyGroup.TestPlatformExternalsVersion

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I was searching for this 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

# 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
Expand Down
3 changes: 2 additions & 1 deletion scripts/build/TestPlatform.Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -25,5 +25,6 @@

<JsonNetVersion>9.0.1</JsonNetVersion>
<MoqVersion>4.7.63</MoqVersion>
<TestPlatformExternalsVersion>15.6.0-preview-1251113</TestPlatformExternalsVersion>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions src/package/external/external.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down