Optimize for AOT Compilation

Author: Aeliux

src/EasySign/Bundle.cs

@@ -187,10 +187,18 @@ protected virtual void ReadBundle(ZipArchive zip)
         {
             ZipArchiveEntry entry;
             if ((entry = zip.GetEntry(".manifest.ec")) != null)
+#if NET6_0_OR_GREATER
+                Manifest = JsonSerializer.Deserialize(entry.Open(), typeof(Manifest), SourceGenerationManifestContext.Default) as Manifest;
+#else
                 Manifest = JsonSerializer.Deserialize<Manifest>(entry.Open(), SerializerOptions);
+#endif
 
             if ((entry = zip.GetEntry(".signatures.ec")) != null)
+#if NET6_0_OR_GREATER
+                Signatures = JsonSerializer.Deserialize(entry.Open(), typeof(Signatures), SourceGenerationSignaturesContext.Default) as Signatures;
+#else
                 Signatures = JsonSerializer.Deserialize<Signatures>(entry.Open(), SerializerOptions);
+#endif
         }
 
         /// <summary>
@@ -237,7 +245,13 @@ public void Sign(X509Certificate2 certificate, RSA privateKey)
         {
             EnsureWritable();
 
-            var signature = privateKey.SignData(Export(Manifest), HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
+#if NET6_0_OR_GREATER
+            var manifestData = Export(Manifest, SourceGenerationManifestContext.Default);
+#else
+            var manifestData = Export(Manifest);
+#endif
+
+            var signature = privateKey.SignData(manifestData, HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
             var cert = Convert.ToBase64String(certificate.Export(X509ContentType.Cert));
             var name = certificate.GetCertHashString();
 
@@ -285,7 +299,13 @@ public bool VerifySignature(string certificateHash)
             X509Certificate2 certificate = GetCertificate(certificateHash);
             var pubKey = certificate.GetRSAPublicKey();
 
-            return pubKey.VerifyData(Export(Manifest), Signatures.Entries[certificateHash], HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
+#if NET6_0_OR_GREATER
+            var manifestData = Export(Manifest, SourceGenerationManifestContext.Default);
+#else
+            var manifestData = Export(Manifest);
+#endif
+
+            return pubKey.VerifyData(manifestData, Signatures.Entries[certificateHash], HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
         }
 
         /// <summary>
@@ -375,6 +395,19 @@ public byte[] GetFileBytes(string entryName)
             }
         }
 
+#if NET6_0_OR_GREATER
+        /// <summary>
+        /// Exports the specified structured data to a byte array.
+        /// </summary>
+        /// <param name="structuredData">The structured data to export.</param>
+        /// <param name="jsonSerializerContext">A metadata provider for serializable types.</param>
+        /// <returns>A byte array containing the exported data.</returns>
+        protected byte[] Export(object structuredData, JsonSerializerContext jsonSerializerContext)
+        {
+            var data = JsonSerializer.Serialize(structuredData, structuredData.GetType(), jsonSerializerContext);
+            return Encoding.UTF8.GetBytes(data);
+        }
+#else
         /// <summary>
         /// Exports the specified structured data to a byte array.
         /// </summary>
@@ -385,6 +418,7 @@ protected byte[] Export(object structuredData)
             var data = JsonSerializer.Serialize(structuredData, SerializerOptions);
             return Encoding.UTF8.GetBytes(data);
         }
+#endif
 
         /// <summary>
         /// Writes changes to the bundle file.
@@ -397,8 +431,21 @@ public void Update()
             {
                 OnUpdating?.Invoke(zip);
 
-                WriteEntry(zip, ".manifest.ec", Export(Manifest));
-                WriteEntry(zip, ".signatures.ec", Export(Signatures));
+#if NET6_0_OR_GREATER
+                var manifestData = Export(Manifest, SourceGenerationManifestContext.Default);
+#else
+                var manifestData = Export(Manifest);
+#endif
+
+                WriteEntry(zip, ".manifest.ec", manifestData);
+
+#if NET6_0_OR_GREATER
+                var signatureData = Export(Signatures, SourceGenerationSignaturesContext.Default);
+#else
+                var signatureData = Export(Signatures);
+#endif
+
+                WriteEntry(zip, ".signatures.ec", signatureData);
 
                 foreach (var newFile in newEmbeddedFiles)
                 {

src/EasySign/Manifest.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace SAPTeam.EasySign
@@ -63,4 +64,12 @@ public void AddEntry(string entryName, byte[] hash)
             }
         }
     }
+
+#if NET6_0_OR_GREATER
+    [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Metadata, WriteIndented = false, DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingDefault)]
+    [JsonSerializable(typeof(Manifest))]
+    internal partial class SourceGenerationManifestContext : JsonSerializerContext
+    {
+    }
+#endif
 }

src/EasySign/Signatures.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace SAPTeam.EasySign
@@ -17,4 +18,12 @@ public class Signatures
         /// </summary>
         public Dictionary<string, byte[]> Entries { get; set; } = new();
     }
+
+#if NET6_0_OR_GREATER
+    [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Metadata, WriteIndented = false, DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingDefault)]
+    [JsonSerializable(typeof(Signatures))]
+    internal partial class SourceGenerationSignaturesContext : JsonSerializerContext
+    {
+    }
+#endif
 }

src/EasySign/UnifiedPath/Folder.cs

@@ -13,22 +13,6 @@ namespace SAPTeam.EasySign.UnifiedPath
     /// </summary>
     public class Folder : FolderEntry
     {
-        /// <summary>
-        /// Creates a <see cref="Folder"/> instance representing the directory of the specified assembly.
-        /// </summary>
-        /// <typeparam name="T">The type whose assembly's location is used.</typeparam>
-        /// <returns>A <see cref="Folder"/> instance.</returns>
-        public static Folder OfAssembly<T>() =>
-            OfAssembly(typeof(T).Assembly);
-
-        /// <summary>
-        /// Creates a <see cref="Folder"/> instance representing the directory of the specified assembly.
-        /// </summary>
-        /// <param name="assembly">The assembly whose location is used.</param>
-        /// <returns>A <see cref="Folder"/> instance.</returns>
-        public static Folder OfAssembly(Assembly assembly) =>
-            new Folder(GetDirectoryName(assembly.Location));
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Folder"/> class with the specified full path.
         /// </summary>