Skip to content

[dotnet] Add a 'EnableProfiler' property to enable the 'diagnostics_tracing' component. Fixes #19370. #22685

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.

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

Merged
merged 1 commit into from
May 1, 2025

Conversation

rolfbjarne
Copy link
Member

Fixes #19370.

@rolfbjarne rolfbjarne requested review from emaf and mauroa as code owners April 28, 2025 06:09
@rolfbjarne
Copy link
Member Author

CC @jonathanpeppers

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build #f0a2184] Build passed (Build packages) ✅

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [PR Build #f0a2184] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

.NET ( No breaking changes )

✅ API diff vs stable

.NET ( No breaking changes )

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ [CI Build #f0a2184] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #f0a2184] Tests on macOS X64 - Mac Sonoma (14) passed 💻

All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #f0a2184] Tests on macOS M1 - Mac Monterey (12) passed 💻

All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #f0a2184] Tests on macOS M1 - Mac Ventura (13) passed 💻

All tests on macOS M1 - Mac Ventura (13) passed.

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build #f0a2184] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

All tests on macOS arm64 - Mac Sequoia (15) passed.

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will we also bring this to .NET 9? The Android change would be something like:

<AndroidEnableProfiler Condition="'$(AndroidEnableProfiler)' == ''">$(EnableProfiler)<AndroidEnableProfiler>

So, it would be fine for .NET 9.

jonathanpeppers added a commit to dotnet/android that referenced this pull request Apr 28, 2025
Context: dotnet/macios#22685
Context: dotnet/macios#19370

To simplify inclusion of the Mono diagnostics component, the
iOS/macOS/etc. workloads are introducing a new `$(EnableProfiler)`
property.

To align with Android, we can make `$(EnableProfiler)` available and
work the same way as the existing `$(AndroidEnableProfiler)` property.

I documented `$(AndroidEnableProfiler)` (which was missing!), and also
added an entry about the new, `$(EnableProfiler)` property.
@rolfbjarne
Copy link
Member Author

Will we also bring this to .NET 9? The Android change would be something like:

Our main branch is still .NET 9, so yes, this will be in .NET 9.

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build #f0a2184] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 115 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 8 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ windows: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: f0a21845527e57d303715245779db1b78d9ccc3d [PR build]

@rolfbjarne rolfbjarne merged commit ed404de into main May 1, 2025
44 checks passed
@rolfbjarne rolfbjarne deleted the dev/rolf/enableprofiler branch May 1, 2025 13:50
jonpryor pushed a commit to dotnet/android that referenced this pull request May 1, 2025
Context: dotnet/macios#22685
Context: dotnet/macios#19370

To simplify inclusion of the Mono diagnostics component, the
iOS/macOS/etc. workloads are introducing a new `$(EnableProfiler)`
MSBuild property.

To align with Android, we can add an `$(EnableProfiler)` MSBuild
property which works the same way as the existing
`$(AndroidEnableProfiler)` MSBuild property.

I documented `$(AndroidEnableProfiler)` (which was missing!), and
also added an entry about the new, `$(EnableProfiler)` property.
jonathanpeppers added a commit to dotnet/android that referenced this pull request May 7, 2025
Context: dotnet/macios#22685
Context: dotnet/macios#19370

To simplify inclusion of the Mono diagnostics component, the
iOS/macOS/etc. workloads are introducing a new `$(EnableProfiler)`
MSBuild property.

To align with Android, we can add an `$(EnableProfiler)` MSBuild
property which works the same way as the existing
`$(AndroidEnableProfiler)` MSBuild property.

I documented `$(AndroidEnableProfiler)` (which was missing!), and
also added an entry about the new, `$(EnableProfiler)` property.
@@ -292,6 +292,8 @@ Copyright (C) 2020 Microsoft. All rights reserved.
<!-- Does not apply unless we're actually building a library - and since BundleOriginalResources can be specified on the command line, use a secondary property -->
<!-- that also encapsulates whether we're a library or not (this makes conditions simpler) -->
<_BundleOriginalResources Condition="'$(OutputType)' == 'Library' And '$(IsAppExtension)' != 'true' And '$(BundleOriginalResources)' == 'true'">true</_BundleOriginalResources>

<EnableProfiling Condition="'$(EnableProfiling)' == '' And '$(_BundlerDebug)' == 'true'">true</EnableProfiling>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should probably be EnableProfiler instead of EnableProfiling

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ops, fix in progress: #22905

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make it possible to enable profiling without enabling anything else
8 participants