From 52ca00ae5e3671d965d1703e3aa369a4414be2c2 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 24 Aug 2022 14:57:05 -0700
Subject: Move WiX .wixpdbs to pdbs folder so they are included in archives

---
 src/Directory.wixproj.props     | 10 ----------
 src/setup/Directory.Build.props |  6 ++++++
 2 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 src/Directory.wixproj.props

diff --git a/src/Directory.wixproj.props b/src/Directory.wixproj.props
deleted file mode 100644
index 1191bd66..00000000
--- a/src/Directory.wixproj.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-<Project>
-  <PropertyGroup>
-    <!-- TODO: changing the .wixpdb folder does not actually work until issue #6857 is resolved
-    <PdbOutputDir>$(PdbsFolder)</PdbOutputDir>
-    -->
-  </PropertyGroup>
-</Project>
diff --git a/src/setup/Directory.Build.props b/src/setup/Directory.Build.props
index df00142d..be2ca6d5 100644
--- a/src/setup/Directory.Build.props
+++ b/src/setup/Directory.Build.props
@@ -7,4 +7,10 @@
   </PropertyGroup>
 
   <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <PlatformFolder Condition=" '$(Platform)' == 'AnyCPU' ">x86</PlatformFolder>
+    <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder>
+    <PdbOutputDir>$(PdbsFolder)$(PlatformFolder)\</PdbOutputDir>
+  </PropertyGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb