Support Native AOT

Directory.Build.props

@@ -64,4 +64,10 @@
     <None Include="$(MSBuildThisFileDirectory)$(PackageIcon)" Pack="True" PackagePath="" />
     <None Include="$(MSBuildThisFileDirectory)$(PackageReadmeFile)" Pack="True" PackagePath="" />
   </ItemGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net8.0'))">
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+  </ItemGroup>
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net8.0'))">
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
 </Project>

samples/src/JustSaying.Sample.Restaurant.OrderingApi/Program.cs

@@ -31,9 +31,9 @@
         cfg.SerializerOptions.TypeInfoResolverChain.Insert(0, ApplicationJsonContext.Default);
     });
 
-    builder.Services.Configure<JsonSerializerOptions>(cfg =>
+    builder.Services.Configure<JustSayingJsonSerializerOptions>(cfg =>
     {
-        cfg.TypeInfoResolverChain.Insert(0, ApplicationJsonContext.Default);
+        cfg.SerializerOptions.TypeInfoResolverChain.Insert(0, ApplicationJsonContext.Default);
     });
 
     builder.Services.AddJustSaying(config =>

src/JustSaying.Extensions.DependencyInjection.Microsoft/IServiceCollectionExtensions.cs

@@ -141,7 +141,7 @@ public static IServiceCollection AddJustSaying(this IServiceCollection services,
         services.TryAddSingleton<IMessageContextReader>(serviceProvider => serviceProvider.GetRequiredService<MessageContextAccessor>());
 
 #if NET8_0_OR_GREATER
-        services.TryAddSingleton<IMessageSerializationFactory>(sp => new TypedSystemTextJsonSerializationFactory(sp.GetRequiredService<IOptions<JsonSerializerOptions>>().Value));
+        services.TryAddSingleton<IMessageSerializationFactory>(sp => new TypedSystemTextJsonSerializationFactory(sp.GetRequiredService<IOptions<JustSayingJsonSerializerOptions>>().Value));
 #else
         services.TryAddSingleton<IMessageSerializationFactory, NewtonsoftSerializationFactory>();
 #endif

src/JustSaying/AwsTools/MessageHandling/SnsPolicyBuilder.cs

@@ -13,42 +13,44 @@ internal static string BuildPolicyJson(SnsPolicyDetails policyDetails)
             throw new ArgumentException("Must be a valid ARN.", nameof(policyDetails));
         }
         var accountId = arn.AccountId;
-        return $@"{{
-    ""Version"" : ""2012-10-17"",
-    ""Statement"" : [
-        {{
-            ""Sid"" : ""{Guid.NewGuid().ToString().Replace("-", "")}"",
-            ""Effect"" : ""Allow"",
-            ""Principal"" : {{
-                ""AWS"" : ""*""
-            }},
-            ""Action""    : [
-                ""sns:GetTopicAttributes"",
-                ""sns:SetTopicAttributes"",
-                ""sns:AddPermission"",
-                ""sns:RemovePermission"",
-                ""sns:DeleteTopic"",
-                ""sns:Subscribe"",
-                ""sns:Publish""
-            ],
-            ""Resource""  : ""{policyDetails.SourceArn}"",
-            ""Condition"" : {{
-                ""StringEquals"" : {{
-                    ""AWS:SourceOwner"" : ""{accountId}""
-                }}
-            }}
-        }},
-        {{
-            ""Sid"" : ""{Guid.NewGuid().ToString().Replace("-", "")}"",
-            ""Effect"" : ""Allow"",
-            ""Principal"" : {{
-                ""AWS"" : {SerializeAccountIds(policyDetails.AccountIds)}
-            }},
-            ""Action""    : ""sns:Subscribe"",
-            ""Resource""  : ""{policyDetails.SourceArn}""
-        }}
-    ]
-}}";
+        return $$"""
+                 {
+                     "Version" : "2012-10-17",
+                     "Statement" : [
+                         {
+                             "Sid" : "{{Guid.NewGuid().ToString().Replace("-", "")}}",
+                             "Effect" : "Allow",
+                             "Principal" : {
+                                 "AWS" : "*"
+                             },
+                             "Action"    : [
+                                 "sns:GetTopicAttributes",
+                                 "sns:SetTopicAttributes",
+                                 "sns:AddPermission",
+                                 "sns:RemovePermission",
+                                 "sns:DeleteTopic",
+                                 "sns:Subscribe",
+                                 "sns:Publish"
+                             ],
+                             "Resource"  : "{{policyDetails.SourceArn}}",
+                             "Condition" : {
+                                 "StringEquals" : {
+                                     "AWS:SourceOwner" : "{{accountId}}"
+                                 }
+                             }
+                         },
+                         {
+                             "Sid" : "{{Guid.NewGuid().ToString().Replace("-", "")}}",
+                             "Effect" : "Allow",
+                             "Principal" : {
+                                 "AWS" : {{SerializeAccountIds(policyDetails.AccountIds)}}
+                             },
+                             "Action"    : "sns:Subscribe",
+                             "Resource"  : "{{policyDetails.SourceArn}}"
+                         }
+                     ]
+                 }
+                 """;
     }
 
     private static string SerializeAccountIds(IReadOnlyCollection<string> accountIds)

src/JustSaying/JustSaying.csproj

@@ -23,10 +23,4 @@
   <ItemGroup>
     <Using Remove="System.Net.Http" />
   </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net8.0'))">
-    <Using Include="System.Diagnostics.CodeAnalysis" />
-  </ItemGroup>
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net8.0'))">
-    <IsAotCompatible>true</IsAotCompatible>
-  </PropertyGroup>
 </Project>

src/JustSaying/Messaging/MessageSerialization/JustSayingJsonSerializerOptions.cs

@@ -0,0 +1,10 @@
+#if NET8_0_OR_GREATER
+using System.Text.Json;
+
+namespace JustSaying.Messaging.MessageSerialization;
+
+public class JustSayingJsonSerializerOptions
+{
+    public JsonSerializerOptions SerializerOptions { get; } = new();
+}
+#endif

src/JustSaying/Messaging/MessageSerialization/SystemTextJsonSerializer.cs

@@ -43,21 +43,7 @@ public SystemTextJsonSerializer()
     /// <param name="options">The optional <see cref="JsonSerializerOptions"/> to use.</param>
     public SystemTextJsonSerializer(JsonSerializerOptions options)
     {
-        if (options == null)
-        {
-            options = new JsonSerializerOptions
-            {
-#if NET8_0_OR_GREATER
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-#else
-                IgnoreNullValues = true,
-#endif
-            };
-
-            options.Converters.Add(new JsonStringEnumConverter());
-        }
-
-        _options = options;
+        _options = options ?? DefaultJsonSerializerOptions;
     }
 
     /// <inheritdoc />

src/JustSaying/Messaging/MessageSerialization/TypedSystemTextJsonSerializationFactory.cs

@@ -1,11 +1,10 @@
 #if NET8_0_OR_GREATER
-using System.Text.Json;
 using JustSaying.Models;
 
 namespace JustSaying.Messaging.MessageSerialization;
 
-public class TypedSystemTextJsonSerializationFactory(JsonSerializerOptions options) : IMessageSerializationFactory
+public class TypedSystemTextJsonSerializationFactory(JustSayingJsonSerializerOptions options) : IMessageSerializationFactory
 {
-    public IMessageSerializer GetSerializer<T>() where T : Message => new SystemTextJsonSerializer<T>(options);
+    public IMessageSerializer GetSerializer<T>() where T : Message => new SystemTextJsonSerializer<T>(options.SerializerOptions);
 }
 #endif

src/JustSaying/PublicAPI/net8.0/PublicAPI.Unshipped.txt

@@ -1,3 +1,6 @@
+JustSaying.Messaging.MessageSerialization.JustSayingJsonSerializerOptions
+JustSaying.Messaging.MessageSerialization.JustSayingJsonSerializerOptions.JustSayingJsonSerializerOptions() -> void
+JustSaying.Messaging.MessageSerialization.JustSayingJsonSerializerOptions.SerializerOptions.get -> System.Text.Json.JsonSerializerOptions
 JustSaying.Messaging.MessageSerialization.SystemTextJsonSerializer<T>
 JustSaying.Messaging.MessageSerialization.SystemTextJsonSerializer<T>.Deserialize(string message, System.Type type) -> JustSaying.Models.Message
 JustSaying.Messaging.MessageSerialization.SystemTextJsonSerializer<T>.GetMessageAttributes(string message) -> JustSaying.Messaging.MessageHandling.MessageAttributes
@@ -7,4 +10,4 @@ JustSaying.Messaging.MessageSerialization.SystemTextJsonSerializer<T>.SystemText
 JustSaying.Messaging.MessageSerialization.SystemTextJsonSerializer<T>.SystemTextJsonSerializer(System.Text.Json.JsonSerializerOptions options) -> void
 JustSaying.Messaging.MessageSerialization.TypedSystemTextJsonSerializationFactory
 JustSaying.Messaging.MessageSerialization.TypedSystemTextJsonSerializationFactory.GetSerializer<T>() -> JustSaying.Messaging.MessageSerialization.IMessageSerializer
-JustSaying.Messaging.MessageSerialization.TypedSystemTextJsonSerializationFactory.TypedSystemTextJsonSerializationFactory(System.Text.Json.JsonSerializerOptions options) -> void
+JustSaying.Messaging.MessageSerialization.TypedSystemTextJsonSerializationFactory.TypedSystemTextJsonSerializationFactory(JustSaying.Messaging.MessageSerialization.JustSayingJsonSerializerOptions options) -> void