Cleanup and use version variables

Author: HaoK

Directory.Build.targets

@@ -45,9 +45,8 @@
   <Import Project="eng\targets\Packaging.targets" Condition=" '$(MSBuildProjectExtension)' == '.csproj' " />
   <Import Project="eng\targets\ResolveReferences.targets" Condition=" '$(DisableReferenceRestrictions)' != 'true' AND '$(MSBuildProjectExtension)' == '.csproj' " />
 
-    <ItemGroup>
+  <ItemGroup>
     <PackageReference Include="xunit.runner.console" Version="2.4.1" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
-    <DistributedTestPlatform Include="Windows10.x64" />
   </ItemGroup>
 
   <Target Name="CreateTestPayload" Returns="@(TestPayload)">
@@ -76,7 +75,6 @@
     <Copy SourceFiles="@(XunitConsoleRunnerFiles)" DestinationFolder="$(PublishDir)" />
   </Target>
 
-  <!-- TODO: Exclude non test projects and net461 on non windows -->
   <Target Name="_CreateTestPayloadInner" 
     DependsOnTargets="Publish;CollectXunitConsoleRunner" 
     Condition="'$(IsTestProject)' == 'true' AND ('$(HelixTargetQueue)' == 'Windows.10.Amd64.Open' OR '$(TargetFrameworkIdentifier)' != '.NETFramework')" 
@@ -88,15 +86,11 @@
 
     <!-- Windows NetCore -->
     <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework' AND '$(HelixTargetQueue)' == 'Windows.10.Amd64.Open'" >
-        <!-- TODO: Clean this up -->
         <_CopyItems Include="$(MSBuildThisFileDirectory)test\vstest\runtests.cmd" />
-        <!-- switch to downloading this either before publish or on helix workers -->
-        <!-- <_CopyItems Include="$(MSBuildThisFileDirectory)test\vstest\dotnet-install.ps1" /> -->
     </ItemGroup>
 
     <!-- Windows NetFramework -->
     <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(HelixTargetQueue)' == 'Windows.10.Amd64.Open'" >
-        <!-- TODO: Clean this up -->
         <_CopyItems Include="$(MSBuildThisFileDirectory)test\xunit\runtests.cmd" />
     </ItemGroup>
 
@@ -107,22 +101,13 @@
 
     <Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(PublishAbsoluteDir)" />
 
-    <!-- <ItemGroup>
-      <PublishDirFiles Include="$(PublishAbsoluteDir)/**/*" />
-    </ItemGroup> -->
-
-    <!-- <Copy SourceFiles="@(PublishDirFiles)" DestinationFolder="$(ArtifactsDir)\Helix\$(TargetFramework)\%(RecursiveDir)" /> -->
-
     <ItemGroup>
       <TestPayload Include="$(PublishAbsoluteDir.TrimEnd('\').TrimEnd('\'))">
         <TestAssembly>$(TargetFileName)</TestAssembly>
         <TestName>$(MSBuildProjectName)/$(TargetFramework)</TestName>
         <!-- Look into how to be able to use $(NETCoreSdkVersion) -->
-        <!-- <Command Condition="'$(HelixTargetQueue)' == 'Windows.10.Amd64.Open'">%HELIX_CORRELATION_PAYLOAD%\$(TargetFramework)\runtests.cmd %HELIX_CORRELATION_PAYLOAD%\$(TargetFramework)\$(TargetFileName) 2.1.500-preview-009398 2.1.6</Command>
-        <Command Condition="'$(HelixTargetQueue)' != 'Windows.10.Amd64.Open'">$HELIX_CORRELATION_PAYLOAD/$(TargetFramework)/runtests.sh $HELIX_CORRELATION_PAYLOAD/$(TargetFramework)/$(TargetFileName) 2.1.500-preview-009398 2.1.6</Command> -->
-        <Command Condition="'$(HelixTargetQueue)' == 'Windows.10.Amd64.Open'">runtests.cmd $(TargetFileName) 2.1.500-preview-009398 2.1.6</Command>
-        <Command Condition="'$(HelixTargetQueue)' != 'Windows.10.Amd64.Open'">./runtests.sh $(TargetFileName) 2.1.500-preview-009398 2.1.6</Command>
-        <TestPlatform>%(DistributedTestPlatform.Identity)</TestPlatform>
+        <Command Condition="'$(HelixTargetQueue)' == 'Windows.10.Amd64.Open'">runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(RuntimeFrameworkVersion)</Command>
+        <Command Condition="'$(HelixTargetQueue)' != 'Windows.10.Amd64.Open'">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(RuntimeFrameworkVersion)</Command>
         <TestTimeout>$(DistributedTestTimeout)</TestTimeout>
       </TestPayload>
     </ItemGroup>