go go pgo

build/Helix/PrepareHelixPayload.ps1

@@ -52,3 +52,9 @@ Copy-Item "build\helix\HelixTestHelpers.cs" "$payloadDir"
 Copy-Item "build\helix\runtests.cmd" $payloadDir
 Copy-Item "build\helix\InstallTestAppDependencies.ps1" "$payloadDir"
 Copy-Item "build\Helix\EnsureMachineState.ps1" "$payloadDir"
+
+# Copy the APPX package from the 'drop' artifact dir
+Copy-Item "$repoDirectory\Artifacts\$ArtifactName\appx\CascadiaPackage_0.0.1.0_$Platform.msix" $payloadDir
+
+# Extract the APPX package
+Expand-Archive -LiteralPath $payloadDir\CascadiaPackage_0.0.1.0_$Platform.msix -DestinationPath $payloadDir\appx

build/Helix/RunTestsInHelix.proj

@@ -16,4 +16,5 @@
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-TerminalAppLocalTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-SettingsModelLocalTests.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
   <Import Project="$(ProjFilesPath)\RunTestsInHelix-HostTestsUIA.proj" Condition=" '$(TestSuite)'=='DevTestSuite' " />
+  <Import Project="$(ProjFilesPath)\RunTestsInHelix-WindowsTerminalUIATests.proj" Condition=" '$(TestSuite)'=='PgoInstrumentationSuite' " />
 </Project>

build/Helix/runtests.cmd

@@ -28,7 +28,7 @@ echo %TIME%
 powershell -ExecutionPolicy Bypass .\InstallTestAppDependencies.ps1
 echo %TIME%
 
-set testBinaryCandidates=TerminalApp.LocalTests.dll SettingsModel.LocalTests.dll Conhost.UIA.Tests.dll
+set testBinaryCandidates=TerminalApp.LocalTests.dll SettingsModel.LocalTests.dll Conhost.UIA.Tests.dll WindowsTerminal.UIA.Tests.dll
 set testBinaries=
 for %%B in (%testBinaryCandidates%) do (
     if exist %%B (

build/pipelines/templates/build-console-pgo.yml

@@ -27,6 +27,7 @@ jobs:
     dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
     condition: succeeded()
     testSuite: 'PgoInstrumentationSuite'
+    taefQuery: '@IsPgo=true'
     rerunPassesRequiredToAvoidFailure: ${{ parameters.rerunPassesRequiredToAvoidFailure }}
 
 - template: helix-processtestresults-job.yml

build/pipelines/templates/pgo-merge-pgd-job.yml

@@ -41,6 +41,42 @@ jobs:
     displayName: 'Merge OpenConsole pgc files into pgd'
     workingDirectory: $(pgoArtifactsPath)
 
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Control*.pgc Microsoft.Terminal.Control.pgd
+    displayName: 'Merge Microsoft.Terminal.Control pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Remoting*.pgc Microsoft.Terminal.Remoting.pgd
+    displayName: 'Merge Microsoft.Terminal.Remoting pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+   - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Settings.Editor*.pgc Microsoft.Terminal.Settings.Editor.pgd
+    displayName: 'Merge Microsoft.Terminal.Settings.Editor pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+   - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge Microsoft.Terminal.Settings.Model*.pgc Microsoft.Terminal.Settings.Model.pgd
+    displayName: 'Merge Microsoft.Terminal.Settings.Model pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge TerminalApp*.pgc TerminalApp.pgd
+    displayName: 'Merge TerminalApp pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
+  - script: |
+      cd $(buildPlatform)
+      "%VCToolsInstallDir%\bin\hostx64\x64\pgomgr.exe" /merge TerminalConnection*.pgc TerminalConnection.pgd
+    displayName: 'Merge TerminalConnection pgc files into pgd'
+    workingDirectory: $(pgoArtifactsPath)
+
   - task: CopyFiles@2
     displayName: 'Copy merged pgd to artifact staging'
     inputs:

src/cascadia/Remoting/dll/Microsoft.Terminal.Remoting.vcxproj

@@ -10,6 +10,7 @@
     <SubSystem>Console</SubSystem>
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <PgoTarget>true</PgoTarget>
   </PropertyGroup>
   <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
@@ -61,8 +62,8 @@
     <Link>
       <AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <!-- Our lib contains a DllMain that we need to force the use of. -->
-      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Reference>
       <!-- Do not propagate microsoft.ui.xaml upwards as a private dependency. -->

src/cascadia/TerminalApp/dll/TerminalApp.vcxproj

@@ -10,6 +10,7 @@
     <SubSystem>Console</SubSystem>
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <PgoTarget>true</PgoTarget>
   </PropertyGroup>
   <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
@@ -105,8 +106,8 @@
     <Link>
       <AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;WinMM.Lib;%(AdditionalDependencies)</AdditionalDependencies>
       <!-- TerminalAppLib contains a DllMain that we need to force the use of. -->
-      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />

src/cascadia/TerminalConnection/TerminalConnection.vcxproj

@@ -7,6 +7,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <SubSystem>Console</SubSystem>
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <PgoTarget>true</PgoTarget>
   </PropertyGroup>
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
@@ -87,4 +88,4 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
-</Project>
+</Project>

src/cascadia/TerminalControl/dll/TerminalControl.vcxproj

@@ -10,6 +10,7 @@
     <SubSystem>Console</SubSystem>
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <PgoTarget>true</PgoTarget>
 
     <!-- C++/WinRT sets the depth to 1 if there is a XAML file in the project
          Unfortunately for us, we need it to be 3. When the namespace merging
@@ -87,8 +88,8 @@
       If you don't have this, then you'll see an error like
       "(init.obj) : error LNK2005: DllMain already defined in MSVCRTD.lib(dll_dllmain_stub.obj)"
       -->
-      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain %(AdditionalOptions)</AdditionalOptions>
 
       <Reference>
         <!-- Do not propagate microsoft.ui.xaml upwards as a private dependency. -->

src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj

@@ -20,6 +20,7 @@
     <SubSystem>Console</SubSystem>
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <PgoTarget>true</PgoTarget>
     <!-- C++/WinRT sets the depth to 1 if there is a XAML file in the project
       Unfortunately for us, we need it to be 3. When the namespace merging
       depth is 1, Microsoft.Terminal.Control becomes "Microsoft",

src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj

@@ -10,6 +10,7 @@
     <SubSystem>Console</SubSystem>
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+    <PgoTarget>true</PgoTarget>
   </PropertyGroup>
   <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
@@ -114,8 +115,8 @@
     <Link>
       <AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <!-- TSM Lib contains a DllMain that we need to force the use of. -->
-      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <Reference>
       <!-- Do not propagate microsoft.ui.xaml upwards as a private dependency. -->

src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj

@@ -17,13 +17,12 @@
     <!-- IMPORTANT! cppwinrt.pre.props specifies 17134 -->
     <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
     <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
+    <PgoTarget>true</PgoTarget>
   </PropertyGroup>
 
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Condition="'$(Configuration)' == 'Release'" Project="$(SolutionDir)\src\common.pgo.compile.props" />
-  <Import Condition="'$(PGOBuildMode)' == 'Optimize'" Project="$(SolutionDir)\tools\PGODatabase\PGO.version.props" />
-
+
   <ItemDefinitionGroup>
     <ClCompile>
       <SDLCheck>true</SDLCheck>
@@ -172,7 +171,6 @@
     </ItemGroup>
     <!-- **END VC LIBS HACK** -->
   </Target>
-  <Import Condition="'$(PGOBuildMode)' == 'Optimize'" Project="..\..\packages\$(PGODatabaseId).$(PGODatabaseVersion)\build\PGO.targets" />
   <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
   <Import Project="..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets" Condition="Exists('..\..\..\packages\Terminal.ThemeHelpers.0.2.200324001\build\native\Terminal.ThemeHelpers.targets')" />
 </Project>

src/cascadia/WindowsTerminal_UIATests/Common/Globals.cs

@@ -7,6 +7,7 @@
 namespace WindowsTerminal.UIA.Tests.Common
 {
     using System;
+    using WEX.TestExecution.Markup;
 
     public static class Globals
     {
@@ -23,5 +24,26 @@ public static void WaitForLongTimeout()
         {
             System.Threading.Thread.Sleep(Globals.LongTimeout);
         }
+
+
+        static string[] modules =
+        {
+            "WindowsTerminal.exe",
+            "OpenConsole.exe",
+            "Microsoft.Terminal.Control.dll",
+            "Microsoft.Terminal.Remoting.dll",
+            "Microsoft.Terminal.Settings.Editor.dll",
+            "Microsoft.Terminal.Settings.Model.dll",
+            "TerminalApp.dll",
+            "TerminalConnection.dll"
+        };
+
+        public static void SweepAllModules(TestContext context)
+        {
+            foreach (var mod in modules)
+            {
+                PgoManager.PgoSweepIfInstrumented(context, mod);
+            }
+        }
     }
 }

src/cascadia/WindowsTerminal_UIATests/Common/PgoManager.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using WEX.Logging.Interop;
+using WEX.TestExecution.Markup;
+
+namespace WindowsTerminal.UIA.Tests.Common
+{
+    public static class PgoManager
+    {
+        public static void PgoSweepIfInstrumented(TestContext context, string assemblyName)
+        {
+#if PGO_INSTRUMENT
+            string pgcFileName = context.TestName;
+            Log.Comment($"Running pgosweep on '{assemblyName}' for test: {pgcFileName}");
+            try
+            {
+                var startInfo = new ProcessStartInfo() {
+                    FileName = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, "pgosweep.exe")),
+                    Arguments = $"{assemblyName} {assemblyName}-{pgcFileName}.pgc",
+                    UseShellExecute = false,
+                    RedirectStandardOutput = true
+                };
+                using (var process = Process.Start(startInfo))
+                {
+                    var output = new StringBuilder();
+                    while (!process.HasExited)
+                    {
+                        Log.Comment(process.StandardOutput.ReadToEnd());
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Comment("Failed trying to pgosweep. " + ex.ToString());
+                throw;
+            }
+#endif
+        }
+    }
+}

src/cascadia/WindowsTerminal_UIATests/Elements/TerminalApp.cs

@@ -46,7 +46,7 @@ public TerminalApp(TestContext context)
         {
             this.context = context;
 
-            string path = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, @"..\..\..\src\cascadia\CascadiaPackage\bin\x64\debug\Appx\WindowsTerminal.exe"));
+            string path = Path.GetFullPath(Path.Combine(context.TestDeploymentDir, @"appx\WindowsTerminal.exe"));
             if (context.Properties.Contains("WTPath"))
             {
                 path = (string)context.Properties["WTPath"];
@@ -143,6 +143,8 @@ private bool IsRunningAsAdmin()
 
         private void ExitProcess()
         {
+            Globals.SweepAllModules(this.context);
+
             // Release attachment to the child process console.
             WinCon.FreeConsole();
 

src/cascadia/WindowsTerminal_UIATests/SmokeTests.cs

@@ -19,6 +19,7 @@ public class SmokeTests
         public TestContext TestContext { get; set; }
 
         [TestMethod]
+        [TestProperty("IsPGO", "true")]
         public void StartTerminal()
         {
             using (TerminalApp app = new TerminalApp(TestContext))

src/cascadia/WindowsTerminal_UIATests/WindowsTerminal.UIA.Tests.csproj

@@ -19,6 +19,7 @@
     <WarningLevel>4</WarningLevel>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PGOBuildMode>Instrument</PGOBuildMode>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
@@ -39,6 +40,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants Condition="'$(PGOBuildMode)' == 'Instrument'">$(DefineConstants);PGO_INSTRUMENT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="appium-dotnet-driver, Version=3.0.0.2, Culture=neutral, processorArchitecture=MSIL">
@@ -89,6 +91,7 @@
   <ItemGroup>
     <Compile Include="Common\Globals.cs" />
     <Compile Include="Common\NativeMethods.cs" />
+    <Compile Include="Common\PgoManager.cs" />
     <Compile Include="Elements\TerminalApp.cs" />
     <Compile Include="Init.cs" />
     <Compile Include="SmokeTests.cs" />

src/common.build.post.props

@@ -33,6 +33,10 @@
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
+  <!-- PGO -->
+  <Import Condition="'$(PgoTarget)' == 'true' And '$(PGOBuildMode)' == 'Optimize'" Project="..\..\packages\$(PGODatabaseId).$(PGODatabaseVersion)\build\PGO.targets" />
+  <Import Condition="'$(PgoTarget)' == 'true' And '$(PGOBuildMode)' == 'Instrument'" Project="$(SolutionDir)\src\common.pgo.runtime.props" />
+
   <!-- Exclude our dependencies from static analysis. CAExcludePath can only be
        set after we've imported Microsoft.Cpp.targets -->
   <PropertyGroup>

src/common.build.pre.props

@@ -14,6 +14,8 @@
     <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntermediateOutputPath>$(IntDir)</IntermediateOutputPath>
 
+    <PGOBuildMode>Instrument</PGOBuildMode>
+
     <!-- Both pairs of OutDir/OutputPath and IntDir/IntermediateOutputPath must be set;
          different parts of the project infrastructure use them (without rhyme or reason.) -->
   </PropertyGroup>
@@ -156,6 +158,9 @@
     </Link>
   </ItemDefinitionGroup>
 
+  <Import Condition="'$(PgoTarget)' == 'true' And '$(Configuration)' == 'Release'" Project="$(SolutionDir)\src\common.pgo.compile.props" />
+  <Import Condition="'$(PgoTarget)' == 'true' And '$(PGOBuildMode)' == 'Optimize'" Project="$(SolutionDir)\tools\PGODatabase\PGO.version.props" />
+
   <!-- For Win32 (x86) ONLY ... we use all defaults for AMD64. No def for those. -->
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <ClCompile>

src/host/exe/Host.EXE.vcxproj

@@ -7,10 +7,9 @@
     <ProjectName>Host.EXE</ProjectName>
     <TargetName>OpenConsole</TargetName>
     <ConfigurationType>Application</ConfigurationType>
+    <PgoTarget>true</PgoTarget>
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
-  <Import Condition="'$(Configuration)' == 'Release'" Project="$(SolutionDir)\src\common.pgo.compile.props" />
-  <Import Condition="'$(PGOBuildMode)' == 'Optimize'" Project="$(SolutionDir)\tools\PGODatabase\PGO.version.props" />
   <ItemGroup>
     <ClInclude Include="..\precomp.h" />
     <ClInclude Include="CConsoleHandoff.h" />
@@ -91,7 +90,6 @@
       <AdditionalDependencies>WinMM.Lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <Import Condition="'$(PGOBuildMode)' == 'Optimize'" Project="..\..\packages\$(PGODatabaseId).$(PGODatabaseVersion)\build\PGO.targets" />
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
   <Import Project="..\..\common.build.post.props" />
-</Project>
+</Project>

tools/PGODatabase/NuSpecs/PGO.nuspec.template

@@ -17,5 +17,17 @@
     <file target="tools\x64\WindowsTerminal.pgd" src="tools\x64\WindowsTerminal.pgd"/>
     <file target="tools\x86\OpenConsole.pgd" src="tools\x86\OpenConsole.pgd"/>
     <file target="tools\x64\OpenConsole.pgd" src="tools\x64\OpenConsole.pgd"/>
+    <file target="tools\x86\Microsoft.Terminal.Control.pgd" src="tools\x86\Microsoft.Terminal.Control.pgd"/>
+    <file target="tools\x64\Microsoft.Terminal.Control.pgd" src="tools\x64\Microsoft.Terminal.Control.pgd"/>
+    <file target="tools\x86\Microsoft.Terminal.Remoting.pgd" src="tools\x86\Microsoft.Terminal.Remoting.pgd"/>
+    <file target="tools\x64\Microsoft.Terminal.Remoting.pgd" src="tools\x64\Microsoft.Terminal.Remoting.pgd"/>
+    <file target="tools\x86\Microsoft.Terminal.Settings.Editor.pgd" src="tools\x86\Microsoft.Terminal.Settings.Editor.pgd"/>
+    <file target="tools\x64\Microsoft.Terminal.Settings.Editor.pgd" src="tools\x64\Microsoft.Terminal.Settings.Editor.pgd"/>
+    <file target="tools\x86\Microsoft.Terminal.Settings.Model.pgd" src="tools\x86\Microsoft.Terminal.Settings.Model.pgd"/>
+    <file target="tools\x64\Microsoft.Terminal.Settings.Model.pgd" src="tools\x64\Microsoft.Terminal.Settings.Model.pgd"/>
+    <file target="tools\x86\TerminalApp.pgd" src="tools\x86\TerminalApp.pgd"/>
+    <file target="tools\x64\TerminalApp.pgd" src="tools\x64\TerminalApp.pgd"/>
+    <file target="tools\x86\TerminalConnection.pgd" src="tools\x86\TerminalConnection.pgd"/>
+    <file target="tools\x64\TerminalConnection.pgd" src="tools\x64\TerminalConnection.pgd"/>
   </files>
 </package>