From 7c4639fcc0679e06a3b1b2f76c2f056c167b698a Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Mon, 29 Jan 2024 15:46:59 +0100
Subject: [PATCH 1/5] Fix the benchmark build

---
 azure-pipelines.yml | 2 +-
 eng/Build.ps1       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ba92e36cbde..df00f0bc2c2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -718,7 +718,7 @@ stages:
           steps:
           - checkout: self
             clean: true
-          - script: eng\CIBuild.cmd -testBenchmarks
+          - script: eng\CIBuild.cmd -configuration $(_BuildConfig) -testBenchmarks
             displayName: Smoke test fast benchmarks
             continueOnError: true
             condition: always()
diff --git a/eng/Build.ps1 b/eng/Build.ps1
index a971d399788..fe7eb56a5b1 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -346,7 +346,7 @@ function TestUsingMSBuild([string] $testProject, [string] $targetFramework, [str
 
     if ($env:RunningAsPullRequest -ne "true" -and $noTestFilter -eq $false) {
         $args += " --filter TestCategory!=PullRequest"
-    }`
+    }
 
     if ($asBackgroundJob) {
         Write-Host("Starting on the background: $args")
@@ -549,11 +549,7 @@ try {
     }
 
     if ($testBenchmarks) {
-        $properties_storage = $properties
-        $properties += "/p:RuntimeIdentifier=win-x64"
-        $properties += "/p:Configuration=Release" # Always run in release.
         BuildSolution "FSharp.Benchmarks.sln" $False
-        $properties = $properties_storage
     }
 
     if ($pack) {

From 96acaf7fc8d65ac16052d1a6e857825372982e53 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:15:02 +0100
Subject: [PATCH 2/5] up

---
 azure-pipelines.yml | 2 --
 eng/Build.ps1       | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index df00f0bc2c2..d0c60adf0be 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -720,8 +720,6 @@ stages:
             clean: true
           - script: eng\CIBuild.cmd -configuration $(_BuildConfig) -testBenchmarks
             displayName: Smoke test fast benchmarks
-            continueOnError: true
-            condition: always()
 
         # Test trimming on Windows
         - job: Build_And_Test_Trimming_Windows
diff --git a/eng/Build.ps1 b/eng/Build.ps1
index fe7eb56a5b1..8f6ad9b56f2 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -549,7 +549,10 @@ try {
     }
 
     if ($testBenchmarks) {
+        $properties_storage = $properties
+        $properties += "/p:RuntimeIdentifier=win-x64"
         BuildSolution "FSharp.Benchmarks.sln" $False
+        $properties = $properties_storage
     }
 
     if ($pack) {

From 00ab19fc988f7bdc9643d85274c9925d254b94fe Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:18:50 +0100
Subject: [PATCH 3/5] Update HistoricalBenchmark.Runner.fsproj

---
 .../HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
index 13add70323f..fe6d95f9050 100644
--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.Runner/HistoricalBenchmark.Runner.fsproj
@@ -4,6 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <RootNamespace>HistoricalBenchmark.Utilities</RootNamespace>
+        <NoWarn>$(NoWarn);NETSDK1206</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

From acd8e66062d5e7d37c4becd65c8d475f84b36b70 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:51:02 +0100
Subject: [PATCH 4/5] up

---
 .../CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs
index 528557fa3d7..b7ed2a4b78d 100644
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/BackgroundCompilerBenchmarks.fs
@@ -225,7 +225,7 @@ type TestProjectType =
 [<MemoryDiagnoser>]
 [<ThreadingDiagnoser>]
 [<SimpleJob(warmupCount=1,iterationCount=4)>]
-[<BenchmarkCategory(ShortCategory)>]
+[<BenchmarkCategory(LongCategory)>]
 type TransparentCompilerBenchmark() =
 
     let size = 30

From b5172ba4fad355c5bd0d3ee88e0192adcd895746 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:51:25 +0100
Subject: [PATCH 5/5] try something out

---
 eng/Build.ps1 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/eng/Build.ps1 b/eng/Build.ps1
index 8f6ad9b56f2..fe7eb56a5b1 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -549,10 +549,7 @@ try {
     }
 
     if ($testBenchmarks) {
-        $properties_storage = $properties
-        $properties += "/p:RuntimeIdentifier=win-x64"
         BuildSolution "FSharp.Benchmarks.sln" $False
-        $properties = $properties_storage
     }
 
     if ($pack) {