Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable EventPipe when EventSource is enabled #82200

Merged
merged 4 commits into from
Feb 20, 2023
Merged

Enable EventPipe when EventSource is enabled #82200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4b7c2c
Fix issue #81943
LakshanF Feb 15, 2023
413c0d6
Add EventPipe library only for Windows
LakshanF Feb 15, 2023
f81cece
Fix OS check
LakshanF Feb 16, 2023
e04c1af
Use EventPipe library in Windows if EventSource is enabled
LakshanF Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The .NET Foundation licenses this file to you under the MIT license.
<LinkerSubsystem Condition="'$(OutputType)' == 'WinExe' and '$(LinkerSubsystem)' == ''">WINDOWS</LinkerSubsystem>
<LinkerSubsystem Condition="'$(OutputType)' == 'Exe' and '$(LinkerSubsystem)' == ''">CONSOLE</LinkerSubsystem>
<EventPipeName>eventpipe-disabled</EventPipeName>
<EventPipeName Condition="'$(EnableNativeEventPipe)' == 'true'">eventpipe-enabled</EventPipeName>
<EventPipeName Condition="'$(EnableNativeEventPipe)' == 'true' or '$(EventSourceSupport)' == 'true'">eventpipe-enabled</EventPipeName>
</PropertyGroup>

<!-- Ensure that runtime-specific paths have already been set -->
Expand Down
1 change: 0 additions & 1 deletion ...xtensions.Logging.EventSource/tests/Microsoft.Extensions.Logging.EventSource.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
<EnableNativeEventPipe Condition="'$(TestNativeAot)' == 'true' and '$(TargetPlatformIdentifier)' == 'windows'">true</EnableNativeEventPipe>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions ...nosticSource/tests/NativeAotTests/System.Diagnostics.DiagnosticSource.NativeAotTests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<Project DefaultTargets="Build">
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />


<ItemGroup Condition="'$([MSBuild]::IsOSPlatform(Windows))' == 'true'">
<TestConsoleAppSourceFiles Include="DiagnosticSourceEventSourceTests.cs"
EnabledProperties="EventSourceSupport;EnableNativeEventPipe" />
</ItemGroup>
<ItemGroup Condition="'$([MSBuild]::IsOSPlatform(Windows))' == 'false'">
<ItemGroup>
<TestConsoleAppSourceFiles Include="DiagnosticSourceEventSourceTests.cs"
EnabledProperties="EventSourceSupport" />
</ItemGroup>
Expand Down