Merge pull request #1496 from microsoft/main

Merge 'main' into 'release_mdd'

Author: WardenGnaw

build/package_versions.settings.targets

@@ -3,7 +3,7 @@
         <Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
         <Microsoft_VisualStudio_Interop_Version>17.12.40391</Microsoft_VisualStudio_Interop_Version>
         <Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
-        <Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
+        <Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.14.10225.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
 
         <!-- Test Packages -->
         <Microsoft_NET_Test_Sdk_Version>16.7.1</Microsoft_NET_Test_Sdk_Version>

eng/pipelines/templates/DebuggerTesting-release.template.yml

@@ -29,6 +29,8 @@ steps:
     TargetFolders: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
 
 - template: ../steps/CopyAndPublishSymbols.yml
+  parameters:
+    SourceFolder: '$(Build.SourcesDirectory)\bin\DebugAdapterProtocolTests\Release\drop'
 
 - template: ../tasks/PublishPipelineArtifact.yml
   parameters:

src/MICore/LaunchOptions.cs

@@ -1267,7 +1267,11 @@ public static LaunchOptions GetInstance(HostConfigurationStore configStore, stri
             {
                 try
                 {
-                    JObject parsedOptions = JObject.Parse(options);
+                    JObject parsedOptions = JsonConvert.DeserializeObject<JObject>(options, new JsonSerializerSettings { DateParseHandling = DateParseHandling.None });
+                    if (parsedOptions is null)
+                    {
+                        throw new InvalidLaunchOptionsException(MICoreResources.Error_UnknownLaunchOptions);
+                    }
 
                     // if the customLauncher element is present then try using the custom launcher implementation from the config store
                     if (parsedOptions["customLauncher"] != null && !string.IsNullOrWhiteSpace(parsedOptions["customLauncher"].Value<string>()))

src/MICore/Transports/PipeTransport.cs

@@ -197,11 +197,19 @@ public override void Close()
 
             if (_process != null)
             {
-                if (_killOnClose && !_process.HasExited)
+                if (!_process.HasExited)
                 {
                     try
                     {
-                        KillPipeProcessAndChildren(_process);
+                        if (_killOnClose)
+                        {
+                            KillPipeProcessAndChildren(_process);
+                        }
+                        else
+                        {
+                            // kill only the process
+                            _process.Kill();
+                        }
                     }
                     catch
                     {

src/MIDebugEngine.sln

@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		..\.editorconfig = ..\.editorconfig
 		IDECodeAnalysis.ruleset = IDECodeAnalysis.ruleset
+		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MICoreUnitTests", "MICoreUnitTests\MICoreUnitTests.csproj", "{6D565BAE-4764-40C3-9C0F-204B6FFA0389}"

test/DebugAdapterRunner/DebugAdapterRunner.cs

@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading;
 
@@ -163,8 +164,25 @@ private void StartDebugAdapter(
 
             if (redirectVSAssert)
             {
-                _assertionFileName = Path.Combine(Path.GetTempPath(), string.Format(CultureInfo.InvariantCulture, "vsassert.{0}.txt", Guid.NewGuid()));
-                startInfo.Environment["VSASSERT"] = _assertionFileName;
+                string vsassertPath = null;
+
+                // First see if the caller already specified the assertion path
+                if (additionalEnvironmentVariables != null)
+                {
+                    vsassertPath = additionalEnvironmentVariables
+                        .Where(pair => pair.Key.Equals("VSASSERT", StringComparison.OrdinalIgnoreCase))
+                        .Select(pair => pair.Value)
+                        .FirstOrDefault();
+                }
+
+                if (string.IsNullOrEmpty(vsassertPath))
+                {
+                    // If the caller didn't specify a path, create a temporary one
+                    vsassertPath = Path.Combine(Path.GetTempPath(), string.Format(CultureInfo.InvariantCulture, "vsassert.{0}.txt", Guid.NewGuid()));
+                    startInfo.Environment["VSASSERT"] = vsassertPath;
+                }
+
+                _assertionFileName = vsassertPath;
             }
 
             if (additionalEnvironmentVariables != null)