From 36052e957d15e8d36a7b585e7e2df79f773b1064 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 06:42:20 -0700
Subject: [PATCH] [release/6.0] Fix publishing symbols for `dotnet` and
 `hostpolicy` (#58902)

* Fix symbol package output path for host pkgproj

* Update src/installer/pkg/projects/Directory.Build.targets

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

Co-authored-by: Elinor Fung <elfung@microsoft.com>
Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---
 src/installer/pkg/projects/Directory.Build.targets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 095938d..f985295 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -6,6 +6,14 @@
       Needs to happen in Directory.Build.targets to allow all the pkgproj's to set Version property first.
     -->
     <StableVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' != 'true'">$(Version)</StableVersion>
+
+    <!--
+      Explicitly re-set the symbol package output path. The pkgproj files here end up importing the targets from
+      Microsoft.DotNet.Build.Tasks.Packaging (based on a PackageReference) before importing the Arcade targets that
+      set defaults for project output paths. This means the value set by the packaging targets does not account for
+      the updated defaults from the Arcade targets.
+    -->
+    <SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
   </PropertyGroup>
 
   <!--
-- 
2.7.4