diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 56dbc49c72..a2ca4937ee 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -449,6 +449,10 @@ function Create-VsixPackage
# Copy Legacy data collectors Related depedencies
$legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.QualityTools.DataCollectors\$testPlatformExternalsVersion\contentFiles\any\any"
+ Copy-Item -Recurse $legacyDir\* $packageDir -Force
+
+ # Copy CUIT Related depedencies
+ $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.VisualStudio.CUIT\$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 43ef3bde4c..064e51be27 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -25,6 +25,6 @@
9.0.1
4.7.63
- 15.6.0-preview-1270639
+ 15.6.0-preview-1329213
diff --git a/scripts/verify-sign.ps1 b/scripts/verify-sign.ps1
index ba9a58c7af..28127a56a2 100644
--- a/scripts/verify-sign.ps1
+++ b/scripts/verify-sign.ps1
@@ -29,7 +29,7 @@ $env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts"
Write-Verbose "Setup build configuration."
$TPB_SignCertificate = $Certificate
$TPB_Configuration = $Configuration
-$TPB_AssembliesPattern = @("*test*.dll", "*qualitytools*.dll", "*test*.exe", "*datacollector*.dll", "*datacollector*.exe", "QTAgent*.exe", "VsWebSite.Interop.dll", "Microsoft.VisualStudio*.dll", "Microsoft.TestPlatform.Build.dll", "Microsoft.DiaSymReader.dll", "Microsoft.IntelliTrace*.dll", "concrt140.dll", "msvcp140.dll", "vccorlib140.dll", "vcruntime140.dll", "codecoveragemessages.dll", "covrun32.dll", "msdia140.dll", "covrun64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe", "CodeCoverage.exe")
+$TPB_AssembliesPattern = @("*test*.dll", "*qualitytools*.dll", "*test*.exe", "*datacollector*.dll", "*datacollector*.exe", "QTAgent*.exe", "VsWebSite.Interop.dll", "Microsoft.VisualStudio*.dll", "Microsoft.TestPlatform.Build.dll", "Microsoft.DiaSymReader.dll", "Microsoft.IntelliTrace*.dll", "concrt140.dll", "msvcp140.dll", "vccorlib140.dll", "vcruntime140.dll", "codecoveragemessages.dll", "covrun32.dll", "msdia140.dll", "covrun64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe", "CodeCoverage.exe", "Microsoft.ShDocVw.dll", "UIAComwrapper.dll", "Interop.UIAutomationClient.dll")
function Verify-Signature
{
diff --git a/src/package/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj
index a5fe6788d5..0ade0aa4cb 100644
--- a/src/package/VSIXProject/TestPlatform.csproj
+++ b/src/package/VSIXProject/TestPlatform.csproj
@@ -154,6 +154,11 @@
Extensions\TestImpact\ComComponents\x86
+
+
+ CUITPlugins
+
+
Extensions\V1
diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
index 8bfcbcfab3..8c3d86bd9b 100644
--- a/src/package/external/external.csproj
+++ b/src/package/external/external.csproj
@@ -64,6 +64,10 @@
$(TestPlatformExternalsVersion)
All
+
+ $(TestPlatformExternalsVersion)
+ All
+
15.5.0-preview-20171207-01
All
diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj
index d8196361e1..2401737d75 100644
--- a/src/package/sign/sign.proj
+++ b/src/package/sign/sign.proj
@@ -120,6 +120,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs
new file mode 100644
index 0000000000..eff1c78bb4
--- /dev/null
+++ b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.TestPlatform.AcceptanceTests
+{
+ using Microsoft.VisualStudio.TestTools.UnitTesting;
+ using System;
+ using System.Collections.Generic;
+ using System.IO;
+ using System.Text;
+
+ [TestClass]
+ public class CUITTest : AcceptanceTestBase
+ {
+ [CustomDataTestMethod]
+ [NETFullTargetFramework]
+ public void CUITRunAllTests(RunnerInfo runnerInfo)
+ {
+ SetTestEnvironment(this.testEnvironment, runnerInfo);
+ CUITRunAll(runnerInfo.RunnerFramework);
+ }
+
+ private void CUITRunAll(string runnerFramework)
+ {
+ if (runnerFramework.StartsWith("netcoreapp"))
+ {
+ Assert.Inconclusive("CUIT tests are not supported with .Netcore runner.");
+ return;
+ }
+
+ var assemblyAbsolutePath = testEnvironment.GetTestAsset("CUITTestProject.dll", "net451");
+ var arguments = PrepareArguments(
+ assemblyAbsolutePath,
+ string.Empty,
+ string.Empty);
+
+ this.InvokeVsTest(arguments);
+ this.ValidateSummaryStatus(1, 0, 0);
+ }
+ }
+}
diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj
new file mode 100644
index 0000000000..865f433ab2
--- /dev/null
+++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj
@@ -0,0 +1,39 @@
+
+
+
+
+ ..\..\..\
+ true
+
+
+
+
+
+ CUITTestProject
+ net451
+ Exe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 15.6.0-preview-1329213
+
+
+ 15.6.0-preview-1329213
+
+
+
+
+
+
+
diff --git a/test/TestAssets/CUITTestProject/CodedUITest1.cs b/test/TestAssets/CUITTestProject/CodedUITest1.cs
new file mode 100644
index 0000000000..ffefca4985
--- /dev/null
+++ b/test/TestAssets/CUITTestProject/CodedUITest1.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace CodedUITestProject
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Text.RegularExpressions;
+ using System.Windows.Input;
+ using System.Drawing;
+ using Microsoft.VisualStudio.TestTools.UITesting;
+ using Microsoft.VisualStudio.TestTools.UnitTesting;
+ using Microsoft.VisualStudio.TestTools.UITest.Extension;
+
+ [CodedUITest]
+ public class CodedUITestProject
+ {
+ [TestMethod]
+ public void CodedUITestMethod1()
+ {
+ UITestControl.Desktop.DrawHighlight();
+ }
+ }
+}
diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
index 1ed9e7c18a..2a179064f3 100644
--- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
+++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
@@ -31,5 +31,8 @@
Always
+
+
+
diff --git a/test/TestAssets/TestAssets.sln/TestAssets.sln b/test/TestAssets/TestAssets.sln/TestAssets.sln
index ca70d9d23c..7ee6eb0962 100644
--- a/test/TestAssets/TestAssets.sln/TestAssets.sln
+++ b/test/TestAssets/TestAssets.sln/TestAssets.sln
@@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectx86", "..\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectARM", "..\SimpleTestProjectARM\SimpleTestProjectARM.csproj", "{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUITTestProject", "..\CUITTestProject\CUITTestProject.csproj", "{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -99,6 +101,10 @@ Global
{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE