Skip to content

Commit ce91468

Browse files
authored
Merge pull request #1 from DataDog/macrogreg/betterdirprops
Only include C++ specific settings into Directory.Build.props when project is C++
2 parents 758c904 + 88b80ea commit ce91468

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Directory.Build.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@
184184

185185
</PropertyGroup>
186186

187-
<PropertyGroup>
187+
<PropertyGroup Condition=" '$(AvoidRedirectingBinaryOutput)' != 'True' And '$(MSBuildProjectExtension)' == '.vcxproj' ">
188188
<!-- Specific items for C++ projects: -->
189+
<!-- (Note this this group is only included for .vcxproj projects. If there are ever other projects that need it, adjust accordingly.) -->
189190

190191
<!-- IntDir is the equivalent for IntermediateOutputPath in C++ projects (must have training slash). -->
191192
<IntDir>$(IntermediateOutputPath)\</IntDir>
@@ -195,7 +196,7 @@
195196

196197
</PropertyGroup>
197198

198-
<PropertyGroup>
199+
<PropertyGroup Condition=" '$(AvoidRedirectingBinaryOutput)' != 'True' ">
199200
<!-- Enable NuGet package restore during build -->
200201
<RestorePackages>true</RestorePackages>
201202
<RequireRestoreConsent>false</RequireRestoreConsent>
@@ -238,6 +239,7 @@
238239
<!-- It can be used to view the details of the redefinitions, but be careful when using it for debugging. -->
239240

240241
<Message Text="[$(RdrctOutptMsgPrefix)] Project file: &quot;$(MSBuildProjectFullPath)&quot;." Importance="high"/>
242+
<Message Text="[$(RdrctOutptMsgPrefix)] MSBuildProjectExtension: &quot;$(MSBuildProjectExtension)&quot;." Importance="high"/>
241243
<Message Text="[$(RdrctOutptMsgPrefix)] Set-Output-Dirs PROPS file: &quot;$(MSBuildThisFileFullPath)&quot;." Importance="high"/>
242244

243245
<Message Text="[$(RdrctOutptMsgPrefix)] AvoidRedirectingBinaryOutput: &quot;$(AvoidRedirectingBinaryOutput)&quot;." Importance="high" />

0 commit comments

Comments
 (0)