Fix unittesting our .xaml classes (#4105)

## Summary of the Pull Request New year, new unittests. This PR introduces a new project, `TestHostApp`. This project is largely taken from the TAEF samples, and allows us to easily construct a helper executable and `resources.pri` for running TerminalApp unittests. ## References ## PR Checklist * [x] Closes #3986 * [x] I work here * [x] is Tests * [n/a] Requires documentation to be updated * [x] **Waiting for an updated version of TAEF to be available** ## Detailed Description of the Pull Request / Additional comments Unittesting for the TerminalApp project has been a horrifying process to try getting everything pieced together just right. Dependencies need to get added to manifests, binplaced correctly, and XAML resources need to get compiled together as well. In addition, using a MUX `Application` (as opposed to the Windows.UI.Xaml `Application`) has led to additional problems. This was always a horrifying house of cards for us. Turns out, the reason this was so horrible is that the test infrastructure for doing what we're doing _literally didn't exist_ when I started doing all that work last year. So, with help from the TAEF team, I was able to get rid of our entire house of cards, and use a much simpler project to build and run the tests. Unfortunately, the latest TAEF release has a minor bug in it's build rules, and only publishes the x86 version of a dll we need from them. But, the rest of this PR works for x86, and I'll bump this when that updated version is available. We should be able to review this even in the state it's in. ## Validation Steps Performed ran the tests yo
microsoft · Jan 10, 2020 · 3fcc935 · 3fcc935
1 parent dd1dbf5
commit 3fcc935
Show file tree

Hide file tree

Showing 25 changed files with 412 additions and 108 deletions.
diff --git a/OpenConsole.sln b/OpenConsole.sln
@@ -257,6 +257,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.LIB", "src\wincon
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.DLL", "src\winconpty\dll\winconptydll.vcxproj", "{A22EC5F6-7851-4B88-AC52-47249D437A52}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHostApp", "src\cascadia\LocalTests_TerminalApp\TestHostApp\TestHostApp.vcxproj", "{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDB237B6-1D1D-400F-84CC-40A58FA59C8E}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "til.unit.tests", "src\til\ut_til\til.unit.tests.vcxproj", "{767268EE-174A-46FE-96F0-EEE698A1BBC9}"
 EndProject
 Global
@@ -1320,6 +1327,30 @@ Global
 		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x64.Build.0 = Release|x64
 		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x86.ActiveCfg = Release|Win32
 		{A22EC5F6-7851-4B88-AC52-47249D437A52}.Release|x86.Build.0 = Release|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|x64.ActiveCfg = Debug|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|x64.Build.0 = Debug|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|x64.Deploy.0 = Debug|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|x86.ActiveCfg = Debug|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|x86.Build.0 = Debug|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Debug|x86.Deploy.0 = Debug|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|Any CPU.ActiveCfg = Release|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|ARM64.Build.0 = Release|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|ARM64.Deploy.0 = Release|ARM64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|x64.ActiveCfg = Release|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|x64.Build.0 = Release|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|x64.Deploy.0 = Release|x64
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|x86.ActiveCfg = Release|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|x86.Build.0 = Release|Win32
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}.Release|x86.Deploy.0 = Release|Win32
 		{767268EE-174A-46FE-96F0-EEE698A1BBC9}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{767268EE-174A-46FE-96F0-EEE698A1BBC9}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{767268EE-174A-46FE-96F0-EEE698A1BBC9}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
@@ -1390,7 +1421,7 @@ Global
 		{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
-		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {59840756-302F-44DF-AA47-441A9D673202}
+		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{16376381-CE22-42BE-B667-C6B35007008D} = {81C352DB-1818-45B7-A284-18E259F1CC87}
 		{F1995847-4AE5-479A-BBAF-382E51A63532} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
@@ -1399,14 +1430,16 @@ Global
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {59840756-302F-44DF-AA47-441A9D673202}
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-9333-4D05-B12A-1905CBF112F9} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {05500DEF-2294-41E3-AF9A-24E580B82836}
 		{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE} = {59840756-302F-44DF-AA47-441A9D673202}
 		{B0AC39D6-7B40-49A9-8202-58549BAE1FB1} = {59840756-302F-44DF-AA47-441A9D673202}
 		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
+		{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
+		{BDB237B6-1D1D-400F-84CC-40A58FA59C8E} = {59840756-302F-44DF-AA47-441A9D673202}
 		{767268EE-174A-46FE-96F0-EEE698A1BBC9} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

diff --git a/src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp b/src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp
@@ -29,7 +29,7 @@ namespace TerminalAppLocalTests
         // details on that.
         BEGIN_TEST_CLASS(ColorSchemeTests)
             TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TerminalApp.LocalTests.AppxManifest.xml")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
         TEST_METHOD(CanLayerColorScheme);

diff --git a/src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp b/src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp
@@ -32,7 +32,7 @@ namespace TerminalAppLocalTests
         // details on that.
         BEGIN_TEST_CLASS(KeyBindingsTests)
             TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TerminalApp.LocalTests.AppxManifest.xml")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
         TEST_METHOD(ManyKeysSameAction);

diff --git a/src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp b/src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp
@@ -29,7 +29,7 @@ namespace TerminalAppLocalTests
         // details on that.
         BEGIN_TEST_CLASS(ProfileTests)
             TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TerminalApp.LocalTests.AppxManifest.xml")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
         TEST_METHOD(CanLayerProfile);

diff --git a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
@@ -34,7 +34,7 @@ namespace TerminalAppLocalTests
         // details on that.
         BEGIN_TEST_CLASS(SettingsTests)
             TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TerminalApp.LocalTests.AppxManifest.xml")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
         TEST_METHOD(TryCreateWinRTType);

diff --git a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
@@ -3,9 +3,13 @@
 
 #include "pch.h"
 
-#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/TerminalPage.h"
+#include "../TerminalApp/MinMaxCloseControl.h"
+#include "../TerminalApp/TabRowControl.h"
+#include "../TerminalApp/ShortcutActionDispatch.h"
 #include "../TerminalApp/Tab.h"
 #include "../CppWinrtTailored.h"
+#include "JsonTestClass.h"
 
 using namespace Microsoft::Console;
 using namespace TerminalApp;
@@ -19,7 +23,7 @@ namespace TerminalAppLocalTests
     // an updated TAEF that will let us install framework packages when the test
     // package is deployed. Until then, these tests won't deploy in CI.
 
-    class TabTests
+    class TabTests : public JsonTestClass
     {
         // For this set of tests, we need to activate some XAML content. For
         // release builds, the application runs as a centennial application,
@@ -34,18 +38,26 @@ namespace TerminalAppLocalTests
 
         BEGIN_TEST_CLASS(TabTests)
             TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
-            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TerminalApp.LocalTests.AppxManifest.xml")
-            TEST_CLASS_PROPERTY(L"UAP:Host", L"Xaml")
-            TEST_CLASS_PROPERTY(L"UAP:WaitForXamlWindowActivation", L"true")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
         // These four tests act as canary tests. If one of them fails, then they
         // can help you identify if something much lower in the stack has
         // failed.
         TEST_METHOD(EnsureTestsActivate);
-        TEST_METHOD(TryCreateLocalWinRTType);
+        TEST_METHOD(TryCreateSettingsType);
+        TEST_METHOD(TryCreateConnectionType);
         TEST_METHOD(TryCreateXamlObjects);
         TEST_METHOD(TryCreateTab);
+
+        TEST_METHOD(CreateSimpleTerminalXamlType);
+        TEST_METHOD(CreateTerminalMuxXamlType);
+
+        TEST_CLASS_SETUP(ClassSetup)
+        {
+            InitializeJsonReader();
+            return true;
+        }
     };
 
     void TabTests::EnsureTestsActivate()
@@ -56,7 +68,7 @@ namespace TerminalAppLocalTests
         VERIFY_IS_TRUE(true);
     }
 
-    void TabTests::TryCreateLocalWinRTType()
+    void TabTests::TryCreateSettingsType()
     {
         // Verify we can create a WinRT type we authored
         // Just creating it is enough to know that everything is working.
@@ -68,6 +80,17 @@ namespace TerminalAppLocalTests
         VERIFY_ARE_NOT_EQUAL(oldFontSize, newFontSize);
     }
 
+    void TabTests::TryCreateConnectionType()
+    {
+        // Verify we can create a WinRT type we authored
+        // Just creating it is enough to know that everything is working.
+        winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
+        VERIFY_IS_NOT_NULL(conn);
+        // We're doing this test seperately from the TryCreateSettingsType test,
+        // to ensure both dependent binaries (TemrinalSettings and
+        // TerminalConnection) both work individually.
+    }
+
     void TabTests::TryCreateXamlObjects()
     {
         auto result = RunOnUIThread([]() {
@@ -119,4 +142,26 @@ namespace TerminalAppLocalTests
         VERIFY_SUCCEEDED(result);
     }
 
+    void TabTests::CreateSimpleTerminalXamlType()
+    {
+        winrt::com_ptr<winrt::TerminalApp::implementation::MinMaxCloseControl> mmcc{ nullptr };
+
+        auto result = RunOnUIThread([&mmcc]() {
+            mmcc = winrt::make_self<winrt::TerminalApp::implementation::MinMaxCloseControl>();
+            VERIFY_IS_NOT_NULL(mmcc);
+        });
+        VERIFY_SUCCEEDED(result);
+    }
+
+    void TabTests::CreateTerminalMuxXamlType()
+    {
+        winrt::com_ptr<winrt::TerminalApp::implementation::TabRowControl> tabRowControl{ nullptr };
+
+        auto result = RunOnUIThread([&tabRowControl]() {
+            tabRowControl = winrt::make_self<winrt::TerminalApp::implementation::TabRowControl>();
+            VERIFY_IS_NOT_NULL(tabRowControl);
+        });
+        VERIFY_SUCCEEDED(result);
+    }
+
 }
diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- A note about this project: We're building the test code dll from this
+    project, but it _MUST_ be run in conjunction with the TestHostApp project.
+    TestHostApp actually will build a TestHost executable and packaging bits
+    that we can use to run our tests. We need TestHostApp so that our
+    dependencies, like MUX, can be aggregated correctly, and resources properly
+    combined into a resources.pri file.
+
+    TestHostApp will manually copy the output of this project into it's own
+    OutDir, so we can run the tests from there. -->
+
   <PropertyGroup>
     <ProjectGuid>{CA5CAD1A-b11c-4ddb-a4fe-c3afae9b5506}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -101,85 +112,4 @@
   <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
   <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
 
-  <!-- This project will generate individual sxs manifests for each of our winrt libraries -->
-  <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
-
-  <!-- This is important: actually add the _LocalTestsGenerateCombinedManifests
-    target to the list of targets to run. -->
-  <PropertyGroup>
-    <BeforeLinkTargets Condition="'$(WindowsTargetPlatformVersion)' &gt;= '10.0.18362.0'">
-      $(BeforeLinkTargets);
-      _LocalTestsGenerateCombinedManifests;
-      _LocalTestsBuildAppxManifest;
-      _LocalTestsCopyDependencies;
-    </BeforeLinkTargets>
-  </PropertyGroup>
-
-  <!-- Step 1: Combine all our SxS manifests into a single SxS manifest. TAEF
-  needs us to specify a single activation context at runtime, so we need a
-  single file with all our types in it.-->
-  <Target Name="_LocalTestsGenerateCombinedManifests"
-          Inputs="@(_ConsoleWinmdManifest)"
-          Outputs="$(OutDir)$(TargetName).manifest"
-          DependsOnTargets="_ConsoleGenerateAdditionalWinmdManifests">
-
-    <Exec Command="mt.exe -manifest @(_ConsoleWinmdManifest, ' -manifest ') -out:$(OutDir)$(TargetName).manifest" />
-  </Target>
-
-  <!-- Step 2: Take our combined SxS manifest, and use it to build an
-  Appxmanifest.xml. We'll use the Appxmanifest.prototype.xml in this project's
-  directory as a base, and the script will tak all our activatableClasses and
-  turn them into appxmanifest-compatible Extensions -->
-  <Target Name="_LocalTestsBuildAppxManifest"
-          Inputs="$(OutDir)$(TargetName).manifest"
-          Outputs="$(OutDir)$(TargetName).AppxManifest.xml"
-          DependsOnTargets="_LocalTestsGenerateCombinedManifests">
-
-    <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateAppxFromManifest.ps1 -SxSManifest $(OutDir)$(TargetName).manifest -AppxManifestPrototype $(TargetName).AppxManifest.prototype.xml -OutPath $(OutDir)$(TargetName).AppxManifest.xml" />
-
-  </Target>
-
-  <!-- Step 3: Manually copy all our dependent DLLs into our OutDir. For SxS
-  activation to work, they all need to be in the same directory as our test dll.
-  This is using code that's heavliy cribbed from WindowsTerminal.vcxproj, which
-  is already cribbed from the GetPackagingOutputs in
-  Microsoft.*.AppxPackage.targets. We're filtering this list down to the dlls,
-  pris and xbfs, because this list _can_ contain directories, which will make
-  the Copy task explode. -->
-
-  <PropertyGroup>
-    <_ContinueOnError Condition="'$(BuildingProject)' == 'true'">true</_ContinueOnError>
-    <_ContinueOnError Condition="'$(BuildingProject)' != 'true'">false</_ContinueOnError>
-  </PropertyGroup>
-
-  <!-- First gather the files... -->
-  <Target Name="MyGetPackagingOutputs" Returns="@(MyPackagingOutputs)">
-    <MSBuild
-      Projects="@(ProjectReferenceWithConfiguration)"
-      Targets="GetPackagingOutputs"
-      BuildInParallel="$(BuildInParallel)"
-      Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
-      Condition="'@(ProjectReferenceWithConfiguration)' != ''
-                 and '%(ProjectReferenceWithConfiguration.BuildReference)' == 'true'
-                 and '%(ProjectReferenceWithConfiguration.ReferenceOutputAssembly)' == 'true'"
-      ContinueOnError="$(_ContinueOnError)">
-      <Output TaskParameter="TargetOutputs" ItemName="_PackagingOutputsFromOtherProjects"/>
-    </MSBuild>
-
-    <ItemGroup>
-      <!-- IMPORTANT: Grab all the xbf files _except_ App.xbf. If that's there, then the tests will hyperexplode. -->
-      <MyPackagingOutputs Include="@(_PackagingOutputsFromOtherProjects)" Condition="'%(Extension)'=='.dll' Or '%(Extension)'=='.pri' Or ('%(Extension)'=='.xbf' And '%(Filename)' != 'App')" />
-    </ItemGroup>
-  </Target>
-
-  <!-- Then copy the files to our outdir -->
-  <Target Name="_LocalTestsCopyDependencies"
-          DependsOnTargets="MyGetPackagingOutputs">
-
-    <Copy SourceFiles="@(MyPackagingOutputs)"
-          SkipUnchangedFiles="true"
-          DestinationFolder="$(OutDir)"
-    />
-  </Target>
-
 </Project>
diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest b/src/cascadia/LocalTests_TerminalApp/TestHostApp/Package.appxmanifest
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
+  <Identity Name="WindowsTerminal.TestHost" Publisher="CN=Windows Terminal Team" Version="1.0.0.0" />
+  <mp:PhoneIdentity PhoneProductId="fba054a7-f1a1-4cb7-bb21-4949919af2f5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Properties>
+    <DisplayName>TestHostApp</DisplayName>
+    <PublisherDisplayName>migrie</PublisherDisplayName>
+    <Logo>taef.png</Logo>
+    <uap:SupportedUsers>multiple</uap:SupportedUsers>
+  </Properties>
+  <Dependencies>
+    <!-- We're manually setting the version here, because the CI only runs windows 17763 -->
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.17763.0" />
+  </Dependencies>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="taef.executionengine.universal.App" Executable="$targetnametoken$.exe" EntryPoint="TestHostApp.App">
+      <uap:VisualElements DisplayName="TestHostApp" Square150x150Logo="taef.png" Square44x44Logo="taef.png" Description="TestHostApp" BackgroundColor="transparent">
+        <uap:DefaultTile Wide310x150Logo="taef.png">
+        </uap:DefaultTile>
+        <uap:SplashScreen Image="taef.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>