From 36f267888027ab69d003dce3ccdb1df745707424 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 7 Nov 2019 07:05:11 -0800
Subject: [PATCH 1/2] Update implicit package versions for 2.2.7 and 2.1.14
 (#5566)

---
 src/redist/targets/GenerateBundledVersions.targets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 18bfa55c2..e3d975489 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -106,28 +106,28 @@
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.0"
-                               LatestVersion="2.1.13" />
+                               LatestVersion="2.1.14" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
-                               LatestVersion="2.2.7" />
+                               LatestVersion="2.2.8" />
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.13"/>
+                               LatestVersion="2.1.14"/>
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.13"/>
+                               LatestVersion="2.1.14"/>
 
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
-                               LatestVersion="2.2.7"/>
+                               LatestVersion="2.2.8"/>
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
-                               LatestVersion="2.2.7"/>
+                               LatestVersion="2.2.8"/>
     </ItemGroup>
 
     <PropertyGroup>

From 760598230660987b01bc6d4e5a54d71d00927792 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Fri, 8 Nov 2019 13:58:10 -0800
Subject: [PATCH 2/2] Set DOTNET_ROOT in tests (#5584)

---
 .../Commands/TestCommand.cs                           | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
index a82872429..c25fcd533 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
@@ -145,6 +145,17 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
             psi.Environment["DOTNET_MULTILEVEL_LOOKUP"] = "0";
             psi.Environment["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 
+            // Set DOTNET_ROOT to ensure sub process find the same host fxr
+            string dotnetDirectoryPath = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
+            if (System.Environment.Is64BitProcess)
+            {
+                psi.Environment.Add("DOTNET_ROOT", dotnetDirectoryPath);
+            }
+            else
+            {
+                psi.Environment.Add("DOTNET_ROOT(x86)", dotnetDirectoryPath);
+            }
+
             AddEnvironmentVariablesTo(psi);
 
             AddWorkingDirectoryTo(psi);