add support for applying post remote connect commands on attach

microsoft · Feb 29, 2024 · 10ff42f · 10ff42f
1 parent 0af7c17
commit 10ff42f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/src/MICore/LaunchOptions.cs b/src/MICore/LaunchOptions.cs
@@ -1490,8 +1490,12 @@ internal static SupplementalLaunchOptions GetOptionsFromFile(Logger logger)
                 string optFile = Path.Combine(slnRoot, "Microsoft.MIEngine.Options.xml");
                 if (File.Exists(optFile))
                 {
-                    var reader = File.OpenText(optFile);
-                    string suppOptions = reader.ReadToEnd();
+                    string suppOptions = null;
+                    using (var reader = File.OpenText(optFile))
+                    {
+                        suppOptions = reader.ReadToEnd();
+                    }
+
                     if (!string.IsNullOrEmpty(suppOptions))
                     {
                         try
@@ -1555,6 +1559,11 @@ private void Merge(AttachOptionsForConnection suppOptions)
             setupCmds.AddRange(newSetupCmds);
             SetupCommands = new ReadOnlyCollection<LaunchCommand>(setupCmds);
 
+            var postRemoteConnectCmds = this.PostRemoteConnectCommands.ToList();
+            var newPostRemoteConnectCmds = LaunchCommand.CreateCollection(suppOptions.PostRemoteConnectCommands);
+            postRemoteConnectCmds.AddRange(newPostRemoteConnectCmds);
+            PostRemoteConnectCommands = new ReadOnlyCollection<LaunchCommand>(postRemoteConnectCmds);
+
             MergeMap(suppOptions.SourceMap);
             if (!string.IsNullOrWhiteSpace(suppOptions.AdditionalSOLibSearchPath))
             {
@@ -1847,6 +1856,7 @@ protected void InitializeCommonOptions(Xml.LaunchOptions.BaseLaunchOptions sourc
             this.WaitDynamicLibLoad = source.WaitDynamicLibLoad;
 
             this.SetupCommands = LaunchCommand.CreateCollection(source.SetupCommands);
+            this.PostRemoteConnectCommands = LaunchCommand.CreateCollection(source.PostRemoteConnectCommands);
 
             if (source.CustomLaunchSetupCommands != null)
             {

diff --git a/src/MICore/LaunchOptions.xsd b/src/MICore/LaunchOptions.xsd
@@ -413,6 +413,11 @@
           <xs:documentation>One or more GDB/LLDB commands to execute in order to setup the underlying debugger. These are not required.</xs:documentation>
         </xs:annotation>
       </xs:element>
+      <xs:element name="PostRemoteConnectCommands" minOccurs="0" maxOccurs="1" type="CommandList">
+        <xs:annotation>
+          <xs:documentation>One or more commands to execute after the connection has been made, in order to set up the remote connection. These are not required.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
       <xs:element name="SourceMap" type="SourceMapList" minOccurs="0" maxOccurs="1">
       </xs:element>
       <xs:element name="ServerOptions" type="ServerOptions" minOccurs="0" maxOccurs="1">
@@ -482,6 +487,11 @@
           <xs:documentation>One or more GDB/LLDB commands to execute in order to setup the underlying debugger. These are not required.</xs:documentation>
         </xs:annotation>
       </xs:element>
+      <xs:element name="PostRemoteConnectCommands" minOccurs="0" maxOccurs="1" type="CommandList">
+        <xs:annotation>
+          <xs:documentation>One or more commands to execute after the connection has been made, in order to set up the remote connection. These are not required.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
       <xs:element name="CustomLaunchSetupCommands" minOccurs="0" maxOccurs="1" type="CommandList">
         <xs:annotation>
           <xs:documentation>

diff --git a/src/MICore/LaunchOptions.xsd.types.designer.cs b/src/MICore/LaunchOptions.xsd.types.designer.cs