From 6bb2e4aee160888202ed6c0a094d515075aa578e Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Fri, 6 Jul 2018 14:35:43 -0500
Subject: [PATCH] Need to re-default output properties after writing
 $(OutputPath).

When using SDK-style projects, Microsoft.Common.targets are getting imported before buildtools' targets. Thus when we overwrite $(OutputPath), we need to also reset the other output properties.
---
 .../PackageFiles/ReferenceAssemblies.targets         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ReferenceAssemblies.targets b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ReferenceAssemblies.targets
index 593f41f323..29855f2af8 100644
--- a/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ReferenceAssemblies.targets
+++ b/src/Microsoft.DotNet.Build.Tasks/PackageFiles/ReferenceAssemblies.targets
@@ -24,6 +24,18 @@
     <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(IsReferenceAssembly)'=='true' AND '$(UsingMicrosoftNETSdk)'=='true'">
+    <!-- When not using Sdk-style projects, Microsoft.Common.CurrentVersion.targets,  
+         (which defaults the below properties) is imported after this file, so these properties
+         are getting set correctly.
+         When using Sdk-style projects, Microsoft.Common.CurrentVersion.targets gets imported before
+         this file, so we are overwriting OutputPath too late and we need to re-default these properties. -->
+
+    <OutDir>$(OutputPath)</OutDir>
+    <TargetDir>$([MSBuild]::Escape($([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(OutDir)`))`))))</TargetDir>
+    <TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(IsReferenceAssembly)'=='true'">
     <!-- All reference assemblies should have the 0x70 flag which prevents them from loading 
          and the ReferenceAssemblyAttribute. -->