From 9273759dca814882aa107d563270ce3be67e0a7a Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 29 Jun 2018 11:02:39 -0700
Subject: [PATCH 01/16] [2.1]: Remove unused project capability from
 Microsoft.AspNetCore.App (#1237)

Removing this from .App in 2.1.3 because this was unused, and the capability is not actually supported by VS. This will be re-added in the future versions of .App when we land the VS integration for in-process hosting.

cref https://github.com/aspnet/IISIntegration/pull/969
---
 .../build/netcoreapp2.1/Microsoft.AspNetCore.App.props     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props
index b45f971fa7..009b464763 100644
--- a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props
+++ b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props
@@ -11,11 +11,4 @@
     <_AspNetCoreAppSharedFxIsEnabled Condition=" '$(_AspNetCoreAppSharedFxIsEnabled)' == '' ">true</_AspNetCoreAppSharedFxIsEnabled>
   </PropertyGroup>
 
-  <!--
-    Capability that enables Visual Studio support for hosting Asp.Net Core applications in the IIS process
-  -->
-  <ItemGroup>
-    <ProjectCapability Include="AspNetInProcessHosting" />
-  </ItemGroup>
-
 </Project>

From 1b69fd7fbe90a021df5d7264014b3c19e3a6a7e9 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 29 Jun 2018 11:22:17 -0700
Subject: [PATCH 02/16] Updating submodule(s)

Mvc => c4d5ef94a9e070c5757a0ae6361c369ef83344b6

[auto-updated: submodules]
---
 modules/Mvc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Mvc b/modules/Mvc
index 78fc49ba0c..c4d5ef94a9 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit 78fc49ba0c8ad7859e1f3a8aa6c3d17c7cd11f5a
+Subproject commit c4d5ef94a9e070c5757a0ae6361c369ef83344b6

From 8908fbd8b20bad86a4edf114b706327c192199ad Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 29 Jun 2018 11:52:17 -0700
Subject: [PATCH 03/16] Updating submodule(s)

Razor => 1c9208ba110a16eb98085406fd7db874657b642c

[auto-updated: submodules]
---
 modules/Razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Razor b/modules/Razor
index ca2d5738d6..1c9208ba11 160000
--- a/modules/Razor
+++ b/modules/Razor
@@ -1 +1 @@
-Subproject commit ca2d5738d61f3b751511da3a44cc04fd8a7ae724
+Subproject commit 1c9208ba110a16eb98085406fd7db874657b642c

From e9274a4d9388ac968e7971d52bd4b3e0b5b41dba Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 29 Jun 2018 19:22:19 +0000
Subject: [PATCH 04/16] Updating submodule(s)

Mvc => 82f7f2aab88f1b9af15f60df3830ed327b2d5a89

[auto-updated: submodules]
---
 modules/Mvc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Mvc b/modules/Mvc
index c4d5ef94a9..82f7f2aab8 160000
--- a/modules/Mvc
+++ b/modules/Mvc
@@ -1 +1 @@
-Subproject commit c4d5ef94a9e070c5757a0ae6361c369ef83344b6
+Subproject commit 82f7f2aab88f1b9af15f60df3830ed327b2d5a89

From 297659eff8cc5ddb48f108cb6bd32780c660ca6e Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 29 Jun 2018 13:03:14 -0700
Subject: [PATCH 05/16] Updating submodule(s)

EntityFrameworkCore => 77512c451480d52f9b4e2970a8ba72d9f38c0141

[auto-updated: submodules]
---
 modules/EntityFrameworkCore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index c5ef200857..77512c4514 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit c5ef20085735805e585874b29bdf99ba44365b61
+Subproject commit 77512c451480d52f9b4e2970a8ba72d9f38c0141

From c11c72ac236cffeb73110fe35ab1d7f374834d0e Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Fri, 29 Jun 2018 17:34:12 -0700
Subject: [PATCH 06/16] Updating submodule(s)

EntityFrameworkCore => 15bc370703ee500c4c7ff1a4a670c97a829b839b

[auto-updated: submodules]
---
 modules/EntityFrameworkCore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index 77512c4514..15bc370703 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit 77512c451480d52f9b4e2970a8ba72d9f38c0141
+Subproject commit 15bc370703ee500c4c7ff1a4a670c97a829b839b

From d456fdba63ed213dcb6bd99735ecd06c1eb89946 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 29 Jun 2018 19:37:15 -0700
Subject: [PATCH 07/16] Don't publish the runtime-site-extension in servicing
 builds

---
 build/Publish.targets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index 645a816460..cc47d871c1 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -62,7 +62,6 @@
       <NpmBlobBasePath>aspnetcore/npm/</NpmBlobBasePath>
       <AliasBlobBasePath>aspnetcore/Runtime/$(SharedFxCliBlobChannel)/</AliasBlobBasePath>
       <PackageArchiveFileName>nuGetPackagesArchive-$(PackageVersion).lzma</PackageArchiveFileName>
-      <SiteExtensionArchiveFileName>runtime-site-extension-internal-$(PackageVersion).zip</SiteExtensionArchiveFileName>
       <InstallerBaseFileName>aspnetcore-runtime-$(PackageVersion)</InstallerBaseFileName>
       <InstallerAliasBaseFileName>aspnetcore-runtime-latest</InstallerAliasBaseFileName>
       <IntermediateInstallerBaseFileName>aspnetcore-runtime-internal-$(PackageVersion)</IntermediateInstallerBaseFileName>
@@ -77,11 +76,6 @@
       </FilesToPublish>
 
       <!-- Intermediate files passed on to the dotnet-CLI. -->
-      <FilesToPublish Include="$(DependencyAssetsDir)$(SiteExtensionArchiveFileName)" Condition="@(Repository->AnyHaveMetadataValue('Identity', 'AzureIntegration'))">
-        <RelativeBlobPath>$(BlobBasePath)$(SiteExtensionArchiveFileName)</RelativeBlobPath>
-        <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
-      </FilesToPublish>
-
       <FilesToPublish Include="$(DependencyAssetsDir)$(PackageArchiveFileName)" >
         <RelativeBlobPath>$(BlobBasePath)$(PackageArchiveFileName)</RelativeBlobPath>
         <ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>

From 1baa04d9b8902cdff88adceb410af2f1985fd0df Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Sat, 30 Jun 2018 21:46:02 -0700
Subject: [PATCH 08/16] Updating submodule(s)

EntityFrameworkCore => fac2ede689ff55b0337161d81a0e61dc794d84d5

[auto-updated: submodules]
---
 modules/EntityFrameworkCore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index 15bc370703..fac2ede689 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit 15bc370703ee500c4c7ff1a4a670c97a829b839b
+Subproject commit fac2ede689ff55b0337161d81a0e61dc794d84d5

From 3313973c98dfc92d09e272d57a16bba5a986fb09 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Mon, 2 Jul 2018 09:52:12 -0700
Subject: [PATCH 09/16] Updating BuildTools from 2.1.3-rtm-15795 to
 2.1.3-rtm-15796

[auto-updated: buildtools]
---
 korebuild-lock.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 9998f36c2d..6572c83114 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.3-rtm-15795
-commithash:866028c9d39a52bbdef2ee6c1406493d1c0a0290
+version:2.1.3-rtm-15796
+commithash:bb5fcc49ee843d3be2ebd4cc879658db55fc79da

From 55e0fd5677f35e821edcd4822352f2addb1c113a Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 2 Jul 2018 17:02:30 -0700
Subject: [PATCH 10/16] Fix the version override check for ProdCon builds

---
 build/dependencies.props                          | 1 -
 test/SharedFx.UnitTests/SharedFx.UnitTests.csproj | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index f0587a1537..bbc2910674 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -11,7 +11,6 @@
   <PropertyGroup>
     <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
     <MicrosoftNETCoreApp21PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp21PackageVersion>
-    <MicrosoftNETCoreAppPackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' == ''">$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreAppPackageVersion>
 
     <!-- Determined by build tools -->
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
diff --git a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
index 31a39f032c..e574f7d305 100644
--- a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
+++ b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
@@ -24,7 +24,7 @@
     </AssemblyAttribute>
     <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
       <_Parameter1>MicrosoftNETCoreAppPackageVersion</_Parameter1>
-      <_Parameter2>$(MicrosoftNETCoreAppPackageVersion)</_Parameter2>
+      <_Parameter2>$(RuntimeFrameworkVersion)</_Parameter2>
     </AssemblyAttribute>
   </ItemGroup>
 

From d2d9a47686585364350353221ee63c5dc591f947 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 3 Jul 2018 10:08:25 -0700
Subject: [PATCH 11/16] Invoke dotnet vstest directly instead of using the
 VSTest target

Attempt to workaround Microsoft/vstest#1503 which causes test failure output to be swallowed
---
 build/SharedFx.targets | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index ed0bb6cf96..2c206a87b1 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -540,9 +540,24 @@
         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="VSTest" Properties="$(UnitTestFxTestProps)" />
+    <MSBuild Projects="$(UnitTestFxProject)" Targets="Build" Properties="$(UnitTestFxTestProps)">
+      <Output TaskParameter="TargetOutputs" ItemName="SharedFxTestAssembly" />
+    </MSBuild>
+    <RunDotNet Arguments="vstest;
+      --Framework:%(TargetFrameworkIdentifier),Version=v%(TargetFrameworkVersion);
+      --Logger:$([MSBuild]::Escape('trx;LogFileName=$(TrxFile)'));
+      %(SharedFxTestAssembly.Identity);
+      --;RunConfiguration.NoAutoReporters=true" IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode" PropertyName="VsTestExitCode" />
+    </RunDotNet>
+
+    <Message Text="##teamcity[importData type='vstest' path='$(TrxFile)']"
+      Importance="High"
+      Condition="'$(TEAMCITY_VERSION)' != '' AND Exists($(TrxFile))" />
+    <Error Text="SharedFx.UnitTests failed with exit code '$(VsTestExitCode)'." Condition=" $(VsTestExitCode) != 0 " />
   </Target>
 
 </Project>

From 218cb74edcb9d13e1fa4f53334d6d849be5a3021 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 3 Jul 2018 10:54:59 -0700
Subject: [PATCH 12/16] Updating BuildTools from 2.1.3-rtm-15796 to
 2.1.3-rtm-15797

[auto-updated: buildtools]
---
 korebuild-lock.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 6572c83114..8d72cdc036 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.3-rtm-15796
-commithash:bb5fcc49ee843d3be2ebd4cc879658db55fc79da
+version:2.1.3-rtm-15797
+commithash:d1b6240ad6605601afe9aa993d7bedb1a00c4cb2

From 5717594bafd148fe03cd63d603395e0f11aacf86 Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Tue, 3 Jul 2018 11:50:51 -0700
Subject: [PATCH 13/16] Updating BuildTools from 2.1.3-rtm-15797 to
 2.1.3-rtm-15799

[auto-updated: buildtools]
---
 korebuild-lock.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 8d72cdc036..ccb5adf875 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.3-rtm-15797
-commithash:d1b6240ad6605601afe9aa993d7bedb1a00c4cb2
+version:2.1.3-rtm-15799
+commithash:48ea43fbffa6c3d0fc8b51dbbaf69ce52b26da7c

From a7811c56562699035f4fac7715428a5426d8c719 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 3 Jul 2018 11:14:40 -0700
Subject: [PATCH 14/16] Ensure .NET Core runtimes are install in alpine builds
 to tests can run

---
 build/SharedFx.targets         |  2 +-
 build/docker/alpine.Dockerfile | 11 -----------
 build/repo.props               |  2 +-
 dockerbuild.sh                 |  7 -------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 2c206a87b1..594e914840 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -530,7 +530,7 @@
 
   <Target Name="BuildSharedFx" DependsOnTargets="GeneratePropsFiles;ResolveSharedFxFiles;CrossGenAssemblies;CrossGenSymbols;PackSharedFx;TestSharedFx"/>
 
-  <Target Name="TestSharedFx" DependsOnTargets="DefineSharedFxPrerequisites;ResolveCommitHash">
+  <Target Name="TestSharedFx" DependsOnTargets="GeneratePropsFiles;DefineSharedFxPrerequisites;ResolveCommitHash;InstallDotNet">
     <PropertyGroup>
       <UnitTestFxProject>$(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj</UnitTestFxProject>
       <UnitTestFxTestProps>
diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile
index 4dcc47505c..ae9cbab56f 100644
--- a/build/docker/alpine.Dockerfile
+++ b/build/docker/alpine.Dockerfile
@@ -25,14 +25,3 @@ ENV LANG en_US.UTF-8
 
 # Skip package initilization
 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Workarounds https://github.com/dotnet/cli/issues/8738
-ENV DOTNET_INSTALL_SKIP_PREREQS=1
-ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1
-
-COPY global.json /tmp/global.json
-RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \
-    && echo "Installing SDK ${DOTNET_SDK_VERSION}" \
-    && wget -q --tries 10 -O /tmp/dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \
-    && mkdir -p "$HOME/.dotnet" \
-    && tar xzf /tmp/dotnet.tar.gz -C "$HOME/.dotnet"
diff --git a/build/repo.props b/build/repo.props
index eab83a9e31..f4a27e3115 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -43,7 +43,7 @@
 
   <ItemGroup>
     <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe -->
-    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" Condition="'$(SharedFXRid)' != 'linux-musl-x64'" />
 
     <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"
       Feed="$(DotNetAssetRootUrl)"
diff --git a/dockerbuild.sh b/dockerbuild.sh
index 6299846115..a3f61b7a17 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -90,13 +90,6 @@ fi
 dockerfile="$DIR/build/docker/$image.Dockerfile"
 tagname="universe-build-$image"
 
-# Workaround for https://github.com/dotnet/cli/issues/8738 and https://github.com/Microsoft/msbuild/issues/3066
-# Run noop target because we need to generate the global.json file so we can install the matching
-# .NET Core SDK inside the Docker container.
-"$DIR/build.sh" /t:Noop
-cp "$DIR/global.json" "$(dirname "$dockerfile")"
-#endworkaround
-
 docker build "$(dirname "$dockerfile")" \
     --build-arg "USER=$(whoami)" \
     --build-arg "USER_ID=$(id -u)" \

From 7b00c7739126c5699223fc2c362f94ebd759d87b Mon Sep 17 00:00:00 2001
From: "ASP.NET CI" <aspnetci@users.noreply.github.com>
Date: Wed, 4 Jul 2018 00:02:08 +0000
Subject: [PATCH 15/16] Updating submodule(s)

Templating => 727bd52b64a022fda0db882fb74bf2d434a17ea4

[auto-updated: submodules]
---
 modules/Templating | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/Templating b/modules/Templating
index a6b303c83c..727bd52b64 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit a6b303c83c1cd4d4e0d302e07064713eafa3ed39
+Subproject commit 727bd52b64a022fda0db882fb74bf2d434a17ea4

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 16/16] 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"