From 1ae2775b2922c888f20fedf1ffb94817f3ae5220 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Wed, 17 Oct 2018 11:15:57 -0700
Subject: [PATCH 1/4] Insert updated toolset

---
 build/DependencyVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 8c1ffa374..50b89db06 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ToolsetVersion>3.0.100-alpha1-009519</ToolsetVersion>
+    <ToolsetVersion>3.0.100-alpha1-009562</ToolsetVersion>
   </PropertyGroup>
 
   <PropertyGroup>

From bc32a5344e6b1d98d38bfc03614a1363a9079ebe Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 18 Oct 2018 23:55:08 -0700
Subject: [PATCH 2/4] Add TargetFramework metadata to KnownFrameworkReference

---
 build/MSBuildExtensions.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 1a2e75e2f..9c5f30923 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -156,6 +156,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     
     <KnownFrameworkReference Include="Microsoft.DesktopUI"
+                              TargetFramework="netcoreapp3.0"
                               RuntimeFrameworkName="Microsoft.DesktopUI.App"
                               DefaultRuntimeFrameworkVersion="$(MicrosoftDesktopUIPackageVersion)"
                               LatestRuntimeFrameworkVersion="$(MicrosoftDesktopUIPackageVersion)"
@@ -164,6 +165,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                               />
 
     <KnownFrameworkReference Include="Microsoft.AspNetCore"
+                              TargetFramework="netcoreapp3.0"
                               RuntimeFrameworkName="Microsoft.AspNetCore.App"
                               DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
                               LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"

From ecaba4f6f32250deff5bb10a00270af2dbd0959a Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 18 Oct 2018 23:55:29 -0700
Subject: [PATCH 3/4] Update latest patch versions

---
 build/MSBuildExtensions.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 9c5f30923..9de15905c 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -62,11 +62,11 @@
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="1.0"
                                DefaultVersion="1.0.5"
-                               LatestVersion="1.0.12" />
+                               LatestVersion="1.0.13" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="1.1"
                                DefaultVersion="1.1.2"
-                               LatestVersion="1.1.9" />
+                               LatestVersion="1.1.10" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.0"
                                DefaultVersion="2.0.0"

From acc97038e8ce8d299321b12c5691570f38a0a446 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Fri, 19 Oct 2018 08:44:39 -0700
Subject: [PATCH 4/4] Apply workaround for
 https://github.com/dotnet/cli/issues/10196

---
 test/EndToEnd/GivenDotNetUsesMSBuild.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/EndToEnd/GivenDotNetUsesMSBuild.cs b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
index ed0b95c46..474bcf14c 100644
--- a/test/EndToEnd/GivenDotNetUsesMSBuild.cs
+++ b/test/EndToEnd/GivenDotNetUsesMSBuild.cs
@@ -37,11 +37,16 @@ namespace Microsoft.DotNet.Tests.EndToEnd
                     .Execute()
                     .Should().Pass();
 
-                new RunCommand()
-                    .WithWorkingDirectory(projectDirectory)
-                    .ExecuteWithCapturedOutput()
+                var runCommand = new RunCommand()
+                    .WithWorkingDirectory(projectDirectory);
+
+                //  Set DOTNET_ROOT as workaround for https://github.com/dotnet/cli/issues/10196
+                runCommand = runCommand.WithEnvironmentVariable(Environment.Is64BitProcess ? "DOTNET_ROOT" : "DOTNET_ROOT(x86)",
+                    Path.GetDirectoryName(DotnetUnderTest.FullName));
+
+                runCommand.ExecuteWithCapturedOutput()
                     .Should().Pass()
-                         .And.HaveStdOutContaining("Hello World!");
+                    .And.HaveStdOutContaining("Hello World!");
 
                 var binDirectory = new DirectoryInfo(projectDirectory).Sub("bin");
                 binDirectory.Should().HaveFilesMatching("*.dll", SearchOption.AllDirectories);