Fix build path for debug launcher targets (#6605)

* Fix build path for debug launcher targets * Try fixing intermittent test case failure * Add more logging * Connection events were coming in AFTER process exit. Just wait for connection
microsoft · Jul 14, 2021 · 984cd41 · 984cd41
1 parent 7cf41e1
commit 984cd41
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/Build/Common.Build.Core.settings b/Build/Common.Build.Core.settings
@@ -29,7 +29,15 @@
     <VSTargetName Condition="'$(VSTarget)' == '12.0'">2013</VSTargetName>
     <VSTargetName Condition="'$(VSTarget)' == '11.0'">2012</VSTargetName>
     <VSTargetName Condition="'$(VSTarget)' == '10.0'">2010</VSTargetName>
-
+
+    <VCTargetVersion Condition="'$(VSTarget)' == '17.0'">v170</VCTargetVersion>
+    <VCTargetVersion Condition="'$(VSTarget)' == '16.0'">v160</VCTargetVersion>
+    <VCTargetVersion Condition="'$(VSTarget)' == '15.0'">v150</VCTargetVersion>
+    <VCTargetVersion Condition="'$(VSTarget)' == '14.0'">v140</VCTargetVersion>
+    <VCTargetVersion Condition="'$(VSTarget)' == '12.0'">v120</VCTargetVersion>
+    <VCTargetVersion Condition="'$(VSTarget)' == '11.0'">v110</VCTargetVersion>
+    <VCTargetVersion Condition="'$(VSTarget)' == '10.0'">v100</VCTargetVersion>
+
     <BuildNumber Condition="'$(BuildNumber)' == ''">$(BUILD_BUILDNUMBER)</BuildNumber>
     <BuildNumber Condition="'$(BuildNumber)' == ''">1000.00</BuildNumber>
     <!--

diff --git a/Python/Prerequisites/deploy_test_targets.cmd b/Python/Prerequisites/deploy_test_targets.cmd
@@ -35,7 +35,7 @@ if not exist "%TARGET%" mkdir "%TARGET%"
 copy /Y "*.targets" "%TARGET%"
 popd
 
-set TARGET=%VSINSTALLDIR%\MSBuild\Microsoft\VC\v160\Platforms
+set TARGET=%VSINSTALLDIR%\MSBuild\Microsoft\VC\v170\Platforms
 pushd "%D%..\Product\VCDebugLauncher\VCTargets"
 echo.
 echo Copying:

diff --git a/Python/Product/TestAdapter.Executor/UnitTest/UnitTestTestExecutor.cs b/Python/Product/TestAdapter.Executor/UnitTest/UnitTestTestExecutor.cs
@@ -167,6 +167,7 @@ sealed class TestRunner : IDisposable {
             private readonly int _debugPort;
             private readonly ManualResetEvent _cancelRequested;
             private readonly ManualResetEvent _connected = new ManualResetEvent(false);
+            private bool _connectionActivated = false;
             private readonly AutoResetEvent _done = new AutoResetEvent(false);
             private Connection _connection;
             private readonly Socket _socket;
@@ -294,6 +295,7 @@ private static string GetSearchPaths(IEnumerable<TestCase> tests, PythonProjectS
             }
 
             private void AcceptConnection(IAsyncResult iar) {
+                Info("Connected to socket");
                 Socket socket;
                 var socketSource = ((Socket)iar.AsyncState);
                 try {
@@ -306,7 +308,7 @@ private void AcceptConnection(IAsyncResult iar) {
                     Debug.WriteLine("DebugConnectionListener socket closed");
                     return;
                 }
-
+                _connectionActivated = true;
                 var stream = new NetworkStream(socket, ownsSocket: true);
                 _connection = new Connection(
                     new MemoryStream(),
@@ -319,6 +321,7 @@ private void AcceptConnection(IAsyncResult iar) {
                 );
                 _connection.EventReceived += ConnectionReceivedEvent;
                 Task.Run(_connection.ProcessMessages).DoNotWait();
+                Info("Connection event fired");
                 _connected.Set();
             }
 
@@ -359,14 +362,13 @@ public void Run() {
                         Info("set " + pythonPath.Key + "=" + pythonPath.Value);
                         Info(proc.Arguments);
 
-                        // If there's an error in the launcher script,
-                        // it will terminate without connecting back.
-                        WaitHandle.WaitAny(new WaitHandle[] { _connected, proc.WaitHandle });
-                        bool processConnected = _connected.WaitOne(1);
-
-                        if (!processConnected && proc.ExitCode.HasValue) {
-                            // Process has already exited
-                            proc.Wait();
+                        // Wait for process exit or connected. Connection might fail if 
+                        // there's an error in the launch script. Process may also
+                        // signal exited while we haven't connected yet, so really wait
+                        // for the connection and then see if we connected or not.
+                        _connected.WaitOne(3000);
+                        if (!_connectionActivated && proc.ExitCode != null) {
+                            // Process has already exited without connecting
                             Error(Strings.Test_FailedToStartExited);
                             if (proc.StandardErrorLines.Any()) {
                                 foreach (var line in proc.StandardErrorLines) {

diff --git a/Python/Product/VCDebugLauncher/VCDebugLauncher.csproj b/Python/Product/VCDebugLauncher/VCDebugLauncher.csproj
@@ -146,27 +146,27 @@
       <VSIXSubPath>.</VSIXSubPath>
     </Content>
     <Content Include="VCTargets\Win32\ImportAfter\Microsoft.PythonTools.Debugger.VCDebugLauncher.targets">
-      <VSIXSubPath>Microsoft\VC\v160\Platforms\Win32\ImportAfter</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VC\$(VCTargetVersion)\Platforms\Win32\ImportAfter</VSIXSubPath>
       <InstallRoot>MSBuild</InstallRoot>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
       <SubType>Designer</SubType>
     </Content>
     <Content Include="VCTargets\Win32\ImportBefore\Microsoft.PythonTools.Debugger.VCDebugLauncher.props">
-      <VSIXSubPath>Microsoft\VC\v160\Platforms\Win32\ImportBefore</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VC\$(VCTargetVersion)\Platforms\Win32\ImportBefore</VSIXSubPath>
       <InstallRoot>MSBuild</InstallRoot>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <Content Include="VCTargets\x64\ImportAfter\Microsoft.PythonTools.Debugger.VCDebugLauncher.targets">
-      <VSIXSubPath>Microsoft\VC\v160\Platforms\x64\ImportAfter</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VC\$(VCTargetVersion)\Platforms\x64\ImportAfter</VSIXSubPath>
       <InstallRoot>MSBuild</InstallRoot>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
       <SubType>Designer</SubType>
     </Content>
     <Content Include="VCTargets\x64\ImportBefore\Microsoft.PythonTools.Debugger.VCDebugLauncher.props">
-      <VSIXSubPath>Microsoft\VC\v160\Platforms\x64\ImportBefore</VSIXSubPath>
+      <VSIXSubPath>Microsoft\VC\$(VCTargetVersion)\Platforms\x64\ImportBefore</VSIXSubPath>
       <InstallRoot>MSBuild</InstallRoot>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>