From 62ea0264e4ab3f58850f7bc61d506d7485d98c61 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 5 Jul 2018 10:14:35 -0700
Subject: [PATCH] Ensure trx logging is reported correctly when building in
 TeamCity

---
 build/SharedFx.targets | 15 +++++++++++----
 dockerbuild.sh         |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 594e914840..2fbdc33202 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -530,9 +530,17 @@
 
   <Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;ResolveSharedFxFiles;CrossGenAssemblies;CrossGenSymbols;PackSharedFx;TestSharedFx"/>
 
+
   <Target Name="TestSharedFx" DependsOnTargets="GeneratePropsFiles;DefineSharedFxPrerequisites;ResolveCommitHash;InstallDotNet">
     <PropertyGroup>
       <UnitTestFxProject>$(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj</UnitTestFxProject>
+
+      <!-- The file path to the log file, from within the container -->
+      <UnitTestFxTrxLogFile>$(LogOutputDir)SharedFx-UnitTests-$(Version).trx</UnitTestFxTrxLogFile>
+      <!-- The trx file path from the perspective of the TeamCity agent -->
+      <UnitTestFxTrxPhysicalFilePath>$(UnitTestFxTrxLogFile)</UnitTestFxTrxPhysicalFilePath>
+      <UnitTestFxTrxPhysicalFilePath Condition="'$(HostMachineRepositoryRoot)' != ''">$(HostMachineRepositoryRoot)/artifacts/logs/SharedFx-UnitTests.trx</UnitTestFxTrxPhysicalFilePath>
+
       <UnitTestFxTestProps>
         DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
         DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
@@ -540,7 +548,6 @@
         RepositoryCommit=$(RepositoryCommit);
         SharedFxRuntimeIdentifier=$(SharedFXRid)
       </UnitTestFxTestProps>
-      <TrxFile>$(LogOutputDir)SharedFx.UnitTests-$(BuildNumber).trx</TrxFile>
     </PropertyGroup>
     <MSBuild Projects="$(UnitTestFxProject)" Targets="Restore" Properties="_Dummy=restore;$(UnitTestFxTestProps)" />
     <MSBuild Projects="$(UnitTestFxProject)" Targets="Build" Properties="$(UnitTestFxTestProps)">
@@ -548,15 +555,15 @@
     </MSBuild>
     <RunDotNet Arguments="vstest;
       --Framework:%(TargetFrameworkIdentifier),Version=v%(TargetFrameworkVersion);
-      --Logger:$([MSBuild]::Escape('trx;LogFileName=$(TrxFile)'));
+      --Logger:$([MSBuild]::Escape('trx;LogFileName=$(UnitTestFxTrxLogFile)'));
       %(SharedFxTestAssembly.Identity);
       --;RunConfiguration.NoAutoReporters=true" IgnoreExitCode="true">
       <Output TaskParameter="ExitCode" PropertyName="VsTestExitCode" />
     </RunDotNet>
 
-    <Message Text="##teamcity[importData type='vstest' path='$(TrxFile)']"
+    <Message Text="##teamcity[importData type='vstest' path='$(UnitTestFxTrxPhysicalFilePath)']"
       Importance="High"
-      Condition="'$(TEAMCITY_VERSION)' != '' AND Exists($(TrxFile))" />
+      Condition="'$(TEAMCITY_VERSION)' != '' AND Exists('$(UnitTestFxTrxLogFile)')" />
     <Error Text="SharedFx.UnitTests failed with exit code '$(VsTestExitCode)'." Condition=" $(VsTestExitCode) != 0 " />
   </Target>
 
diff --git a/dockerbuild.sh b/dockerbuild.sh
index a3f61b7a17..d401522921 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -108,4 +108,5 @@ docker run \
     ${docker_args[@]+"${docker_args[@]}"} \
     $tagname \
     ./build.sh \
-    ${build_args[@]+"${build_args[@]}"}
+    ${build_args[@]+"${build_args[@]}"} \
+    "-p:HostMachineRepositoryRoot=$DIR"