Merged PR 961813: upgrade vstest to 17.4.1

Now that 17.4.1 has a fix for microsoft/vstest#3266 we can stop putting unit test DLL build output in separate subfolders. This should reduce the build size and generate correct code coverage information for unit tests.

.pipelines/include-runtests.yml

@@ -28,7 +28,7 @@ steps:
   displayName: 'Visual Studio Test Platform Installer'
   inputs:
     versionSelector: specificVersion
-    testPlatformVersion: 17.1.0
+    testPlatformVersion: 17.4.1
 - task: VSTest@2
   displayName: '${{ parameters.testRunTitle }}'
   timeoutInMinutes: ${{ parameters.timeoutInMinutes }}

ChangeLog.md

@@ -3,6 +3,7 @@
 Update this document for internal and externally visible changes. The public change log is on github. Put most recent changes first.
 Once we push a new version to nuget.org add a double hash header for that version.
 
+- Upgrade VSTest to 17.4.1 to remove workaround for unit test builds
 - Fix Databases collection not to login to each database when app asks for `Status` property
 - Enable datetime masked columns
 - Update product display names

Packages.props

@@ -16,12 +16,12 @@
         <PackageReference Update="Microsoft.Data.Tools.StringResourceTool" Version="3.2.0" />
         <PackageReference Update="Microsoft.Identity.Client"                                Version="4.35.0" />
         <PackageReference Update="Microsoft.Identity.Client.Desktop"                        Version="4.35.0" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.1" />
         <PackageReference Update="Microsoft.SqlServer.Assessment" Version="1.1.9" />
         <PackageReference Update="Microsoft.SqlServer.Management.SqlParser" Version="$(SqlParserPackageVersion)" />
         <PackageReference Update="Moq" Version="4.16.1" />
-        <PackageReference Update="MSTest.TestAdapter" Version="2.0.0" />
-        <PackageReference Update="MSTest.TestFramework" Version="2.0.0" />
+        <PackageReference Update="MSTest.TestAdapter" Version="2.2.10" />
+        <PackageReference Update="MSTest.TestFramework" Version="2.2.10" />
         <PackageReference Update="NewtonSoft.Json" Version="13.0.1" />
         <PackageReference Update="NUnit" Version="3.11.0" />
         <PackageReference Update="System.Buffers"                                           Version="4.5.1" />

src/UnitTest/Directory.Build.props

@@ -6,10 +6,6 @@
     <TargetFrameworks>$(NetfxVersion);netcoreapp3.1</TargetFrameworks>
     <!-- the auto generated redirect for newtonsoft breaks the runtime resolver -->
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
-    <!-- Each unit test builds to its own folder to avoid a race condition in the build
-      See https://github.com/microsoft/vstest/issues/3266
-     -->
-    <OutputPath>$(OutputPath)\$(MSBuildProjectName)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NewtonSoft.Json" />