diff options
| -rw-r--r-- | src/Directory.wixproj.props | 10 | ||||
| -rw-r--r-- | src/setup/Directory.Build.props | 6 |
2 files changed, 6 insertions, 10 deletions
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <!-- 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. --> | ||
| 3 | |||
| 4 | <Project> | ||
| 5 | <PropertyGroup> | ||
| 6 | <!-- TODO: changing the .wixpdb folder does not actually work until issue #6857 is resolved | ||
| 7 | <PdbOutputDir>$(PdbsFolder)</PdbOutputDir> | ||
| 8 | --> | ||
| 9 | </PropertyGroup> | ||
| 10 | </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 @@ | |||
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | 8 | ||
| 9 | <Import Project="..\Directory.Build.props" /> | 9 | <Import Project="..\Directory.Build.props" /> |
| 10 | |||
| 11 | <PropertyGroup> | ||
| 12 | <PlatformFolder Condition=" '$(Platform)' == 'AnyCPU' ">x86</PlatformFolder> | ||
| 13 | <PlatformFolder Condition=" '$(PlatformFolder)' == '' ">$(Platform)</PlatformFolder> | ||
| 14 | <PdbOutputDir>$(PdbsFolder)$(PlatformFolder)\</PdbOutputDir> | ||
| 15 | </PropertyGroup> | ||
| 10 | </Project> | 16 | </Project> |