5a23029dac
This commit reduces the number of generated VS profiles from 6 down to just 2 per VS instance. The reason we did this is out of concern of overwhelming or annoying new users with too many profiles. Especially since it's far easier at the moment to add new generators compared to removing them. As before only the latest instance is not hidden by default. ## PR Checklist * [x] I work here * [x] Tests added/passed * [x] As discussed in a Team Sync meeting ## Validation Steps Performed * Installed Visual Studio 2019 and 2022 Preview * A profile for both is generated, while the 2019 one is hidden by default ✔️ * $env:VSCMD_ARG_TGT_ARCH is x64 on my AMD64 machine ✔️
57 lines
2.1 KiB
C++
57 lines
2.1 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include "DynamicProfileUtils.h"
|
|
#include "VsDevCmdGenerator.h"
|
|
|
|
using namespace winrt::Microsoft::Terminal::Settings::Model;
|
|
|
|
void VsDevCmdGenerator::GenerateProfiles(const VsSetupConfiguration::VsSetupInstance& instance, bool hidden, std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const
|
|
{
|
|
try
|
|
{
|
|
if (!IsInstanceValid(instance))
|
|
{
|
|
return;
|
|
}
|
|
|
|
const auto seed = GetProfileGuidSeed(instance);
|
|
const winrt::guid profileGuid{ ::Microsoft::Console::Utils::CreateV5Uuid(TERMINAL_PROFILE_NAMESPACE_GUID, gsl::as_bytes(gsl::make_span(seed))) };
|
|
auto profile = winrt::make_self<implementation::Profile>(profileGuid);
|
|
profile->Name(winrt::hstring{ GetProfileName(instance) });
|
|
profile->Commandline(winrt::hstring{ GetProfileCommandLine(instance) });
|
|
profile->StartingDirectory(winrt::hstring{ instance.GetInstallationPath() });
|
|
profile->Icon(winrt::hstring{ GetProfileIconPath() });
|
|
profile->Hidden(hidden);
|
|
profiles.emplace_back(std::move(profile));
|
|
}
|
|
CATCH_LOG();
|
|
}
|
|
|
|
std::wstring VsDevCmdGenerator::GetProfileName(const VsSetupConfiguration::VsSetupInstance& instance) const
|
|
{
|
|
std::wstring name{ L"Developer Command Prompt for VS " };
|
|
name.append(instance.GetProfileNameSuffix());
|
|
return name;
|
|
}
|
|
|
|
std::wstring VsDevCmdGenerator::GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance) const
|
|
{
|
|
std::wstring commandLine;
|
|
commandLine.reserve(256);
|
|
commandLine.append(LR"("cmd.exe /k ")");
|
|
commandLine.append(GetDevCmdScriptPath(instance));
|
|
#if defined(_M_ARM64)
|
|
commandLine.append(LR"(" -arch=arm64 -host_arch=x64)");
|
|
#elif defined(_M_AMD64)
|
|
commandLine.append(LR"(" -arch=x64 -host_arch=x64)");
|
|
#endif
|
|
return commandLine;
|
|
}
|
|
|
|
std::wstring VsDevCmdGenerator::GetDevCmdScriptPath(const VsSetupConfiguration::VsSetupInstance& instance) const
|
|
{
|
|
return instance.ResolvePath(L"Common7\\Tools\\VsDevCmd.bat");
|
|
}
|