diff --git a/src/BenchmarkDotNet/Templates/MonoAOTLLVMCsProj.txt b/src/BenchmarkDotNet/Templates/MonoAOTLLVMCsProj.txt
index a0ad858c54..1db40072d1 100644
--- a/src/BenchmarkDotNet/Templates/MonoAOTLLVMCsProj.txt
+++ b/src/BenchmarkDotNet/Templates/MonoAOTLLVMCsProj.txt
@@ -1,4 +1,12 @@
 <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>
+  </PropertyGroup>
+
+  <Import Project="$(MonoPropsPath)" Condition="Exists($(MonoPropsPath))" />
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <OutputPath>bin</OutputPath>
@@ -11,6 +19,7 @@
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StartupObject>BenchmarkDotNet.Autogenerated.UniqueProgramName</StartupObject>
+    <SelfContained>true</SelfContained>
   </PropertyGroup>
 
   <ItemGroup>
@@ -75,4 +84,5 @@
 
    </Target>
 
+  <Import Project="$(MonoTargetsPath)" Condition="Exists($(MonoTargetsPath))" />
 </Project>
diff --git a/src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs b/src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs
index 77401f022e..31546d3112 100644
--- a/src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs
+++ b/src/BenchmarkDotNet/Toolchains/DotNetCli/DotNetCliCommand.cs
@@ -90,6 +90,9 @@ public BuildResult RestoreThenBuild()
                     buildResult = BuildNoRestoreNoDependencies();
             }
 
+            if (!buildResult.IsSuccess)
+                return BuildResult.Failure(GenerateResult, buildResult.AllInformation);
+
             return buildResult.ToBuildResult(GenerateResult);
         }