Skip to content

Commit

Permalink
fix the CI (#2079)
Browse files Browse the repository at this point in the history
* set ErrorOnDuplicatePublishOutputFiles to false to stop getting "error NETSDK1152: Found multiple publish output files with the same relative path" about "xunit.runner.json" files

* we can't target net6.0 and use .NET 7 ILCompiler anymore (#2080)
  • Loading branch information
adamsitnik authored Aug 24, 2022
1 parent 6bb61ce commit 387ca0e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/BenchmarkDotNet/Toolchains/NativeAot/Generator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ private string GenerateProjectForNuGetBuild(BuildPartition buildPartition, Artif
<IlcGenerateCompleteTypeMetadata>{ilcGenerateCompleteTypeMetadata}</IlcGenerateCompleteTypeMetadata>
<IlcGenerateStackTraceData>{ilcGenerateStackTraceData}</IlcGenerateStackTraceData>
<EnsureNETCoreAppRuntime>false</EnsureNETCoreAppRuntime> <!-- workaround for 'This runtime may not be supported by.NET Core.' error -->
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles> <!-- workaround for 'Found multiple publish output files with the same relative path.' error -->
<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
{GetInstructionSetSettings(buildPartition)}
</PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public void LatestNativeAotVersionIsSupported()
return;
if (ContinuousIntegration.IsAppVeyorOnWindows()) // too time consuming for AppVeyor (1h limit)
return;
if (NativeAotRuntime.GetCurrentVersion().RuntimeMoniker < RuntimeMoniker.NativeAot70) // we can't target net6.0 and use .NET 7 ILCompiler anymore (#2080)
return;

var toolchain = NativeAotToolchain.CreateBuilder().UseNuGet().IlcInstructionSet(IsAvx2Supported() ? "avx2" : "").ToToolchain();

Expand Down

0 comments on commit 387ca0e

Please sign in to comment.