Use .NET SDK in NetCore.Test project

- for now, unable to target `netcoreapp2.1` in NetCore.Test project
  - Microsoft.Net.Http is not compatible
  - System.Net.Http types have different identities, causing compilation failures
- switch to use `dotnet vstest` for any .NET Core assemblies (just one currently)
  - can use `Xunit` target for all .NET Framework assemblies
- make XunitXml.TestLogger available for .NET Core App testing
  - use above test logger in repo-level testing
  - integrate w/ tests that use the `Xunit` target
- don't import from xunit.msbuild.runner when targeting .NET Core; not needed
- add `$(CopyLocalLockFileAssemblies)` to these (now both .NET SDK) test projects
  - xUnit assemblies were not copied (when they should have been) w/o this

Author: dougbu

Runtime.msbuild

@@ -68,10 +68,11 @@
       <_NuGetPackagesAndSolutions Include="Runtime.sln" />
 
       <!-- Avoid restoring RuntimePortable.sln directly. -->
-      <_NuGetPackagesAndSolutions Include="src\System.Net.Http.Formatting.NetCore\packages.config;
-          test\System.Net.Http.Formatting.NetCore.Test\packages.config"
+      <_NuGetPackagesAndSolutions Include="src\System.Net.Http.Formatting.NetCore\packages.config"
         Condition=" '$(BuildPortable)' == 'true' " />
-      <_ProjectsToRestore Include="test\System.Net.Http.Formatting.NetStandard.Test\System.Net.Http.Formatting.NetStandard.Test.csproj"
+      <_ProjectsToRestore Include="
+          test\System.Net.Http.Formatting.NetCore.Test\System.Net.Http.Formatting.NetCore.Test.csproj;
+          test\System.Net.Http.Formatting.NetStandard.Test\System.Net.Http.Formatting.NetStandard.Test.csproj"
         Condition=" '$(BuildPortable)' == 'true' " />
     </ItemGroup>
 
@@ -114,11 +115,17 @@
   <Target Name="RunTests" DependsOnTargets="CheckSkipStrongNames">
     <ItemGroup>
       <_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll" />
-      <_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.*.dll" />
-      <_TestDLLsXunit Include="bin\$(Configuration)\Test\NetCore\*.Test.dll" Condition="'$(BuildPortable)' == 'true'" />
+      <_TestDLLsXunit Include="bin\$(Configuration)\test\*\net4*\*.Test.dll" />
       <_XunitProject Include="tools\WebStack.xunit.targets">
         <Properties>TestAssembly=%(_TestDLLsXunit.FullPath);XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
       </_XunitProject>
+
+      <_VSTestDLLs Include="bin\$(Configuration)\test\*\netcoreapp*\*.Test.dll" />
+    </ItemGroup>
+    <ItemGroup>
+      <_VSTestDLLs>
+        <TestResultsPath>$(TestResultsDirectory)%(FileName)-NetCoreApp-XunitResults.xml</TestResultsPath>
+      </_VSTestDLLs>
     </ItemGroup>
 
     <!-- Recreate the test results directory so that print summary doesn't run on old test results. -->
@@ -129,12 +136,11 @@
       <Output TaskParameter="TargetOutputs" ItemName="_ExitCodes" />
     </MSBuild>
 
-    <!-- Failures in this project will fail build. But, results will not be included in test run summary. -->
-    <MSBuild
-      Properties="Configuration=$(Configuration)"
-      Projects="test\System.Net.Http.Formatting.NetStandard.Test\System.Net.Http.Formatting.NetStandard.Test.csproj"
-      Targets="Test"
-      Condition="'$(BuildPortable)' == 'true'" />
+    <Exec Command="dotnet vstest @(_VSTestDLLs) --logger:&quot;xunit;LogFilePath=%(_VSTestDLLs.TestResultsPath)&quot;"
+        Condition=" '$(BuildPortable)' == 'true' "
+        IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode" ItemName="_VSTestErrorCode" />
+    </Exec>
   </Target>
 
   <Target Name="CheckSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames">

RuntimePortable.sln

@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestCommon", "tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Formatting.NetCore", "src\System.Net.Http.Formatting.NetCore\System.Net.Http.Formatting.NetCore.csproj", "{C7060639-719B-4BD2-8A37-2F146B5A0668}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http.Formatting.NetCore.Test", "test\System.Net.Http.Formatting.NetCore.Test\System.Net.Http.Formatting.NetCore.Test.csproj", "{8DA61DAC-FF7E-4CA1-93A0-6148DB66FD08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Formatting.NetCore.Test", "test\System.Net.Http.Formatting.NetCore.Test\System.Net.Http.Formatting.NetCore.Test.csproj", "{8DA61DAC-FF7E-4CA1-93A0-6148DB66FD08}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Formatting.NetStandard", "src\System.Net.Http.Formatting.NetStandard\System.Net.Http.Formatting.NetStandard.csproj", "{636CA76A-C85C-42E2-B4AA-88046279B3CA}"
 EndProject

packages/repositories.config

@@ -21,7 +21,6 @@
   <repository path="..\test\Microsoft.Web.Helpers.Test\packages.config" />
   <repository path="..\test\Microsoft.Web.Mvc.Test\packages.config" />
   <repository path="..\test\Microsoft.Web.WebPages.OAuth.Test\packages.config" />
-  <repository path="..\test\System.Net.Http.Formatting.NetCore.Test\packages.config" />
   <repository path="..\test\System.Net.Http.Formatting.Test\packages.config" />
   <repository path="..\test\System.Web.Cors.Test\packages.config" />
   <repository path="..\test\System.Web.Helpers.Test\packages.config" />

test/Directory.Build.props

@@ -4,6 +4,6 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <TargetFrameworkVersion Condition="'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard.Test'">v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion Condition=" !$(MSBuildProjectName.StartsWith('System.Net.Http.Formatting.Net')) ">v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
 </Project>

test/Directory.Build.targets

@@ -1,6 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.targets" />
-  <Import Project="..\packages\**\xunit.runner.msbuild.props" />
+  <Import Project="..\packages\**\xunit.runner.msbuild.props"
+      Condition="$(IsTestProject) and '$(MSBuildRuntimeType)' != 'Core' and '$(TargetFrameworkIdentifier)' == '.NETFramework'" />
 
   <Target Name="Test" DependsOnTargets="_TestWithVSTest;_TestWithDotnetTest;_TestWithRunner" />