diff --git a/src/BenchmarkDotNet/Jobs/EnvironmentMode.cs b/src/BenchmarkDotNet/Jobs/EnvironmentMode.cs index bd92387814..8917426b70 100644 --- a/src/BenchmarkDotNet/Jobs/EnvironmentMode.cs +++ b/src/BenchmarkDotNet/Jobs/EnvironmentMode.cs @@ -38,7 +38,7 @@ public EnvironmentMode(string id, Jit jit, Platform platform) : this(id) public EnvironmentMode(string id) : base(id) => GcCharacteristic[this] = new GcMode(); /// - /// Platform (x86 or x64) + /// Platform (x86, x64, ARM, ARM64, Wasm) /// public Platform Platform { diff --git a/src/BenchmarkDotNet/Templates/CsProj.txt b/src/BenchmarkDotNet/Templates/CsProj.txt index bb02c50e98..2e3b6405d3 100644 --- a/src/BenchmarkDotNet/Templates/CsProj.txt +++ b/src/BenchmarkDotNet/Templates/CsProj.txt @@ -27,6 +27,11 @@ + + + + + diff --git a/src/BenchmarkDotNet/Toolchains/CsProj/CsProjCoreToolchain.cs b/src/BenchmarkDotNet/Toolchains/CsProj/CsProjCoreToolchain.cs index 300697c5c8..0ea64fa00d 100644 --- a/src/BenchmarkDotNet/Toolchains/CsProj/CsProjCoreToolchain.cs +++ b/src/BenchmarkDotNet/Toolchains/CsProj/CsProjCoreToolchain.cs @@ -54,11 +54,6 @@ public override bool IsSupported(BenchmarkCase benchmarkCase, ILogger logger, IR logger.WriteLineError($"Currently project.json does not support CpuGroups (app.config does), benchmark '{benchmarkCase.DisplayInfo}' will not be executed"); return false; } - if (benchmarkCase.Job.ResolveValue(GcMode.AllowVeryLargeObjectsCharacteristic, resolver)) - { - logger.WriteLineError($"Currently project.json does not support gcAllowVeryLargeObjects (app.config does), benchmark '{benchmarkCase.DisplayInfo}' will not be executed"); - return false; - } var benchmarkAssembly = benchmarkCase.Descriptor.Type.Assembly; if (benchmarkAssembly.IsLinqPad()) diff --git a/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs b/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs index a552f620a0..9119661fbb 100644 --- a/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs +++ b/tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs @@ -5,9 +5,7 @@ using BenchmarkDotNet.Attributes; using BenchmarkDotNet.Configs; using BenchmarkDotNet.Jobs; -#if CLASSIC using BenchmarkDotNet.Environments; -#endif namespace BenchmarkDotNet.IntegrationTests { @@ -59,7 +57,6 @@ public void CanAvoidForcingGarbageCollections() CanExecute(config); } -#if CLASSIC // not supported by project.json so far [Fact] public void CanAllowToCreateVeryLargeObjectsFor64Bit() { @@ -78,7 +75,6 @@ public void CanAllowToCreateVeryLargeObjectsFor64Bit() CanExecute(config); } -#endif } public class ServerModeEnabled