From 24210756aff241bd2400c1b0f584812631e510c3 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Tue, 11 Jul 2023 20:48:34 -0400
Subject: [PATCH 1/2] Fix mono aot build

Issue: https://github.com/dotnet/BenchmarkDotNet/issues/2311

- Use the extension props file to set `SelfContained=true` for the
  autogenerated project. This allows the project to have all the
  dependencies in the output folder, as required for AOT.

- Latest BDN copies the `PackageReferences` from
  `MicroBenchmarks.csproj` to the generated project.
  - but it does not copy the version property, thus breaking the build.
  - Move the version property to a Common.props, so it can be used by
    the main MicroBenchmarks.csproj, and the autogenerated project.
---
 .../micro/MicroBenchmarks.Common.props        | 28 +++++++++++++++++++
 .../micro/MicroBenchmarks.Mono.props          |  7 +++++
 src/benchmarks/micro/MicroBenchmarks.csproj   | 27 ++----------------
 3 files changed, 38 insertions(+), 24 deletions(-)
 create mode 100644 src/benchmarks/micro/MicroBenchmarks.Common.props
 create mode 100644 src/benchmarks/micro/MicroBenchmarks.Mono.props

diff --git a/src/benchmarks/micro/MicroBenchmarks.Common.props b/src/benchmarks/micro/MicroBenchmarks.Common.props
new file mode 100644
index 00000000000..2c6b167f509
--- /dev/null
+++ b/src/benchmarks/micro/MicroBenchmarks.Common.props
@@ -0,0 +1,28 @@
+<Project>
+  <!-- Shared with the autogenerated project -->
+
+  <!-- out-of-band packages that are not included in NetCoreApp have TFM-specific versions -->
+  <Choose>
+    <When Condition="'$(TargetFramework)' == 'net6.0'">
+        <PropertyGroup>
+            <LangVersion>10.0</LangVersion>
+            <ExtensionsVersion>6.0.0</ExtensionsVersion>
+            <SystemVersion>6.0.0</SystemVersion>
+        </PropertyGroup>
+    </When>
+    <When Condition="'$(TargetFramework)' == 'net7.0'">
+        <PropertyGroup>
+            <LangVersion>11.0</LangVersion>
+            <ExtensionsVersion>7.0.0</ExtensionsVersion>
+            <SystemVersion>7.0.0</SystemVersion>
+        </PropertyGroup>
+    </When>
+    <Otherwise>
+        <!-- when comparing against Full .NET Framework we are usually interested in CLR differences, so net462 belongs to this block -->
+        <PropertyGroup>
+            <ExtensionsVersion>7.0.0</ExtensionsVersion>
+            <SystemVersion>7.0.0</SystemVersion>
+        </PropertyGroup>
+    </Otherwise>
+  </Choose>
+</Project>
diff --git a/src/benchmarks/micro/MicroBenchmarks.Mono.props b/src/benchmarks/micro/MicroBenchmarks.Mono.props
new file mode 100644
index 00000000000..3e65e9f2dd7
--- /dev/null
+++ b/src/benchmarks/micro/MicroBenchmarks.Mono.props
@@ -0,0 +1,7 @@
+<Project>
+  <!-- Shared with the autogenerated project -->
+  <Import Project="*Common.props" />
+  <PropertyGroup>
+    <SelfContained>true</SelfContained>
+  </PropertyGroup>
+</Project>
diff --git a/src/benchmarks/micro/MicroBenchmarks.csproj b/src/benchmarks/micro/MicroBenchmarks.csproj
index 41543d50032..ebc11b369a8 100644
--- a/src/benchmarks/micro/MicroBenchmarks.csproj
+++ b/src/benchmarks/micro/MicroBenchmarks.csproj
@@ -20,30 +20,9 @@
     <!-- Allow building with one major version, and running using a sdk with a higher major version -->
     <RollForward Condition="'$(BuildingForWasm)' == 'true'">LatestMajor</RollForward>
   </PropertyGroup>
-  <!-- out-of-band packages that are not included in NetCoreApp have TFM-specific versions -->
-  <Choose>
-    <When Condition="'$(TargetFramework)' == 'net6.0'">
-        <PropertyGroup>
-            <LangVersion>10.0</LangVersion>
-            <ExtensionsVersion>6.0.0</ExtensionsVersion>
-            <SystemVersion>6.0.0</SystemVersion>
-        </PropertyGroup>
-    </When>
-    <When Condition="'$(TargetFramework)' == 'net7.0'">
-        <PropertyGroup>
-            <LangVersion>11.0</LangVersion>
-            <ExtensionsVersion>7.0.0</ExtensionsVersion>
-            <SystemVersion>7.0.0</SystemVersion>
-        </PropertyGroup>
-    </When>
-    <Otherwise>
-        <!-- when comparing against Full .NET Framework we are usually interested in CLR differences, so net462 belongs to this block -->
-        <PropertyGroup>
-            <ExtensionsVersion>7.0.0</ExtensionsVersion>
-            <SystemVersion>7.0.0</SystemVersion>
-        </PropertyGroup>
-    </Otherwise>
-  </Choose>
+
+  <Import Project="$(MSBuildThisFileDirectory)MicroBenchmarks.Common.props" />
+
   <ItemGroup>
     <PackageReference Include="Jil" Version="3.0.0-alpha2" />
     <PackageReference Include="MessagePack" Version="1.9.11" />

From 9d4d4304b1d8b5e529dc83d7ad0842f80bd862e1 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 12 Jul 2023 08:48:08 -0400
Subject: [PATCH 2/2] MicroBenchmarks.Mono.props - remove SelfContained=true as
 it has been moved to the template project in BDN

---
 src/benchmarks/micro/MicroBenchmarks.Mono.props | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/benchmarks/micro/MicroBenchmarks.Mono.props b/src/benchmarks/micro/MicroBenchmarks.Mono.props
index 3e65e9f2dd7..bbd447b75f0 100644
--- a/src/benchmarks/micro/MicroBenchmarks.Mono.props
+++ b/src/benchmarks/micro/MicroBenchmarks.Mono.props
@@ -1,7 +1,4 @@
 <Project>
   <!-- Shared with the autogenerated project -->
   <Import Project="*Common.props" />
-  <PropertyGroup>
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
 </Project>