Merge pull request #1233 from microsoft/main

Merge 'main' into 'release_mdd'

Author: WardenGnaw

.github/workflows/pull-request.yml

@@ -76,7 +76,14 @@ jobs:
         update: true
         install: >-
           mingw-w64-x86_64-toolchain
-      
+    
+    - shell: msys2 {0}
+      name: Gather c++ toolchain paths
+      run: |
+        cygpath -w $(which g++)
+        cygpath -w $(which g++)
+
+
     - run: >
         dotnet test ${{ github.workspace }}\bin\DebugAdapterProtocolTests\Debug\CppTests\CppTests.dll --logger "trx;LogFileName=${{ github.workspace }}\bin\DebugAdapterProtocolTests\Debug\CppTests\results.trx"
 

src/MICore/CommandFactories/MICommandFactory.cs

@@ -332,7 +332,7 @@ public virtual Task<bool> SetStepFiltering(bool enabled)
         // Calls to VarCreate will change the current debugger thread and frame selection to what is passed in. This is because it needs to be queried in the context of a thread/frame id.
         public virtual async Task<Results> VarCreate(string expression, int threadId, uint frameLevel, enum_EVALFLAGS dwFlags, ResultClass resultClass = ResultClass.done)
         {
-            string quoteEscapedExpression = EscapeQuotes(expression);
+            string quoteEscapedExpression = EscapeQuotes(HandleInvalidChars(expression));
             string command = string.Format(CultureInfo.InvariantCulture, "-var-create - * \"{0}\"", quoteEscapedExpression);
             Results results = await ThreadFrameCmdAsync(command, resultClass, threadId, frameLevel);
 
@@ -366,7 +366,8 @@ public async Task<Results> VarEvaluateExpression(string variableName, ResultClas
 
         public virtual async Task<string> VarAssign(string variableName, string expression, int threadId, uint frameLevel)
         {
-            string command = string.Format(CultureInfo.InvariantCulture, "-var-assign {0} \"{1}\"", variableName, expression);
+            string quoteEscapedExpression = EscapeQuotes(HandleInvalidChars(expression));
+            string command = string.Format(CultureInfo.InvariantCulture, "-var-assign {0} \"{1}\"", variableName, quoteEscapedExpression);
             Results results = await _debugger.CmdAsync(command, ResultClass.done);
             return results.FindString("value");
         }
@@ -618,6 +619,18 @@ internal string EscapeQuotes(string str)
             return str.Replace("\"", "\\\"");
         }
 
+        internal string HandleInvalidChars(string str)
+        {
+            char[] invalidChars = { '\r', '\n' };
+            StringBuilder builder = new StringBuilder();
+            foreach (char c in str)
+            {
+
+                builder.Append(invalidChars.Contains(c) ? ' ' : c);
+            }
+            return builder.ToString();
+        }
+
         #endregion
 
         #region Other

src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml

@@ -30,14 +30,7 @@
         <Style x:Key="GlyphPathStyle"
                TargetType="{x:Type Path}">
             <Setter Property="Stroke"
-                            Value="{DynamicResource {x:Static platformui:TreeViewColors.GlyphBrushKey}}" />
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding  RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
-                             Value="True">
-                    <Setter Property="Stroke"
-                            Value="{DynamicResource {x:Static platformui:TreeViewColors.GlyphMouseOverBrushKey}}" />
-                </DataTrigger>
-            </Style.Triggers>
+                            Value="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}}" />
         </Style>
         <Style x:Key="ConnectionTypeComboBoxStyle"
                TargetType="{x:Type ComboBox}">
@@ -309,7 +302,7 @@
                               Data="M 5.5,2.5 L 0.5,7.5 L 5.5,7.5 Z"
                               HorizontalAlignment="Center"
                               SnapsToDevicePixels="false"
-                              Fill="{DynamicResource {x:Static platformui:TreeViewColors.GlyphBrushKey}}"
+                              Fill="{StaticResource {x:Static SystemColors.WindowTextBrushKey}}"
                               StrokeThickness="2"
                               VerticalAlignment="Center"
                               Visibility="{Binding IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}" />

test/CppTests/TestConfigurations/config_msys_gdb.xml

@@ -10,13 +10,13 @@
     <Compiler
       Name="GppMingw64"
       Type="GPlusPlus"
-      Path="D:\a\_temp\msys\msys64\mingw64\bin\g++.exe"/>
+      Path="D:\a\_temp\msys64\mingw64\bin\g++.exe"/>
   </Compilers>
   <Debuggers>
     <Debugger
       Name="GdbMingw64"
       Type="Gdb_MinGW"
-      Path="D:\a\_temp\msys\msys64\mingw64\bin\gdb.exe"
+      Path="D:\a\_temp\msys64\mingw64\bin\gdb.exe"
       AdapterPath="OpenDebugAD7.exe"
       />
   </Debuggers>