From 1ceda62f78b7cf2fc74605d70982c3749b95890f Mon Sep 17 00:00:00 2001
From: Carlos Zamora <carlos.zamora@microsoft.com>
Date: Mon, 22 Jul 2024 17:12:11 -0700
Subject: [PATCH] It works! (still needs changes for admin mode tho)

---
 NuGet.Config                                  |  6 ++---
 ...ckageManager.ComInterop.Additional.targets | 11 +++++++-
 .../TerminalApp/TerminalAppLib.vcxproj        |  6 ++---
 .../TerminalAppLib.vcxproj.filters            | 27 ++++++++++---------
 src/cascadia/TerminalApp/packages.config      |  4 ---
 .../WindowsTerminal/WindowsTerminal.vcxproj   |  1 +
 src/common.nugetversions.targets              |  2 +-
 7 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 src/cascadia/TerminalApp/packages.config

diff --git a/NuGet.Config b/NuGet.Config
index 052658fed7f..272d5f0b400 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <!-- <clear /> -->
+        <clear />
         <!-- Dependencies that we can turn on to force override for testing purposes before uploading. -->
         <!--<add key="Static Package Dependencies" value="dep\packages" />-->
         <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
     </packageSources>
-    <!-- <disabledPackageSources>
+    <disabledPackageSources>
         <clear />
-    </disabledPackageSources> -->
+    </disabledPackageSources>
     <config>
         <!-- TODO: TEMPORARY UNTIL PGO-Helpers is updated to search both. We shouldn't need to keep the globals path here. -->
         <add key="globalPackagesFolder" value=".\packages" />
diff --git a/build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets b/build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets
index dcb4233fb1c..85a36138e6e 100644
--- a/build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets
+++ b/build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets
@@ -8,7 +8,16 @@
   <ItemGroup>
     <Reference Include="$(WinGetPackageRoot)\lib\Microsoft.Management.Deployment.winmd">
       <IsWinMDFile>true</IsWinMDFile>
-      <Implementation>$(WinGetPackageRoot)\runtimes\win10-$(Native-Platform)\native\winrtact.dll</Implementation>
     </Reference>
   </ItemGroup>
+  <Target Name="_FixWinGetWinmdPackaging" BeforeTargets="_ComputeAppxPackagePayload">
+    <ItemGroup>
+      <PackagingOutputs Include="$(WinGetPackageRoot)\lib\Microsoft.Management.Deployment.winmd">
+        <OutputGroup>CustomOutputGroupForPackaging</OutputGroup>
+        <ProjectName>$(ProjectName)</ProjectName>
+        <Implementation>winrtact.dll</Implementation>
+        <TargetPath>Microsoft.Management.Deployment.winmd</TargetPath>
+      </PackagingOutputs>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
index 2d4d4622aeb..a34ea6272bc 100644
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj
@@ -25,7 +25,7 @@
   <PropertyGroup Label="NuGet Dependencies">
     <TerminalCppWinrt>true</TerminalCppWinrt>
     <TerminalMUX>true</TerminalMUX>
-    <TerminalWinGetOutOfProc>true</TerminalWinGetOutOfProc>
+    <TerminalWinGetInterop>true</TerminalWinGetInterop>
   </PropertyGroup>
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\common.nugetversions.props" />
@@ -415,6 +415,7 @@
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\UIHelpers\UIHelpers.vcxproj">
       <Project>{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}</Project>
     </ProjectReference>
+
   </ItemGroup>
   <PropertyGroup>
     <!-- This is a hack to get the ARM64 CI build working. See
@@ -466,9 +467,6 @@
       <IsSystemReference>True</IsSystemReference>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
index fb72643bbb9..0f6468fd6b9 100644
--- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
+++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj.filters
@@ -2,11 +2,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
-    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
   </ItemGroup>
   <ItemGroup>
     <PRIResource Include="Resources\en-US\Resources.resw" />
-    <PRIResource Include="Resources\en-US\ContextMenu.resw" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="init.cpp" />
@@ -23,6 +21,9 @@
     <ClCompile Include="ColorHelper.cpp" />
     <ClCompile Include="DebugTapConnection.cpp" />
     <ClCompile Include="Jumplist.cpp" />
+    <ClCompile Include="Tab.cpp">
+      <Filter>tab</Filter>
+    </ClCompile>
     <ClCompile Include="FilteredCommand.cpp">
       <Filter>commandPalette</Filter>
     </ClCompile>
@@ -57,6 +58,9 @@
     <ClInclude Include="DebugTapConnection.h" />
     <ClInclude Include="ColorHelper.h" />
     <ClInclude Include="Jumplist.h" />
+    <ClInclude Include="Tab.h">
+      <Filter>tab</Filter>
+    </ClInclude>
     <ClInclude Include="FilteredCommand.h">
       <Filter>commandPalette</Filter>
     </ClInclude>
@@ -88,6 +92,10 @@
     <Midl Include="ShortcutActionDispatch.idl">
       <Filter>settings</Filter>
     </Midl>
+    <Midl Include="IDirectKeyListener.idl" />
+    <Midl Include="SettingsTab.idl">
+      <Filter>tab</Filter>
+    </Midl>
     <Midl Include="TerminalTab.idl">
       <Filter>tab</Filter>
     </Midl>
@@ -102,10 +110,9 @@
     </Midl>
     <Midl Include="PaletteItemTemplateSelector.idl" />
     <Midl Include="TabBase.idl" />
-    <Midl Include="TerminalWindow.idl" />
-    <Midl Include="TaskbarState.idl" />
-    <Midl Include="IPaneContent.idl" />
-    <Midl Include="TerminalSettingsCache.idl" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="MinMaxCloseControl.xaml">
@@ -144,9 +151,6 @@
     <Page Include="HighlightedTextControl.xaml">
       <Filter>highlightedText</Filter>
     </Page>
-    <Page Include="AboutDialog.xaml" />
-    <Page Include="SuggestionsControl.xaml" />
-    <Page Include="SnippetsPaneContent.xaml" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="app">
@@ -176,7 +180,4 @@
       <Filter>app</Filter>
     </ApplicationDefinition>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/cascadia/TerminalApp/packages.config b/src/cascadia/TerminalApp/packages.config
deleted file mode 100644
index 350d191db7c..00000000000
--- a/src/cascadia/TerminalApp/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.WindowsPackageManager.InProcCom" version="1.8.1911" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
index 331252ddec7..b949e915dde 100644
--- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
+++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj
@@ -20,6 +20,7 @@
     <TerminalCppWinrt>true</TerminalCppWinrt>
     <TerminalThemeHelpers>true</TerminalThemeHelpers>
     <TerminalMUX>true</TerminalMUX>
+    <TerminalWinGetInterop>true</TerminalWinGetInterop>
   </PropertyGroup>
 
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
diff --git a/src/common.nugetversions.targets b/src/common.nugetversions.targets
index d8f805981f6..2f3368c5c94 100644
--- a/src/common.nugetversions.targets
+++ b/src/common.nugetversions.targets
@@ -65,7 +65,7 @@
     <Import Project="$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\packages\Microsoft.Windows.ImplementationLibrary.1.0.240122.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
 
     <!-- WinGet Out-of-proc -->
-    <Import Project="$(MSBuildThisFileDirectory)..\build\rules\Microsoft.WindowsPackageManager.ComInterop.Additional.targets" Condition="'$(TerminalWinGetOutOfProc)' == 'true'" />
+    <Import Project="$(MSBuildThisFileDirectory)..\build\rules\Microsoft.WindowsPackageManager.ComInterop.Additional.targets" Condition="'$(TerminalWinGetInterop)' == 'true'" />
   </ImportGroup>
 
   <Target Name="Terminal_EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">