From b82a6ab367f45942c9de8806d3ef9759952f4e4e Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Mon, 24 Aug 2020 12:56:26 +0200
Subject: [PATCH 1/4] enable the CanAllowToCreateVeryLargeObjectsFor64Bit test
 for .NET Core

---
 tests/BenchmarkDotNet.IntegrationTests/GcModeTests.cs | 4 ----
 1 file changed, 4 deletions(-)

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<AvoidForcingGarbageCollection>(config);
         }
 
-#if CLASSIC // not supported by project.json so far
         [Fact]
         public void CanAllowToCreateVeryLargeObjectsFor64Bit()
         {
@@ -78,7 +75,6 @@ public void CanAllowToCreateVeryLargeObjectsFor64Bit()
 
             CanExecute<CreateVeryLargeObjects>(config);
         }
-#endif
     }
 
     public class ServerModeEnabled

From 0f64650d9b5efd29b7bfada233a0693c222a76af Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Mon, 24 Aug 2020 12:56:45 +0200
Subject: [PATCH 2/4] update xml comment

---
 src/BenchmarkDotNet/Jobs/EnvironmentMode.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
 
         /// <summary>
-        /// Platform (x86 or x64)
+        /// Platform (x86, x64, ARM, ARM64, Wasm)
         /// </summary>
         public Platform Platform
         {

From 305c5343e76804334616c5f2948be61e3364a59c Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Mon, 24 Aug 2020 12:59:50 +0200
Subject: [PATCH 3/4] remove old condition that was correct only for .NET Core
 1.0 (project.json era) ;)

---
 src/BenchmarkDotNet/Toolchains/CsProj/CsProjCoreToolchain.cs | 5 -----
 1 file changed, 5 deletions(-)

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())

From 99e5ea200727f6ef603271864523c36ee523c64f Mon Sep 17 00:00:00 2001
From: Adam Sitnik <adam.sitnik@gmail.com>
Date: Mon, 24 Aug 2020 13:50:18 +0200
Subject: [PATCH 4/4] don't generate App.config file for Full .NET Framework,
 BenchmarkDotNet does it on it's own

---
 src/BenchmarkDotNet/Templates/CsProj.txt | 5 +++++
 1 file changed, 5 insertions(+)

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 @@
     <Compile Include="$CODEFILENAME$" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <!-- don't generate App.config file for Full .NET Framework, BenchmarkDotNet does it on it's own -->
+    <None Include="App.config" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="$CSPROJPATH$" />
   </ItemGroup>