Implemented missing logic for AotHelper + some diagnostics

src/Sentry/Internal/AotHelper.cs

@@ -1,4 +1,6 @@
+using System;
 using Sentry.CompilerServices;
+using Sentry.Extensibility;
 
 namespace Sentry.Internal;
 
@@ -15,29 +17,40 @@ static AotHelper()
 
 
     [UnconditionalSuppressMessage("Trimming", "IL2026: RequiresUnreferencedCode", Justification = AvoidAtRuntime)]
-    private static bool CheckIsTrimmed()
+    internal static bool CheckIsTrimmed(IDiagnosticLogger? logger = null)
     {
-        if (TryGetBoolean("publishtrimmed", out var trimmed))
+        if (TryGetBoolean("_IsPublishing", out var isPublishing) && isPublishing)
         {
-            return trimmed;
-        }
+            logger?.LogDebug("Detected _IsPublishing");
+            if (TryGetBoolean("PublishSelfContained", out var selfContained) && selfContained)
+            {
+                logger?.LogDebug("Detected PublishSelfContained");
+                if (TryGetBoolean("PublishTrimmed", out var trimmed))
+                {
+                    logger?.LogDebug("Detected PublishTrimmed");
+                    return trimmed;
+                }
+            }
 
-        if (TryGetBoolean("publishaot", out var aot))
-        {
-            return aot;
+            if (TryGetBoolean("PublishAot", out var aot))
+            {
+                logger?.LogDebug($"Detected PublishAot: {aot}");
+                return aot;
+            }
         }
 
         // fallback check
+        logger?.LogDebug($"Stacktrace fallback");
         var stackTrace = new StackTrace(false);
         return stackTrace.GetFrame(0)?.GetMethod() is null;
     }
 
     private static bool TryGetBoolean(string key, out bool value)
     {
         value = false;
-        if (BuildProperties.Values?.TryGetValue(key, out var aotValue) ?? false)
+        if (BuildProperties.Values?.TryGetValue(key, out string? stringValue) ?? false)
         {
-            if (bool.TryParse(aotValue, out var result))
+            if (bool.TryParse(stringValue, out var result))
             {
                 value = result;
                 return true;

src/Sentry/SentrySdk.cs

@@ -51,6 +51,7 @@ internal static IHub InitHub(SentryOptions options)
 
 #pragma warning disable CS0162 // Unreachable code detected
 #pragma warning disable 0162 // Unreachable code on old .NET frameworks
+        AotHelper.CheckIsTrimmed(options.DiagnosticLogger);
         options.LogDebug(AotHelper.IsTrimmed
             ? "This looks like a Native AOT application build."
             : "This doesn't look like a Native AOT application build."

src/Sentry/buildTransitive/Sentry.SourceGenerators.targets

@@ -1,8 +1,10 @@
 <Project>
   <ItemGroup>
+    <CompilerVisibleProperty Include="_IsPublishing" />
     <CompilerVisibleProperty Include="PublishAot" />
-    <CompilerVisibleProperty Include="UseDotNetNativeToolchain" />
     <CompilerVisibleProperty Include="PublishTrimmed" />
+    <CompilerVisibleProperty Include="PublishSelfContained" />
+    <CompilerVisibleProperty Include="UseDotNetNativeToolchain" />
     <CompilerVisibleProperty Include="SentryDisableSourceGenerator" />
     <CompilerVisibleProperty Include="Configuration" />
   </ItemGroup>

src/Sentry/buildTransitive/Sentry.targets

@@ -6,9 +6,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <CompilerVisibleProperty Include="_IsPublishing" />
     <CompilerVisibleProperty Include="PublishAot" />
-    <CompilerVisibleProperty Include="UseDotNetNativeToolchain" />
     <CompilerVisibleProperty Include="PublishTrimmed" />
+    <CompilerVisibleProperty Include="PublishSelfContained" />
+    <CompilerVisibleProperty Include="UseDotNetNativeToolchain" />
     <CompilerVisibleProperty Include="SentryDisableSourceGenerator" />
     <CompilerVisibleProperty Include="Configuration" />
   </ItemGroup>