folkslinux
/
windows-terminal
mirror of https://github.com/microsoft/terminal.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix VS profile command generation (#15439) 

This regressed in f06cd17. It seems like the change went untested,
because it appends an extra " after -startdir=none.
This changeset also avoids calling `append()` twice.

Closes #15436

## Validation Steps Performed
* VS Developer Command Prompt works ✅

(cherry picked from commit 0073e36d81)
Service-Card-Id: 89324784
Service-Version: 1.17
This commit is contained in:
Leonard Hecker 2023-05-25 20:21:57 +02:00 committed by Dustin L. Howett
parent 5ce63b923b
commit 770af0ae1b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.cpp
View File

@ -44,11 +44,12 @@ std::wstring VsDevCmdGenerator::GetProfileCommandLine(const VsSetupConfiguration
commandLine.append(GetDevCmdScriptPath(instance));
// The "-startdir" parameter will prevent "vsdevcmd" from automatically
// setting the shell path so the path in the profile will be used instead.
commandLine.append(LR"(" -startdir=none)");
#if defined(_M_ARM64)
commandLine.append(LR"(" -arch=arm64 -host_arch=x64)");
commandLine.append(LR"(" -startdir=none -arch=arm64 -host_arch=x64)");
#elif defined(_M_AMD64)
commandLine.append(LR"(" -arch=x64 -host_arch=x64)");
commandLine.append(LR"(" -startdir=none -arch=x64 -host_arch=x64)");
#else
commandLine.append(LR"(" -startdir=none)");
#endif
return commandLine;
}