Explicitly introduce and use profile generator icons; add VS logo

Author: carlos-zamora

src/cascadia/CascadiaPackage/ProfileGeneratorIcons/AzureCloudShell.png

@@ -21,6 +21,11 @@
       <DeploymentContent>true</DeploymentContent>
       <Link>ProfileIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
+    <!-- Profile Generator Icons -->
+    <Content Include="$(OpenConsoleDir)src\cascadia\CascadiaPackage\ProfileGeneratorIcons\**\*">
+      <DeploymentContent>true</DeploymentContent>
+      <Link>ProfileGeneratorIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
+    </Content>
     <!-- Default Settings -->
     <Content Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\defaults.json">
       <DeploymentContent>true</DeploymentContent>

src/cascadia/CascadiaPackage/ProfileGeneratorIcons/PowerShell.png

@@ -14,7 +14,7 @@ using namespace ::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 
-std::wstring_view PROFILE_ICON_PATH_HIGH_RES{ L"ms-appx:///ProfileIcons/{b453ae62-4e3d-5e58-b989-0a998ec441b8}.scale-200.png" };
+std::wstring_view GENERATOR_ICON_PATH{ L"ms-appx:///ProfileGeneratorIcons/AzureCloudShell.png" };
 
 std::wstring_view AzureCloudShellGenerator::GetNamespace() const noexcept
 {
@@ -28,7 +28,7 @@ std::wstring_view AzureCloudShellGenerator::GetDisplayName() const noexcept
 
 std::wstring_view AzureCloudShellGenerator::GetIcon() const noexcept
 {
-    return PROFILE_ICON_PATH_HIGH_RES;
+    return GENERATOR_ICON_PATH;
 }
 
 // Method Description:

src/cascadia/CascadiaPackage/ProfileGeneratorIcons/SSH.png

@@ -21,8 +21,8 @@ static constexpr std::wstring_view POWERSHELL_PFN{ L"Microsoft.PowerShell_8wekyb
 static constexpr std::wstring_view POWERSHELL_PREVIEW_PFN{ L"Microsoft.PowerShellPreview_8wekyb3d8bbwe" };
 static constexpr std::wstring_view PWSH_EXE{ L"pwsh.exe" };
 static constexpr std::wstring_view POWERSHELL_ICON{ L"ms-appx:///ProfileIcons/pwsh.png" };
-static constexpr std::wstring_view POWERSHELL_ICON_HIGH_RES{ L"ms-appx:///ProfileIcons/pwsh.scale-200.png" };
 static constexpr std::wstring_view POWERSHELL_PREVIEW_ICON{ L"ms-appx:///ProfileIcons/pwsh-preview.png" };
+static constexpr std::wstring_view GENERATOR_POWERSHELL_ICON{ L"ms-appx:///ProfileGeneratorIcons/PowerShell.png" };
 static constexpr std::wstring_view POWERSHELL_PREFERRED_PROFILE_NAME{ L"PowerShell" };
 
 namespace
@@ -303,7 +303,7 @@ std::wstring_view PowershellCoreProfileGenerator::GetDisplayName() const noexcep
 
 std::wstring_view PowershellCoreProfileGenerator::GetIcon() const noexcept
 {
-    return POWERSHELL_ICON_HIGH_RES;
+    return GENERATOR_POWERSHELL_ICON;
 }
 
 // Method Description:

src/cascadia/CascadiaPackage/ProfileGeneratorIcons/VisualStudio.png

@@ -13,7 +13,7 @@ static constexpr std::wstring_view SshHostGeneratorNamespace{ L"Windows.Terminal
 
 static constexpr std::wstring_view PROFILE_TITLE_PREFIX = L"SSH - ";
 static constexpr std::wstring_view PROFILE_ICON_PATH = L"ms-appx:///ProfileIcons/{550ce7b8-d500-50ad-8a1a-c400c3262db3}.png";
-static constexpr std::wstring_view PROFILE_ICON_PATH_HIGH_RES = L"ms-appx:///ProfileIcons/{550ce7b8-d500-50ad-8a1a-c400c3262db3}.scale-200.png";
+static constexpr std::wstring_view GENERATOR_ICON_PATH = L"ms-appx:///ProfileGeneratorIcons/SSH.png";
 
 // OpenSSH is installed under System32 when installed via Optional Features
 static constexpr std::wstring_view SSH_EXE_PATH1 = L"%SystemRoot%\\System32\\OpenSSH\\ssh.exe";
@@ -141,7 +141,7 @@ std::wstring_view SshHostGenerator::GetDisplayName() const noexcept
 
 std::wstring_view SshHostGenerator::GetIcon() const noexcept
 {
-    return PROFILE_ICON_PATH_HIGH_RES;
+    return GENERATOR_ICON_PATH;
 }
 
 // Method Description:

src/cascadia/CascadiaPackage/ProfileGeneratorIcons/WSL.png

@@ -11,8 +11,7 @@
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 
 std::wstring_view VisualStudioGenerator::Namespace{ L"Windows.Terminal.VisualStudio" };
-// TODO CARLOS: Can we get the plain Visual Studio logo that looks like this: |><| ?
-static constexpr std::wstring_view IconHighRes{ L"ms-appx:///ProfileIcons/vs-pwsh.scale-200.png" };
+static constexpr std::wstring_view IconPath{ L"ms-appx:///ProfileGeneratorIcons/VisualStudio.png" };
 
 std::wstring_view VisualStudioGenerator::GetNamespace() const noexcept
 {
@@ -26,7 +25,7 @@ std::wstring_view VisualStudioGenerator::GetDisplayName() const noexcept
 
 std::wstring_view VisualStudioGenerator::GetIcon() const noexcept
 {
-    return IconHighRes;
+    return IconPath;
 }
 
 void VisualStudioGenerator::GenerateProfiles(std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const

src/cascadia/CascadiaResources.build.items

@@ -14,7 +14,7 @@ static constexpr std::wstring_view WslHomeDirectory{ L"~" };
 static constexpr std::wstring_view DockerDistributionPrefix{ L"docker-desktop" };
 static constexpr std::wstring_view RancherDistributionPrefix{ L"rancher-desktop" };
 static constexpr std::wstring_view IconPath{ L"ms-appx:///ProfileIcons/{9acb9455-ca41-5af7-950f-6bca1bc9722f}.png" };
-static constexpr std::wstring_view IconPathHighRes{ L"ms-appx:///ProfileIcons/{9acb9455-ca41-5af7-950f-6bca1bc9722f}.scale-200.png" };
+static constexpr std::wstring_view GeneratorIconPath{ L"ms-appx:///ProfileGeneratorIcons/WSL.png" };
 
 // The WSL entries are structured as such:
 // HKCU\Software\Microsoft\Windows\CurrentVersion\Lxss
@@ -57,7 +57,7 @@ std::wstring_view WslDistroGenerator::GetDisplayName() const noexcept
 
 std::wstring_view WslDistroGenerator::GetIcon() const noexcept
 {
-    return IconPathHighRes;
+    return GeneratorIconPath;
 }
 
 static winrt::com_ptr<implementation::Profile> makeProfile(const std::wstring& distName)