apply feedback

Author: carlos-zamora

src/cascadia/CascadiaPackage/ProfileIcons/Powershell_black_64.png

@@ -238,10 +238,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     public:
         FragmentProfileEntry(winrt::guid profileGuid, hstring json) :
             _profileGuid{ profileGuid },
-            _Json{ json } {}
+            Json{ json } {}
 
         winrt::guid ProfileGuid() const noexcept { return _profileGuid; }
-        WINRT_PROPERTY(hstring, Json);
+        til::property<hstring> Json;
 
     private:
         winrt::guid _profileGuid;

src/cascadia/TerminalSettingsModel/CascadiaSettings.h

@@ -179,8 +179,21 @@ SettingsLoader::SettingsLoader(const std::string_view& userJSON, const std::stri
 // (meaning profiles specified by the application rather by the user).
 void SettingsLoader::GenerateProfiles()
 {
-    PowershellCoreProfileGenerator powerShellGenerator{};
-    _executeGenerator(powerShellGenerator);
+    {
+        PowershellCoreProfileGenerator powerShellGenerator{};
+        _executeGenerator(powerShellGenerator);
+
+        const auto isPowerShellInstalled = !powerShellGenerator.GetPowerShellInstances().empty();
+        if (!isPowerShellInstalled)
+        {
+            // Only generate the installer stub profile if PowerShell isn't installed.
+            PowershellInstallationProfileGenerator pwshInstallationGenerator{};
+            _executeGenerator(pwshInstallationGenerator);
+        }
+
+        // Regardless of running the installer's generator, we need to do some cleanup still.
+        _cleanupPowerShellInstaller(isPowerShellInstalled);
+    }
 
     WslDistroGenerator wslGenerator{};
     _executeGenerator(wslGenerator);
@@ -195,11 +208,6 @@ void SettingsLoader::GenerateProfiles()
     SshHostGenerator sshGenerator{};
     _executeGenerator(sshGenerator);
 #endif
-
-    PowershellInstallationProfileGenerator pwshInstallationGenerator{};
-    _executeGenerator(pwshInstallationGenerator);
-
-    _cleanupPowerShellInstaller(!powerShellGenerator.GetPowerShellInstances().empty());
 }
 
 // Retrieve the "Install Latest PowerShell" profile and...

src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp

@@ -9,7 +9,7 @@
 #include <LibraryResources.h>
 
 static constexpr std::wstring_view POWERSHELL_ICON{ L"ms-appx:///ProfileIcons/pwsh.png" };
-static constexpr std::wstring_view POWERSHELL_ICON_64{ L"ms-appx:///ProfileIcons/Powershell_black_64.png" };
+static constexpr std::wstring_view GENERATOR_POWERSHELL_ICON{ L"ms-appx:///ProfileGeneratorIcons/PowerShell.png" };
 
 namespace winrt::Microsoft::Terminal::Settings::Model
 {
@@ -27,13 +27,13 @@ namespace winrt::Microsoft::Terminal::Settings::Model
 
     std::wstring_view PowershellInstallationProfileGenerator::GetIcon() const noexcept
     {
-        return POWERSHELL_ICON_64;
+        return GENERATOR_POWERSHELL_ICON;
     }
 
     void PowershellInstallationProfileGenerator::GenerateProfiles(std::vector<winrt::com_ptr<implementation::Profile>>& profiles)
     {
         auto profile{ CreateDynamicProfile(RS_(L"PowerShellInstallationProfileName")) };
-        profile->Commandline(winrt::hstring{ fmt::format(FMT_COMPILE(L"cmd /k winget install --interactive --id Microsoft.PowerShell & echo. & echo {} & exit"), RS_(L"PowerShellInstallationInstallerGuidance")) });
+        profile->Commandline(winrt::hstring{ fmt::format(FMT_COMPILE(L"cmd /k winget install --interactive --id Microsoft.PowerShell --source winget & echo. & echo {} & exit"), RS_(L"PowerShellInstallationInstallerGuidance")) });
         profile->Icon(winrt::hstring{ POWERSHELL_ICON });
         profile->CloseOnExit(CloseOnExitMode::Never);