Skip to content

Commit

Permalink
Support TargetFramework.Sdk in SymStore.targets (#4858)
Browse files Browse the repository at this point in the history
* Support TargetFramework.Sdk in SymStore.targets

Fixes dotnet/runtime#32300

This fixes the frequent failures where multiple inner builds try to write to the same location in combination with SymStore.targets. As discussed in the linked issue, we should investigate if we can change the TargetFramework.Sdk to not depend on such hacks.
  • Loading branch information
ViktorHofer authored Feb 17, 2020
1 parent 3f39a45 commit bd2a2b0
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/Microsoft.DotNet.Arcade.Sdk/tools/SymStore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
<_BuildsPortablePdb>false</_BuildsPortablePdb>
<_BuildsPortablePdb Condition="'$(DebugType)' == 'portable' or '$(DebugType)' == 'embedded'">true</_BuildsPortablePdb>

<_SymStoreOutputDir>$(ArtifactsSymStoreDirectory)$(MSBuildProjectName)\$(TargetFramework)\</_SymStoreOutputDir>
<_SymStoreTargetFramework>$(TargetFramework)</_SymStoreTargetFramework>
<!--
Support Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk TargetFrameworkSuffix property.
TODO: Remove when https://github.com/dotnet/arcade/issues/4859 is fixed.
-->
<_SymStoreTargetFramework Condition="'$(TargetFrameworkSuffix)' != ''">$(_SymStoreTargetFramework)-$(TargetFrameworkSuffix)</_SymStoreTargetFramework>
<_SymStoreOutputDir>$(ArtifactsSymStoreDirectory)$(MSBuildProjectName)\$(_SymStoreTargetFramework)\</_SymStoreOutputDir>
<_SymStorePdbPath>$(_SymStoreOutputDir)$(TargetName).pdb</_SymStorePdbPath>

<!-- By default publish Windows PDBs only for shipping components -->
Expand Down

0 comments on commit bd2a2b0

Please sign in to comment.