Do not crash on Debug.Assert

global.json

@@ -5,5 +5,8 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20052.1",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20052.1"
+  },
+  "sdk": {
+    "version" : "3.1.100"
   }
 }

samples/UnitTestProject/UnitTestProject.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="MSTest.TestFramework" Version="$(MSTestFrameworkVersion)" />
     <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestAdapterVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkPreviousVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(NETTestSdkVersion)" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System.Runtime" />

scripts/build.ps1

@@ -167,9 +167,9 @@ function Install-DotNetCli
 
     # Pull in additional shared frameworks.
     # Get netcoreapp2.1 shared components.
-    if (!(Test-Path "$dotnetInstallPath\shared\Microsoft.NETCore.App\2.1.0")) {
-        & $dotnetInstallScript -InstallDir $dotnetInstallPath -SharedRuntime -Version '2.1.0' -Channel 'release/2.1.0'
-    }
+
+    & $dotnetInstallScript -InstallDir $dotnetInstallPath -Runtime -Version '2.1.0' -Channel 'release/2.1.0' -Architecture x64
+    & $dotnetInstallScript -InstallDir $dotnetInstallPath -Runtime -Version '2.1.0' -Channel 'release/2.1.0' -Architecture x86
 
     # Get shared components which is compatible with dotnet cli version $env:DOTNET_CLI_VERSION
     #if (!(Test-Path "$dotnetInstallPath\shared\Microsoft.NETCore.App\$env:DOTNET_RUNTIME_VERSION")) {
@@ -179,6 +179,16 @@ function Install-DotNetCli
     Write-Log "Install-DotNetCli: Complete. {$(Get-ElapsedTime($timer))}"
 }
 
+function Clear-Package {
+    # find all microsoft packages that have the same version as we specified
+    # this is cache-busting the nuget packages, so we don't reuse them from cache 
+    # after we built new ones
+    if (Test-Path $env:TP_PACKAGES_DIR) {
+        $devPackages = Get-ChildItem $env:TP_PACKAGES_DIR/microsoft.*/$TPB_Version | Select-Object -ExpandProperty FullName 
+        $devPackages | Remove-Item -Force -Recurse -Confirm:$false
+    }
+}
+
 function Restore-Package
 {
     $timer = Start-Timer
@@ -207,21 +217,46 @@ function Invoke-Build
 
     Set-ScriptFailedOnError
 
+    Write-Log "Invoke-Build: Complete. {$(Get-ElapsedTime($timer))}"
+}
+
+function Invoke-TestAssetsBuild
+{
+    $timer = Start-Timer
+    Write-Log "Invoke-TestAssetsBuild: Start test assets build."
+    $dotnetExe = Get-DotNetPath
+
+
     Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution"
     Write-Verbose "$dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild"
-    & $dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
+    & $dotnetExe build $TPB_TestAssets_Solution --configuration $TPB_Configuration -v:minimal -p:NETTestSdkVersion="$TPB_Version" -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
     Write-Log ".. .. Build: Complete."
 
     Set-ScriptFailedOnError
 
-    Write-Log "Invoke-Build: Complete. {$(Get-ElapsedTime($timer))}"
+    Write-Log "Invoke-TestAssetsBuild: Complete. {$(Get-ElapsedTime($timer))}"
+}
+
+function Copy-PackageIntoStaticDirectory { 
+    # packages are published into folder based on configuration, but 
+    # nuget does not understand that, and does not support wildcards in paths 
+    # in order to be able to use the produced packages for acceptance tests we
+    # need to put them in folder that is not changing it's name based on config
+    $tpPackagesPath = "$env:TP_OUT_DIR\$TPB_Configuration\packages\"
+    $tpPackagesDestination = "$env:TP_TESTARTIFACTS"
+    Copy-Item $tpPackagesPath $tpPackagesDestination -Force -Filter *.nupkg -Verbose -Recurse
 }
 
 function Publish-PatchedDotnet { 
     Write-Log "Publish-PatchedDotnet: Copy local dotnet installation to testArtifacts"
     $dotnetPath = "$env:TP_TOOLS_DIR\dotnet\"
-    
+
     $dotnetTestArtifactsPath = "$env:TP_TESTARTIFACTS\dotnet\" 
+
+    if (Test-Path $dotnetTestArtifactsPath) { 
+        Remove-Item -Force -Recurse $dotnetTestArtifactsPath
+    }
+
     $dotnetTestArtifactsSdkPath = "$env:TP_TESTARTIFACTS\dotnet\sdk\$env:DOTNET_CLI_VERSION\"
     Copy-Item $dotnetPath $dotnetTestArtifactsPath -Force -Recurse
 
@@ -922,15 +957,19 @@ Get-ChildItem env: | Where-Object -FilterScript { $_.Name.StartsWith("TP_") } |
 Write-Log "Test platform build variables: "
 Get-Variable | Where-Object -FilterScript { $_.Name.StartsWith("TPB_") } | Format-Table
 Install-DotNetCli
+Clear-Package
 Restore-Package
 Update-LocalizedResources
 Invoke-Build
 Publish-Package
-Publish-PatchedDotnet
 Publish-Tests
 Create-VsixPackage
 Create-NugetPackages
 Generate-Manifest
+Publish-PatchedDotnet
+Copy-PackageIntoStaticDirectory
+Invoke-TestAssetsBuild
+
 Write-Log "Build complete. {$(Get-ElapsedTime($timer))}"
 if ($Script:ScriptFailed) { Exit 1 } else { Exit 0 }
 

scripts/build.sh

@@ -111,7 +111,7 @@ VERSION=$(test -z $VERSION && grep TPVersionPrefix $TP_ROOT_DIR/scripts/build/Te
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712
 export NUGET_PACKAGES=$TP_PACKAGES_DIR
-DOTNET_CLI_VERSION="3.1.100-preview2-014569"
+DOTNET_CLI_VERSION="3.1.100"
 #DOTNET_RUNTIME_VERSION="LATEST"
 
 #

scripts/build/TestPlatform.Dependencies.props

@@ -4,10 +4,17 @@
     <VSSdkBuildToolsVersion>15.8.3247</VSSdkBuildToolsVersion>
 
     <!-- Name of the elements must be in sync with test\Microsoft.TestPlatform.TestUtilities\IntegrationTestBase.cs -->
-    <NETTestSdkPreviousVersion>15.5.0</NETTestSdkPreviousVersion>
 
-    <MSTestFrameworkVersion>1.4.0</MSTestFrameworkVersion>
-    <MSTestAdapterVersion>1.4.0</MSTestAdapterVersion>
+    <!-- Pick up the version from the parameters that the build script provides, which in turn takes it from TestPlatform.Settings.targets either directly
+    or via vsts-prevbuild.ps1 when running in CI pipeline, a better way would be to specify this version directly in a props file, but that would require chagnes
+    to both the local build and CI build pipelines, and that's not something I want to do in a single step -->
+    <NETTestSdkVersion>$(Version)</NETTestSdkVersion>
+
+    <!-- 99.99.99-dev is a placeholder to be easy to find, you will see it fail the build, if you build without using the build script -->
+    <NETTestSdkVersion Condition="'$(NETTestSdkVersion)' == ''">99.99.99-dev</NETTestSdkVersion>
+
+    <MSTestFrameworkVersion>2.1.0</MSTestFrameworkVersion>
+    <MSTestAdapterVersion>2.1.0</MSTestAdapterVersion>
     <MSTestAssertExtensionVersion>1.0.3-preview</MSTestAssertExtensionVersion>
 
     <XUnitFrameworkVersion>2.3.1</XUnitFrameworkVersion>

scripts/build/TestPlatform.Settings.targets

@@ -2,7 +2,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <TestPlatformRoot Condition="$(TestPlatformRoot) == ''">$(MSBuildThisFileDirectory)../../</TestPlatformRoot>
-    <TPVersionPrefix>16.5.0</TPVersionPrefix>
+    <!-- This version is read by vsts-prebuild.ps1 and is a base for the current version, this should be updated
+    at the start of new iteration to the goal number. This is also used to version the local packages. -->
+    <TPVersionPrefix>16.6.0</TPVersionPrefix>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Versioning is defined from the build script. Use a default dev build if it's not defined.

src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs

@@ -8,6 +8,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
     using System.IO;
     using System.Net;
     using System.Net.Sockets;
+    using System.Reflection;
     using System.Threading;
     using System.Threading.Tasks;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
@@ -177,7 +178,7 @@ public async Task SetupClientAsync(IPEndPoint endpoint)
             {
                 try
                 {
-                    EqtTrace.Verbose("SocketCommunicationManager : SetupClientAsync : Attempting to connect to the server.");
+                    EqtTrace.Verbose("SocketCommunicationManager : SetupClientAsync : Attempting to connect to the server {0}:{1}.", endpoint.Address, endpoint.Port);
                     await this.tcpClient.ConnectAsync(endpoint.Address, endpoint.Port);
 
                     if (this.tcpClient.Connected)
@@ -199,7 +200,19 @@ public async Task SetupClientAsync(IPEndPoint endpoint)
                 }
                 catch (Exception ex)
                 {
-                    EqtTrace.Error("Connection Failed with error {0}, retrying", ex.ToString());
+                    // a simple backoff policy, otherwise this loop produces and incredible
+                    // amount of error logs when it cannot connect
+                    var delay = watch.ElapsedMilliseconds < 100
+                        ? 1
+                        : watch.ElapsedMilliseconds < 1000
+                            ? 10
+                            : 100;
+
+                    if ((watch.ElapsedMilliseconds + delay) < connectionTimeout)
+                    {
+                        await Task.Delay(delay);
+                        EqtTrace.Error($"Connection Failed with error {0}, retrying in {delay} ms", ex.ToString());
+                    }
                 }
             }
             while ((this.tcpClient != null) && !this.tcpClient.Connected && watch.ElapsedMilliseconds < connectionTimeout);

src/Microsoft.TestPlatform.CoreUtilities/Helpers/CommandLineArgumentsHelper.cs

@@ -52,12 +52,33 @@ public static IDictionary<string, string> GetArgumentsDictionary(string[] args)
         /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
         public static int GetIntArgFromDict(IDictionary<string, string> argsDictionary, string fullname)
         {
-            string optionValue;
-            return argsDictionary.TryGetValue(fullname, out optionValue) ? int.Parse(optionValue) : 0;
+            var found = TryGetIntArgFromDict(argsDictionary, fullname, out var value);
+            return found ? value : 0;
         }
 
         /// <summary>
-        /// Parse the value of an argument as an integer.
+        /// Try get the argument and parse the value of an argument as an integer.
+        /// </summary>
+        /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
+        /// <param name="fullname">The full name for required argument. Ex: "--port"</param>
+        /// <returns>Value of the argument.</returns>
+        /// <exception cref="ArgumentException">Thrown if value of an argument is not an integer.</exception>
+        public static bool TryGetIntArgFromDict(IDictionary<string, string> argsDictionary, string fullname, out int value)
+        {
+            var found = argsDictionary.TryGetValue(fullname, out var optionValue);
+            if (!found)
+            {
+                value = default;
+                return false; 
+            }
+
+            value = int.Parse(optionValue);
+            return true;
+        }
+
+
+        /// <summary>
+        /// Parse the value of an argument as a string.
         /// </summary>
         /// <param name="argsDictionary">Dictionary of all arguments Ex: <c>{ "--port":"12312", "--parentprocessid":"2312" }</c></param>
         /// <param name="fullname">The full name for required argument. Ex: "--port"</param>

src/Microsoft.TestPlatform.ObjectModel/DebugAssertException.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
+{
+    using System;
+
+    public sealed class DebugAssertException : Exception
+    {
+        public DebugAssertException(string message, string stackTrace) : base(message)
+        {
+            StackTrace = stackTrace;
+        }
+
+        public override string StackTrace { get; }
+    }
+}

src/testhost.x86/DefaultEngineInvoker.cs

@@ -84,6 +84,10 @@ public void Invoke(IDictionary<string, string> argsDictionary)
 #endif
             }
 
+#if NETCOREAPP
+            TestHostTraceListener.Setup();
+#endif
+
             this.SetParentProcessExitCallback(argsDictionary);
 
             this.requestHandler.ConnectionInfo =
@@ -92,7 +96,8 @@ public void Invoke(IDictionary<string, string> argsDictionary)
             // Initialize Communication with vstest.console
             this.requestHandler.InitializeCommunication();
 
-            // Initialize DataCollection Communication if data collection port is provided.
+            // skipping because 0 is the default value, and also the value the the callers use when they
+            // call with the parameter specified, but without providing an actual port
             var dcPort = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, DataCollectionPortArgument);
             if (dcPort > 0)
             {
@@ -176,22 +181,35 @@ private void ConnectToDatacollector(int dcPort)
         private void SetParentProcessExitCallback(IDictionary<string, string> argsDictionary)
         {
             // Attach to exit of parent process
-            var parentProcessId = CommandLineArgumentsHelper.GetIntArgFromDict(argsDictionary, ParentProcessIdArgument);
-            EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: Monitoring parent process with id: '{0}'",
-                parentProcessId);
+            var hasParentProcessArgument = CommandLineArgumentsHelper.TryGetIntArgFromDict(argsDictionary, ParentProcessIdArgument, out var parentProcessId);
 
-            // In remote scenario we cannot monitor parent process, so we expect user to pass parentProcessId as -1
-            if (parentProcessId != -1)
+            if (!hasParentProcessArgument)
             {
-                this.processHelper.SetExitCallback(
-                    parentProcessId,
-                    (obj) =>
-                    {
-                        EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: ParentProcess '{0}' Exited.",
-                            parentProcessId);
-                        new PlatformEnvironment().Exit(1);
-                    });
+                throw new ArgumentException($"Argument {ParentProcessIdArgument} was not specified.");
+            }
+
+            EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: Monitoring parent process with id: '{0}'", parentProcessId);
+
+            if (parentProcessId == -1)
+            {
+                // In remote scenario we cannot monitor parent process, so we expect user to pass parentProcessId as -1
+                return;
+            }
+
+            if (parentProcessId == 0)
+            {
+                //TODO: should there be a warning / error in this case, on windows and linux we are most likely not started by this PID 0, because it's Idle process on Windows, and Swapper on Linux, and similarly in docker
+                // Trying to attach to 0 will cause access denied error on Windows
             }
+
+            this.processHelper.SetExitCallback(
+                parentProcessId,
+                (obj) =>
+                {
+                    EqtTrace.Info("DefaultEngineInvoker.SetParentProcessExitCallback: ParentProcess '{0}' Exited.",
+                        parentProcessId);
+                    new PlatformEnvironment().Exit(1);
+                });
         }
 
         private static TestHostConnectionInfo GetConnectionInfo(IDictionary<string, string> argsDictionary)