-
-
Notifications
You must be signed in to change notification settings - Fork 1k
.Net SDK Validation #2523
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
.Net SDK Validation #2523
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
018a199
Adding DotNetSDK Validation
MattFromRVA bbcf2bd
Added support for Wasm and NativeAot
MattFromRVA d8b3b24
Added missing case statements
MattFromRVA 79ba305
Code cleanup
MattFromRVA 4df6484
Separated providers for .Net and .Net Framework. Added validation to …
MattFromRVA dce4a1b
Put code into static utility class. Updated toolchains
MattFromRVA 6e65722
Updated validator and toolchains
MattFromRVA b442d38
Updated toolchains and framework validation
MattFromRVA 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
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
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
43 changes: 32 additions & 11 deletions
43
src/BenchmarkDotNet/Toolchains/MonoAotLLVM/MonoAotLLVMToolChain.cs
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 |
---|---|---|
@@ -1,24 +1,45 @@ | ||
using BenchmarkDotNet.Characteristics; | ||
using BenchmarkDotNet.Running; | ||
using BenchmarkDotNet.Toolchains.DotNetCli; | ||
using BenchmarkDotNet.Validators; | ||
using System.Collections.Generic; | ||
|
||
namespace BenchmarkDotNet.Toolchains.MonoAotLLVM | ||
{ | ||
public class MonoAotLLVMToolChain : Toolchain | ||
{ | ||
public MonoAotLLVMToolChain(string name, IGenerator generator, IBuilder builder, IExecutor executor) | ||
private readonly string _customDotNetCliPath; | ||
|
||
public MonoAotLLVMToolChain(string name, IGenerator generator, IBuilder builder, IExecutor executor, string customDotNetCliPath) | ||
: base(name, generator, builder, executor) | ||
{ | ||
_customDotNetCliPath = customDotNetCliPath; | ||
} | ||
|
||
public static IToolchain From(NetCoreAppSettings netCoreAppSettings) | ||
=> new MonoAotLLVMToolChain(netCoreAppSettings.Name, | ||
new MonoAotLLVMGenerator(netCoreAppSettings.TargetFrameworkMoniker, | ||
netCoreAppSettings.CustomDotNetCliPath, | ||
netCoreAppSettings.PackagesPath, | ||
netCoreAppSettings.CustomRuntimePack, | ||
netCoreAppSettings.AOTCompilerPath, | ||
netCoreAppSettings.AOTCompilerMode), | ||
new DotNetCliBuilder(netCoreAppSettings.TargetFrameworkMoniker, | ||
netCoreAppSettings.CustomDotNetCliPath), | ||
new Executor()); | ||
=> new MonoAotLLVMToolChain(netCoreAppSettings.Name, | ||
new MonoAotLLVMGenerator(netCoreAppSettings.TargetFrameworkMoniker, | ||
netCoreAppSettings.CustomDotNetCliPath, | ||
netCoreAppSettings.PackagesPath, | ||
netCoreAppSettings.CustomRuntimePack, | ||
netCoreAppSettings.AOTCompilerPath, | ||
netCoreAppSettings.AOTCompilerMode), | ||
new DotNetCliBuilder(netCoreAppSettings.TargetFrameworkMoniker, | ||
netCoreAppSettings.CustomDotNetCliPath), | ||
new Executor(), | ||
netCoreAppSettings.CustomDotNetCliPath); | ||
|
||
public override IEnumerable<ValidationError> Validate(BenchmarkCase benchmarkCase, IResolver resolver) | ||
{ | ||
foreach (var validationError in base.Validate(benchmarkCase, resolver)) | ||
{ | ||
yield return validationError; | ||
} | ||
|
||
foreach (var validationError in DotNetSdkValidator.ValidateCoreSdks(_customDotNetCliPath, benchmarkCase)) | ||
{ | ||
yield return validationError; | ||
} | ||
} | ||
} | ||
} |
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.