diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-30 20:07:40 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2018-03-30 20:07:40 +0300 |
| commit | cb372752e0cc03123459f57484ec2ea2c40cc85b (patch) | |
| tree | 79a0d8110304c82a6f91c4bdd036d4b623919770 /dir.props | |
| parent | e2d42fe7842e8ed42bd8b5956349a71895048741 (diff) | |
| parent | d1d5135ef69f0b64001694d93a6a9fc4cd23d23b (diff) | |
Merge branch 'master' into release/2.1
Merge at sha d1d5135ef69f0b64001694d93a6a9fc4cd23d23b
Merge conflicts were only in dependency versions which
should get reset after the next build. Also reset
PrereleaseLabel back to preview2 for the release/2.1 branch
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -174,6 +174,8 @@ <!-- Set the kind of PDB to Portable and turn on SourceLink (fetching source from GitHub) --> <PropertyGroup> <DebugType Condition="'$(DebugType)' == ''">Portable</DebugType> + <!-- Empty DebugType when building for netfx and in windows so that it is set to full or pdbonly later --> + <DebugType Condition="'$(TargetsNetFx)' == 'true' AND '$(RunningOnUnix)' != 'true'"></DebugType> <UseSourceLink>true</UseSourceLink> </PropertyGroup> |