Skip to content

Commit

Permalink
Merge pull request #1119 from microsoft/dev/waan/rel_d16_10
Browse files Browse the repository at this point in the history 
Merge origin/main into release_mdd
  • Loading branch information
@WardenGnaw
WardenGnaw authored Mar 11, 2021
2 parents 102f979 + 5cf9b0f commit 27c7485
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 37 deletions.
63 changes: 45 additions & 18 deletions loc/lcl/CSY/OpenFolderSchema.json.lcl
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="E:\A\_work\17\s\bin\Lab.Release\OpenFolderSchema.json" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="cs-CZ" Desc="Commenting file created by LCXAdmin. For more information, please visit http://localizability/longhorn/LcxAdmin.asp" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
<Cmt Name="LcxAdmin" />
<Cmt Name="Loc" />
<Cmt Name="RCCX" />
<Cmt Name="Rccx" />
</OwnedComments>
<Item ItemId=";String Table" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down Expand Up @@ -79,6 +79,30 @@
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";@debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCmd.descript" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Dir" LocTbl="false" />
<Item ItemId=";(...) ion" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Arguments passed to the pipe executable to run a remote Unix (ex: bash or similar) shell command. This is used for running 'kill' on the remote system, or other commands that the debugger may need. If not specified, the debugger will do its best without the shell. But some features, such as setting breakpoints in run mode, may not work. This string should contain the string '{0}' which will be replaced with the command to execute.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Argumenty předávané spustitelnému souboru kanálu pro spuštění příkazu prostředí vzdáleného systému UNIX (např: bash apod.). Používají se ke spuštění příkazu kill na vzdáleném systému nebo jiných příkazů, které může ladicí program potřebovat. Pokud se nezadají, ladicí program se pokusí obejít bez prostředí. Některé funkce, třeba nastavení zarážek v režimu spuštění, ale nemusí fungovat. Tento řetězec by měl obsahovat řetězec {0}, který se nahradí příkazem, který se má provést.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";@debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCmd.items.ty" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Dir" LocTbl="false" />
<Item ItemId=";(...) pe" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[string]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[řetězec]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";@debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCwd.descript" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Dir" LocTbl="false" />
<Item ItemId=";(...) ion" ItemType="0" PsrId="306" Leaf="true">
Expand Down Expand Up @@ -253,6 +277,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCmd.type" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[array]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[pole]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCwd.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[string]]></Val>
Expand Down Expand Up @@ -679,15 +712,21 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf.$ref" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf[0].type" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[#/definitions/cpp_schema/definitions/sourceFileMapOptions]]></Val>
<Val><![CDATA[string]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[řetězec]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf[1].$ref" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[string]]></Val>
<Val><![CDATA[#/definitions/cpp_schema/definitions/sourceFileMapOptions]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[#/definitions/cpp_schema/definitions/sourceFileMapOptions]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -784,12 +823,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[0].initialConfiguration.externalConsole" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[True]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[0].initialConfiguration.miDebuggerPath" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[${env.MINGW_PREFIX}\bin\gdb.exe]]></Val>
Expand Down Expand Up @@ -859,12 +892,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[1].initialConfiguration.externalConsole" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[True]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[1].initialConfiguration.miDebuggerPath" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[${env.MINGW_PREFIX}\bin\gdb.exe]]></Val>
Expand Down
63 changes: 45 additions & 18 deletions loc/lcl/RUS/OpenFolderSchema.json.lcl
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LCX SchemaVersion="6.0" Name="E:\A\_work\17\s\bin\Lab.Release\OpenFolderSchema.json" PsrId="306" FileType="1" SrcCul="en-US" TgtCul="ru-RU" Desc="Commenting file created by LCXAdmin. For more information, please visit http://localizability/longhorn/LcxAdmin.asp" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
<OwnedComments>
<Cmt Name="Dev" />
<Cmt Name="LcxAdmin" />
<Cmt Name="Loc" />
<Cmt Name="RCCX" />
<Cmt Name="Rccx" />
</OwnedComments>
<Item ItemId=";String Table" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Expand" Expand="true" Disp="true" LocTbl="false" />
Expand Down Expand Up @@ -76,6 +76,30 @@
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";@debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCmd.descript" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Dir" LocTbl="false" />
<Item ItemId=";(...) ion" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Arguments passed to the pipe executable to run a remote Unix (ex: bash or similar) shell command. This is used for running 'kill' on the remote system, or other commands that the debugger may need. If not specified, the debugger will do its best without the shell. But some features, such as setting breakpoints in run mode, may not work. This string should contain the string '{0}' which will be replaced with the command to execute.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Аргументы, передаваемые в исполняемый файл канала для выполнения команды удаленной оболочки UNIX (например, Bash или аналогичной). Используется для запуска "Kill" на удаленной системе или других команд, которые могут потребоваться отладчику. Если не указано, отладчик будет работать без оболочки. Но некоторые функции, такие как установка точек останова в режиме выполнения, могут не работать. Эта строка должна содержать строку "{0}", которая будет заменена командой для выполнения.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";@debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCmd.items.ty" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Dir" LocTbl="false" />
<Item ItemId=";(...) pe" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[string]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[строка]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
</Item>
<Item ItemId=";@debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCwd.descript" ItemType="0" PsrId="306" Leaf="false">
<Disp Icon="Dir" LocTbl="false" />
<Item ItemId=";(...) ion" ItemType="0" PsrId="306" Leaf="true">
Expand Down Expand Up @@ -247,6 +271,15 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCmd.type" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[array]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[массив]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.definitions.pipeTransportOptions.properties.pipeCwd.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[string]]></Val>
Expand Down Expand Up @@ -634,15 +667,21 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf.$ref" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf[0].type" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[#/definitions/cpp_schema/definitions/sourceFileMapOptions]]></Val>
<Val><![CDATA[string]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[строка]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf.type" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Item ItemId=";debugExtensions.cppdbg.schema.definitions.cpp_schema.properties.sourceFileMap.additionalProperties.anyOf[1].$ref" ItemType="0" PsrId="306" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[string]]></Val>
<Val><![CDATA[#/definitions/cpp_schema/definitions/sourceFileMapOptions]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[#/definitions/cpp_schema/definitions/sourceFileMapOptions]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
Expand Down Expand Up @@ -733,12 +772,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[0].initialConfiguration.externalConsole" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[True]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[0].initialConfiguration.miDebuggerPath" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[${env.MINGW_PREFIX}\bin\gdb.exe]]></Val>
Expand Down Expand Up @@ -808,12 +841,6 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[1].initialConfiguration.externalConsole" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[True]]></Val>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";debugExtensions.cppdbg.templates[1].initialConfiguration.miDebuggerPath" ItemType="0" PsrId="306" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[${env.MINGW_PREFIX}\bin\gdb.exe]]></Val>
Expand Down
2 changes: 1 addition & 1 deletion src/MICore/LaunchOptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static internal PipeLaunchOptions CreateFromJson(JObject parsedOptions)
PipeLaunchOptions pipeOptions = new PipeLaunchOptions(
pipePath: pipeProgram,
pipeArguments: EnsurePipeArguments(pipeArgs, debuggerPath, gdbPathDefault, quoteArgs),
pipeCommandArguments: ParseArguments(pipeCmd, quoteArgs),
pipeCommandArguments: ParseArguments(pipeCmd??pipeArgs, quoteArgs),
pipeCwd: pipeCwd,
pipeEnvironment: GetEnvironmentEntries(pipeEnv)
);
Expand Down

0 comments on commit 27c7485

Please sign in to comment.