File tree Expand file tree Collapse file tree
shared/src/Datadog.Trace.ClrProfiler.Native
src/Datadog.Tracer.Native Expand file tree Collapse file tree Original file line number Diff line number Diff line change 188188 <DOTNET-TRACER-REPO-ROOT-PATH >$([System.IO.Path]::GetFullPath( $(EnlistmentRoot)/ ))</DOTNET-TRACER-REPO-ROOT-PATH >
189189 <SHARED-LIB-PATH >$(DOTNET-TRACER-REPO-ROOT-PATH)shared\src\native-lib\</SHARED-LIB-PATH >
190190 <CORECLR-PATH >$(SHARED-LIB-PATH)coreclr\src</CORECLR-PATH >
191- <SHARED-LIB-INCLUDES >$(SHARED-LIB-PATH)fmt\include;$(SHARED-LIB-PATH)spdlog\include</SHARED-LIB-INCLUDES >
191+ <!-- Suppress warnings from vendored headers without suppressing warnings in Datadog code. -->
192+ <ExternalIncludePath >$(SHARED-LIB-PATH)fmt\include;$(SHARED-LIB-PATH)spdlog\include;$(ExternalIncludePath)</ExternalIncludePath >
192193 <!-- VCPKG setup -->
193194 <VcpkgEnableManifest >true</VcpkgEnableManifest >
194195 <VcpkgUseStatic >false</VcpkgUseStatic >
207208 PatchSpdlogFile in tracer/build/_build/UpdateVendors/VendoredDependency.cs).
208209 Defined here on Windows for consistency. -->
209210 <PreprocessorDefinitions >%(PreprocessorDefinitions);MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS=1;FMT_UNICODE=0;DD_SPDLOG_NO_MDC</PreprocessorDefinitions >
211+ <ExternalWarningLevel >TurnOffAllWarnings</ExternalWarningLevel >
210212 <BuildStlModules >false</BuildStlModules >
211213 <EnableModules >false</EnableModules >
212214 </ClCompile >
Original file line number Diff line number Diff line change 4343 <DOTNET-TRACER-REPO-ROOT-PATH >..\..\..\</DOTNET-TRACER-REPO-ROOT-PATH >
4444 <SHARED-LIB-PATH >$(DOTNET-TRACER-REPO-ROOT-PATH)shared/src/native-lib/</SHARED-LIB-PATH >
4545 <LIB_INCLUDES >$(SHARED-LIB-PATH)coreclr\src\pal\prebuilt\inc</LIB_INCLUDES >
46- <SHARED-LIB-INCLUDES >$(SHARED-LIB-PATH)spdlog\include</ SHARED-LIB-INCLUDES >
46+ <ExternalIncludePath >$(SHARED-LIB-PATH)spdlog\include;$(ExternalIncludePath)</ ExternalIncludePath >
4747 </PropertyGroup >
4848 <Import Project =" $(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4949 <PropertyGroup Condition =" '$(Configuration)|$(Platform)'=='Debug|Win32'" Label =" Configuration" >
156156 </PropertyGroup >
157157 <ItemDefinitionGroup >
158158 <ClCompile >
159+ <!-- Suppress warnings from vendored headers without suppressing warnings in Datadog code. -->
160+ <ExternalWarningLevel >TurnOffAllWarnings</ExternalWarningLevel >
159161 <!-- spdlog 1.17 (and the bundled fmt 11+) need two build flags:
160162 - FMT_UNICODE=0: fmt 11+ static_asserts that narrow string literals are UTF-8.
161163 We don't compile with /utf-8 (would change the encoding of every narrow string in
390392 <Import Project =" $(VCTargetsPath)\Microsoft.Cpp.targets" />
391393 <ImportGroup Label =" ExtensionTargets" >
392394 </ImportGroup >
393- </Project >
395+ </Project >
Original file line number Diff line number Diff line change @@ -294,9 +294,24 @@ bool RequiresThoroughTesting()
294294 NuGetTasks . NuGetRestore ( s => s
295295 . SetTargetPath ( Solution )
296296 . SetVerbosity ( NuGetVerbosity . Normal )
297- . SetProcessLogOutput ( ! IsServerBuild )
297+ . SetProcessLogOutput ( true )
298298 . When ( ! string . IsNullOrEmpty ( NugetPackageDirectory ) , o =>
299- o . SetPackagesDirectory ( NugetPackageDirectory ) ) ) ;
299+ o . SetPackagesDirectory ( NugetPackageDirectory ) )
300+ . When ( IsServerBuild || IsGitlab , o =>
301+ o . SetProcessCustomLogger ( ( type , text ) =>
302+ {
303+ var trimmedText = text . TrimStart ( ) ;
304+ if ( ! trimmedText . StartsWith ( "Installed " , StringComparison . Ordinal ) &&
305+ ! trimmedText . StartsWith ( "Restoring NuGet package " , StringComparison . Ordinal ) &&
306+ ! trimmedText . StartsWith ( "Adding package '" , StringComparison . Ordinal ) &&
307+ ! trimmedText . StartsWith ( "Added package '" , StringComparison . Ordinal ) &&
308+ ! trimmedText . StartsWith ( "GET " , StringComparison . Ordinal ) &&
309+ ! trimmedText . StartsWith ( "OK " , StringComparison . Ordinal ) &&
310+ ! trimmedText . StartsWith ( "NotFound " , StringComparison . Ordinal ) )
311+ {
312+ NuGetTasks . NuGetLogger ( type , text ) ;
313+ }
314+ } ) ) ) ;
300315 }
301316 else
302317 {
Original file line number Diff line number Diff line change 4141 <RootNamespace >DatadogTraceClrProfilerNativeDLL</RootNamespace >
4242 <WindowsTargetPlatformVersion >10.0</WindowsTargetPlatformVersion >
4343 <LIB_PATH >..\..\..\shared\src\native-lib\</LIB_PATH >
44- <LIB_INCLUDES >$(LIB_PATH)spdlog\include;$(LIB_PATH)coreclr\src\pal\prebuilt\inc</LIB_INCLUDES >
44+ <LIB_INCLUDES >$(LIB_PATH)coreclr\src\pal\prebuilt\inc</LIB_INCLUDES >
45+ <ExternalIncludePath >$(LIB_PATH)spdlog\include;$(ExternalIncludePath)</ExternalIncludePath >
4546 </PropertyGroup >
4647 <Import Project =" $(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4748 <PropertyGroup Condition =" '$(Configuration)|$(Platform)'=='Debug|Win32'" Label =" Configuration" >
142143 </PropertyGroup >
143144 <ItemDefinitionGroup >
144145 <ClCompile >
146+ <!-- Suppress warnings from vendored headers without suppressing warnings in Datadog code. -->
147+ <ExternalWarningLevel >TurnOffAllWarnings</ExternalWarningLevel >
145148 <!-- spdlog 1.17 (and the bundled fmt 11+) need two build flags:
146149 - FMT_UNICODE=0: fmt 11+ static_asserts that narrow string literals are UTF-8.
147150 We don't compile with /utf-8 (would change the encoding of every narrow string in
344347 <Import Project =" $(VCTargetsPath)\Microsoft.Cpp.targets" />
345348 <ImportGroup Label =" ExtensionTargets" >
346349 </ImportGroup >
347- </Project >
350+ </Project >
Original file line number Diff line number Diff line change 4343 <CORECLR_PATH >..\..\..\shared\src\native-lib\coreclr</CORECLR_PATH >
4444 <ProjectName >Datadog.Tracer.Native</ProjectName >
4545 <LIB_PATH >..\..\..\shared\src\native-lib\</LIB_PATH >
46- <LIB_INCLUDES >$(CORECLR_PATH)\src\pal\prebuilt\inc;$(CORECLR_PATH)\src\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(LIB_PATH)spdlog\include</LIB_INCLUDES >
46+ <LIB_INCLUDES >$(CORECLR_PATH)\src\pal\prebuilt\inc;$(CORECLR_PATH)\src\inc;$(VC_IncludePath);$(WindowsSDK_IncludePath)</LIB_INCLUDES >
47+ <ExternalIncludePath >$(LIB_PATH)spdlog\include;$(ExternalIncludePath)</ExternalIncludePath >
4748 </PropertyGroup >
4849 <Import Project =" $(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4950 <PropertyGroup Condition =" '$(Configuration)|$(Platform)'=='Debug|Win32'" Label =" Configuration" >
119120 </PropertyGroup >
120121 <ItemDefinitionGroup >
121122 <ClCompile >
123+ <!-- Suppress warnings from vendored headers without suppressing warnings in Datadog code. -->
124+ <ExternalWarningLevel >TurnOffAllWarnings</ExternalWarningLevel >
122125 <!-- spdlog 1.17 (and the bundled fmt 11+) need two build flags:
123126 - FMT_UNICODE=0: fmt 11+ static_asserts that narrow string literals are UTF-8.
124127 We don't compile with /utf-8 (would change the encoding of every narrow string in
417420 <ClCompile Include =" tracer_tokens.cpp" />
418421 </ItemGroup >
419422 <Import Project =" $(VCTargetsPath)\Microsoft.Cpp.targets" />
420- </Project >
423+ </Project >
You can’t perform that action at this time.
0 commit comments