Make Configuration package trimming anf native AOT friendly.

Author: hamster620

Application.Avalonia.Tests/App.axaml

@@ -7,5 +7,6 @@
     </Application.Resources>
     <Application.Styles>
         <FluentTheme/>
+        <StyleInclude Source="avares://CarinaStudio.AppBase.Avalonia/Theme/Default.axaml"/>
     </Application.Styles>
 </Application>

Application.Avalonia.Tests/App.axaml.cs

@@ -5,7 +5,6 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.Globalization;
-using Avalonia.Markup.Xaml.Styling;
 
 namespace CarinaStudio
 {
@@ -31,16 +30,12 @@ public static void Main(string[] args)
             //Environment.SetEnvironmentVariable("AVALONIA_GLOBAL_SCALE_FACTOR", "2");
             BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
         }
-
+        
 
         // Called when Avalonia initialized.
         public override void OnFrameworkInitializationCompleted()
         {
             base.OnFrameworkInitializationCompleted();
-            this.Styles.Add(new StyleInclude(new Uri("avares://CarinaStudio.AppBase.Avalonia"))
-            {
-                Source = new("Theme/Default.axaml", UriKind.Relative),
-            });
             (this.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)?.Let(it =>
             {
                 //it.ShutdownMode = Avalonia.Controls.ShutdownMode.OnExplicitShutdown;

Configuration/JsonSettingsSerializer.cs

@@ -241,24 +241,29 @@ protected object ReadJsonValue(JsonElement jsonValue, string typeName)
 					_ => DateTime.FromBinary(jsonValue.GetInt64()),
 				},
 				StringType => this.ReadJsonValueAsString(jsonValue),
-				_ => Type.GetType(typeName)?.Let((type) =>
+#pragma warning disable IL2057
+				_ => Type.GetType(typeName)?.Let(type =>
 				{
+#pragma warning restore IL2057
 					if (type.IsEnum)
 					{
 						try
 						{
 							if (jsonValue.ValueKind == JsonValueKind.Array)
 							{
-								return Array.CreateInstance(type, jsonValue.GetArrayLength()).Also((array) =>
+#pragma warning disable IL3050
+								return Array.CreateInstance(type, jsonValue.GetArrayLength()).Also(array =>
 								{
 									var index = 0;
 									foreach (var e in jsonValue.EnumerateArray())
 										array.SetValue(this.ReadJsonValue(e, typeName), index++);
 								});
+#pragma warning restore IL3050
 							}
-							else if (Enum.TryParse(type, jsonValue.GetString(), out var enumValue))
+							if (Enum.TryParse(type, jsonValue.GetString(), out var enumValue))
 								return enumValue;
 						}
+						// ReSharper disable once EmptyGeneralCatchClause
 						catch
 						{ }
 					}
@@ -366,10 +371,10 @@ protected virtual void WriteJsonValue(Utf8JsonWriter writer, string typeName, ob
 						writer.WriteNumberValue((short)value);
 					break;
 				case Int32Type:
-					if (value is int[] intArrar)
+					if (value is int[] intArray)
 					{
 						writer.WriteStartArray();
-						foreach (var i in intArrar)
+						foreach (var i in intArray)
 							this.WriteJsonValue(writer, typeName, i);
 						writer.WriteEndArray();
 					}

Configuration/PersistentSettings.cs

@@ -1,6 +1,7 @@
 using CarinaStudio.Collections;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -18,8 +19,8 @@ public abstract class PersistentSettings : ISettings
 		readonly object eventLock = new object();
 		DateTime lastModifiedTime = DateTime.Now;
 		readonly ISettingsSerializer serializer;
-		volatile EventHandler<SettingChangedEventArgs>? settingChanged;
-		volatile EventHandler<SettingChangingEventArgs>? settingChanging;
+		EventHandler<SettingChangedEventArgs>? settingChanged;
+		EventHandler<SettingChangingEventArgs>? settingChanging;
 		readonly Dictionary<SettingKey, object> values = new Dictionary<SettingKey, object>();
 
 
@@ -70,7 +71,7 @@ protected PersistentSettings(ISettings template, ISettingsSerializer serializer)
 		/// <summary>
 		/// Get all setting keys.
 		/// </summary>
-		public IEnumerable<SettingKey> Keys { get => this.values.Lock((it) => it.Keys.ToArray()); }
+		public IEnumerable<SettingKey> Keys => this.values.Lock((it) => it.Keys.ToArray());
 
 
 		/// <summary>
@@ -223,6 +224,7 @@ public void Save(string fileName)
 				if (File.Exists(fileName))
 					File.Copy(fileName, fileName + ".backup", true);
 			}
+			// ReSharper disable once EmptyGeneralCatchClause
 			catch
 			{ }
 
@@ -291,7 +293,7 @@ public void SetValue(SettingKey key, object value)
 			// check value
 			if (value == null)
 				throw new ArgumentNullException(nameof(value));
-			if (!key.ValueType.IsAssignableFrom(value.GetType()))
+			if (!key.ValueType.IsInstanceOfType(value))
 				throw new ArgumentException($"Value {value} is not {key.ValueType.Name}.");
 
 			// check previous value
@@ -426,7 +428,7 @@ public SettingKey(string name, Type valueType, object defaultValue)
 		{
 			if (defaultValue == null)
 				throw new ArgumentNullException(nameof(defaultValue));
-			if (!valueType.IsAssignableFrom(defaultValue.GetType()))
+			if (!valueType.IsInstanceOfType(defaultValue))
 				throw new ArgumentException($"Default value {defaultValue} is not {valueType.Name}.");
 			this.DefaultValue = defaultValue;
 			this.Name = name;
@@ -444,7 +446,7 @@ public SettingKey(string name, Type valueType, object defaultValue)
 		/// Get all public <see cref="SettingKey"/> defined by given type.
 		/// </summary>
 		/// <returns>List of public <see cref="SettingKey"/>.</returns>
-		public static IList<SettingKey> GetDefinedKeys<T>()
+		public static IList<SettingKey> GetDefinedKeys<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>()
         {
 			var keys = new List<SettingKey>();
 			foreach (var fieldInfo in typeof(T).GetFields(BindingFlags.Public | BindingFlags.Static))

Configuration/XmlSettingsSerializer.cs

@@ -305,22 +305,26 @@ protected virtual object ReadXmlValue(XmlNode xmlValue, string typeName)
 						return new List<DateTime>().Also((list) => this.ReadXmlValueArray(xmlValue, typeName, list)).ToArray();
 					return DateTime.FromBinary(long.Parse(xmlValue.Value ?? ""));
 				default:
-					return Type.GetType(typeName)?.Let((type) =>
+#pragma warning disable IL2057
+					return Type.GetType(typeName)?.Let(type =>
 					{
+#pragma warning restore IL2057
 						if (!type.IsEnum)
 							return null;
 						try
 						{
 							if (this.IsXmlValueArray(xmlValue))
 							{
-								return new ArrayList().Let((list) =>
+								return new ArrayList().Let(list =>
 								{
 									this.ReadXmlValueArray(xmlValue, typeName, list);
-									return Array.CreateInstance(type, list.Count).Also((array) =>
+#pragma warning disable IL3050
+									return Array.CreateInstance(type, list.Count).Also(array =>
 									{
 										for (var i = array.Length - 1; i >= 0; --i)
 											array.SetValue(list[i], i);
 									});
+#pragma warning restore IL3050
 								});
 							}
 							return Enum.Parse(type, xmlValue.Value ?? "");
@@ -391,7 +395,7 @@ public void Serialize(Stream stream, IDictionary<SettingKey, object> values, Set
 			writer.WriteStartDocument();
 			writer.WriteStartElement("Settings");
 
-			// versin
+			// version
 			writer.WriteStartElement("Version");
 			writer.WriteValue(metadata.Version);
 			writer.WriteEndElement();
@@ -444,7 +448,7 @@ protected virtual void WriteXmlValue(XmlWriter writer, object value)
 			else if (value is Array array)
 			{
 				if (array.Rank != 1)
-					throw new ArgumentException("Only 1-dinemsional array is supported.");
+					throw new ArgumentException("Only 1-dimensional array is supported.");
 				writer.WriteStartElement("Array");
 				for (int i = 0, count = array.Length; i < count; ++i)
 				{