Skip to content

Commit 387ca0e

Browse files
authored
fix the CI (#2079)
* 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)
1 parent 6bb61ce commit 387ca0e

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

src/BenchmarkDotNet/Toolchains/NativeAot/Generator.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ private string GenerateProjectForNuGetBuild(BuildPartition buildPartition, Artif
137137
<IlcGenerateCompleteTypeMetadata>{ilcGenerateCompleteTypeMetadata}</IlcGenerateCompleteTypeMetadata>
138138
<IlcGenerateStackTraceData>{ilcGenerateStackTraceData}</IlcGenerateStackTraceData>
139139
<EnsureNETCoreAppRuntime>false</EnsureNETCoreAppRuntime> <!-- workaround for 'This runtime may not be supported by.NET Core.' error -->
140+
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles> <!-- workaround for 'Found multiple publish output files with the same relative path.' error -->
140141
<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
141142
{GetInstructionSetSettings(buildPartition)}
142143
</PropertyGroup>

tests/BenchmarkDotNet.IntegrationTests/NativeAotTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public void LatestNativeAotVersionIsSupported()
2323
return;
2424
if (ContinuousIntegration.IsAppVeyorOnWindows()) // too time consuming for AppVeyor (1h limit)
2525
return;
26+
if (NativeAotRuntime.GetCurrentVersion().RuntimeMoniker < RuntimeMoniker.NativeAot70) // we can't target net6.0 and use .NET 7 ILCompiler anymore (#2080)
27+
return;
2628

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

0 commit comments

Comments
 (0)