From b3b26b4f694c091b745733e17ce7be559cf27aa1 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 27 Aug 2024 16:29:00 -0500
Subject: [PATCH] Whoops M.T.UI shouldn't be in the cmdpal code - I didn't
 understand how VS works with C#

---
 src/modules/cmdpal/WindowsCommandPalette.sln  |  2 +-
 .../Microsoft.Terminal.UI/Converters.cpp      |  0
 .../Microsoft.Terminal.UI/Converters.h        |  0
 .../Microsoft.Terminal.UI/Converters.idl      |  0
 .../IDirectKeyListener.idl                    |  0
 .../IconPathConverter.cpp                     |  0
 .../Microsoft.Terminal.UI/IconPathConverter.h |  0
 .../IconPathConverter.idl                     |  0
 .../Microsoft.Terminal.UI.def                 |  0
 .../Microsoft.Terminal.UI.vcxproj             | 20 +++++++++----------
 .../Microsoft.Terminal.UI/ResourceString.cpp  |  0
 .../Microsoft.Terminal.UI/ResourceString.h    |  0
 .../Microsoft.Terminal.UI/ResourceString.idl  |  0
 .../Microsoft.Terminal.UI/init.cpp            |  0
 .../Microsoft.Terminal.UI/packages.config     |  0
 .../Microsoft.Terminal.UI/pch.cpp             |  0
 .../Microsoft.Terminal.UI/pch.h               |  0
 .../Microsoft.Terminal.UI/til_string.h        |  0
 .../Microsoft.Terminal.UI/version.rc          |  0
 .../WindowsCommandPalette.csproj              |  2 +-
 20 files changed, 12 insertions(+), 12 deletions(-)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/Converters.cpp (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/Converters.h (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/Converters.idl (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/IDirectKeyListener.idl (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/IconPathConverter.cpp (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/IconPathConverter.h (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/IconPathConverter.idl (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj (81%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/ResourceString.cpp (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/ResourceString.h (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/ResourceString.idl (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/init.cpp (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/packages.config (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/pch.cpp (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/pch.h (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/til_string.h (100%)
 rename src/modules/cmdpal/src/{WindowsCommandPalette => }/Microsoft.Terminal.UI/version.rc (100%)

diff --git a/src/modules/cmdpal/WindowsCommandPalette.sln b/src/modules/cmdpal/WindowsCommandPalette.sln
index e6990f1941..6ea31ece06 100644
--- a/src/modules/cmdpal/WindowsCommandPalette.sln
+++ b/src/modules/cmdpal/WindowsCommandPalette.sln
@@ -10,7 +10,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AllApps", "src\BuiltinComma
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Builtins", "Builtins", "{B7FF739F-7716-4FC3-B622-705486187B87}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\WindowsCommandPalette\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{FAA24D36-5515-467C-91E7-101A189AAF48}"
 EndProject
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.cpp b/src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.cpp
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.cpp
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.cpp
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.h b/src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.h
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.h
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.h
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.idl b/src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.idl
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.idl
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.idl
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IDirectKeyListener.idl b/src/modules/cmdpal/src/Microsoft.Terminal.UI/IDirectKeyListener.idl
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IDirectKeyListener.idl
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/IDirectKeyListener.idl
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.cpp b/src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.cpp
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.cpp
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.cpp
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.h b/src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.h
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.h
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.h
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.idl b/src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.idl
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.idl
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.idl
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def b/src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
similarity index 81%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
index 9ee0f66271..00315296bc 100644
--- a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
 
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -256,20 +256,20 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
-    <Import Project="..\..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
 
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
-    <Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
 
   </Target>
   <ItemGroup>
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.cpp b/src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.cpp
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.cpp
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.cpp
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.h b/src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.h
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.h
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.h
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.idl b/src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.idl
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.idl
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.idl
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/init.cpp b/src/modules/cmdpal/src/Microsoft.Terminal.UI/init.cpp
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/init.cpp
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/init.cpp
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/packages.config b/src/modules/cmdpal/src/Microsoft.Terminal.UI/packages.config
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/packages.config
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/packages.config
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/pch.cpp b/src/modules/cmdpal/src/Microsoft.Terminal.UI/pch.cpp
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/pch.cpp
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/pch.cpp
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/pch.h b/src/modules/cmdpal/src/Microsoft.Terminal.UI/pch.h
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/pch.h
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/pch.h
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/til_string.h b/src/modules/cmdpal/src/Microsoft.Terminal.UI/til_string.h
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/til_string.h
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/til_string.h
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/version.rc b/src/modules/cmdpal/src/Microsoft.Terminal.UI/version.rc
similarity index 100%
rename from src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/version.rc
rename to src/modules/cmdpal/src/Microsoft.Terminal.UI/version.rc
diff --git a/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj b/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
index e251798920..f34577dbbb 100644
--- a/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
+++ b/src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
@@ -78,7 +78,7 @@
     <ProjectReference Include="..\BuiltinCommands\AllApps\AllApps.csproj" />
     <ProjectReference Include="..\BuiltinCommands\Calculator\Calculator.csproj" />
     <ProjectReference Include="..\common\CmdPal.Common.csproj" />
-    <ProjectReference Include="Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
+    <ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
       <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
       <Private>True</Private>
       <CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>