Skip to content

Commit b7daab6

Browse files
committed
Changed default toolchain for .Net Framework to CsProjClassicNetToolchain.
1 parent e6fdc6b commit b7daab6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/BenchmarkDotNet/Running/BuildPartition.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ internal bool ForcedNoDependenciesForIntegrationTests
8080
{
8181
get
8282
{
83-
if (!XUnitHelper.IsIntegrationTest.Value || !RuntimeInformation.IsNetCore)
83+
if (!XUnitHelper.IsIntegrationTest.Value)
8484
return false;
8585

8686
var job = RepresentativeBenchmarkCase.Job;

src/BenchmarkDotNet/Toolchains/ToolchainExtensions.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ internal static IToolchain GetToolchain(this Runtime runtime, Descriptor? descri
3636
{
3737
case ClrRuntime clrRuntime:
3838
if (!preferMsBuildToolchains && RuntimeInformation.IsFullFramework
39-
&& RuntimeInformation.GetCurrentRuntime().MsBuildMoniker == runtime.MsBuildMoniker)
39+
&& RuntimeInformation.GetCurrentRuntime().MsBuildMoniker == runtime.MsBuildMoniker
40+
// If dotnet SDK is installed, we use CsProjClassicNetToolchain.
41+
&& !HostEnvironmentInfo.GetCurrent().IsDotNetCliInstalled())
4042
{
4143
return RoslynToolchain.Instance;
4244
}

0 commit comments

Comments
 (0)