From 9a4492924c3e08521899bb8636a5f052c840cb01 Mon Sep 17 00:00:00 2001
From: Daniel Lo Nigro <d@d.sb>
Date: Sun, 21 Jan 2024 17:27:08 -0800
Subject: [PATCH] Add support for AOT compilation

---
 src/Prometheus.SystemMetrics/Native/WindowsNative.cs       | 2 +-
 .../Prometheus.SystemMetrics.csproj                        | 5 +++--
 .../ServiceCollectionExtensions.cs                         | 7 ++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Prometheus.SystemMetrics/Native/WindowsNative.cs b/src/Prometheus.SystemMetrics/Native/WindowsNative.cs
index b050b12..9b2a920 100644
--- a/src/Prometheus.SystemMetrics/Native/WindowsNative.cs
+++ b/src/Prometheus.SystemMetrics/Native/WindowsNative.cs
@@ -87,7 +87,7 @@ public class MEMORYSTATUSEX
 		/// </summary>
 		public MEMORYSTATUSEX()
 		{
-			dwLength = (uint)Marshal.SizeOf(typeof(MEMORYSTATUSEX));
+			dwLength = (uint)Marshal.SizeOf<MEMORYSTATUSEX>();
 		}
 	}
 }
diff --git a/src/Prometheus.SystemMetrics/Prometheus.SystemMetrics.csproj b/src/Prometheus.SystemMetrics/Prometheus.SystemMetrics.csproj
index f72a2cb..045deed 100644
--- a/src/Prometheus.SystemMetrics/Prometheus.SystemMetrics.csproj
+++ b/src/Prometheus.SystemMetrics/Prometheus.SystemMetrics.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net80</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>latestMajor</LangVersion>
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
     <PackageId>prometheus-net.SystemMetrics</PackageId>
     <Product>prometheus-net.SystemMetrics</Product>
     <Authors>Daniel Lo Nigro</Authors>
@@ -30,7 +31,7 @@
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'net80'">
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
   </ItemGroup>
 
diff --git a/src/Prometheus.SystemMetrics/ServiceCollectionExtensions.cs b/src/Prometheus.SystemMetrics/ServiceCollectionExtensions.cs
index fcf3c4d..e25afa5 100644
--- a/src/Prometheus.SystemMetrics/ServiceCollectionExtensions.cs
+++ b/src/Prometheus.SystemMetrics/ServiceCollectionExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.DependencyInjection;
 using Prometheus.SystemMetrics.Collectors;
 
 namespace Prometheus.SystemMetrics
@@ -38,7 +39,11 @@ public static IServiceCollection AddSystemMetrics(this IServiceCollection servic
 		/// Adds a system metric collector to the <see cref="IServiceCollection"/>
 		/// </summary>
 		/// <typeparam name="T">Metric to add</typeparam>
+#if NET7_0_OR_GREATER
+		public static IServiceCollection AddSystemMetricCollector<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(this IServiceCollection services)
+#else
 		public static IServiceCollection AddSystemMetricCollector<T>(this IServiceCollection services)
+#endif
 			where T : class, ISystemMetricCollector
 		{
 			services.AddSingleton<ISystemMetricCollector, T>();