Skip to content

Improve build for mono aot #2367

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

Merged
merged 4 commits into from
Jul 12, 2023
Merged

Improve build for mono aot #2367

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
608e3b3
DotNetCliCommand.cs: Fail the build if no-dependencies retry build fails
radical Jul 11, 2023
b1405b5
MonoAOTLLVMCsProj.txt: Add auto-imports for extension props/targets
radical Jul 12, 2023
45ffe94
MonoAOTLLVMCsProj.txt: Imports the props file early enough to allow
radical Jul 12, 2023
0c003d7
MonoAOTLLVMCsProj.txt: Add SelfContained=true
radical Jul 12, 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
6 changes: 6 additions & 0 deletions src/BenchmarkDotNet/Templates/MonoAOTLLVMCsProj.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTarget="Publish">
<PropertyGroup>
<OriginalCSProjPath>$CSPROJPATH$</OriginalCSProjPath>
<MonoPropsPath>$([System.IO.Path]::ChangeExtension('$(OriginalCSProjPath)', '.Mono.props'))</MonoPropsPath>
<MonoTargetsPath>$([System.IO.Path]::ChangeExtension('$(OriginalCSProjPath)', '.Mono.targets'))</MonoTargetsPath>
<OutputType>Exe</OutputType>
<OutputPath>bin</OutputPath>
<TargetFramework>$TFM$</TargetFramework>
Expand All @@ -13,6 +16,8 @@
<StartupObject>BenchmarkDotNet.Autogenerated.UniqueProgramName</StartupObject>
</PropertyGroup>

<Import Project="$(MonoPropsPath)" Condition="Exists($(MonoPropsPath))" />

<ItemGroup>
<PackageReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task" version="6.0.0-*" GeneratePathProperty="true" />
</ItemGroup>
Expand Down Expand Up @@ -75,4 +80,5 @@

</Target>

<Import Project="$(MonoTargetsPath)" Condition="Exists($(MonoTargetsPath))" />
</Project>
3 changes: 3 additions & 0 deletions src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ public BuildResult RestoreThenBuild()
buildResult = BuildNoRestoreNoDependencies();
}

if (!buildResult.IsSuccess)
return BuildResult.Failure(GenerateResult, buildResult.AllInformation);

return buildResult.ToBuildResult(GenerateResult);
}

Expand Down