-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
chore: Add AppHost validation to DisassemblyDiagniser on macos environment #3080
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
Closed
+47
−2
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| using BenchmarkDotNet.Extensions; | ||
| using System.Diagnostics; | ||
| using System.Reflection; | ||
|
|
||
| namespace BenchmarkDotNet.Detectors; | ||
|
|
||
| internal static class AppHostDetector | ||
| { | ||
| public static bool HasAppHost() | ||
| { | ||
| var entryAssembly = Assembly.GetEntryAssembly(); | ||
|
|
||
| // Check NativeAOT | ||
| if (entryAssembly == null) | ||
| return false; | ||
|
|
||
| using var process = Process.GetCurrentProcess(); | ||
| var processName = process.ProcessName; | ||
|
|
||
| // Check executed with `dotnet run` | ||
| if (processName.Equals("dotnet", StringComparison.OrdinalIgnoreCase)) | ||
| return false; | ||
|
|
||
| // Check Single-file executable (AppHost is bundled) | ||
| if (entryAssembly.Location.IsBlank()) | ||
| return true; | ||
|
|
||
| // Check entry assembly extension. | ||
| if (entryAssembly.Location.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) | ||
| return true; | ||
|
|
||
| // Return false for unknown environment | ||
| return false; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GetEntryAssembly also returns null in test frameworks, so this doesn't even catch the issue you found.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it able to provide code/environment that reproduce issue?
I've testes
AppHostDetector.csbehavior on Windows with following combinations .But it can't reproduce issue.
As far as I've confirmed
testhost.dllis resolved as entry assembly when using xunit.v2.And test DLL is resolved when using xunit.v3.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my first prototype of #2682 I tried using it and found it to return null in the test framework. 35b0082#diff-3e3d929255c5bc775e61d756a968c3a994409c578dba06e5630745484c7ce62bR52-R54
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://stackoverflow.com/a/53228317
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was using the old manual running multiple frameworks test project, which at the time was using an ancient version of xUnit, so maybe it's doesn't repro anymore. But it seems unreliable at least.