Update MercuryEngine.Data

Author: ArcanoxDragon

MercuryEngine.Data

@@ -0,0 +1,15 @@
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace StudioZDR.App.Utility;
+
+internal static class ReflectionUtility
+{
+	public static PropertyInfo GetProperty(LambdaExpression expression)
+	{
+		if (expression is not { Body: MemberExpression { Member: PropertyInfo propertyInfo } })
+			throw new ArgumentException("Expression must be a simple property access expression", nameof(expression));
+
+		return propertyInfo;
+	}
+}

StudioZDR.App/Utility/ReflectionUtility.cs

@@ -1,6 +1,6 @@
-using MercuryEngine.Data.Core.Utility;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
+using StudioZDR.App.Utility;
 
 namespace StudioZDR.App.ViewModels;
 
@@ -10,7 +10,7 @@ public abstract class ViewModelWithDataModel<TDataModel> : ViewModelBase
 
 	protected void SetDataModelValue<TValue>(Expression<Func<TDataModel, TValue>> expression, TValue value, [CallerMemberName] string? propertyName = default)
 	{
-		var property = ExpressionUtility.GetProperty(expression);
+		var property = ReflectionUtility.GetProperty(expression);
 		var propertyValue = (TValue?) property.GetValue(DataModel);
 
 		this.RaiseAndSetIfChanged(ref propertyValue, value, propertyName);

StudioZDR.App/ViewModels/ViewModelWithDataModel.cs

@@ -4,11 +4,16 @@
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
-		<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
-		<TrimMode>copyused</TrimMode>
 		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
+		<PublishSingleFile>true</PublishSingleFile>
+		<PublishTrimmed>true</PublishTrimmed>
+		<TrimMode>partial</TrimMode>
+		<SelfContained>true</SelfContained>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<AvaloniaResource Include="Assets\**" />
 		<None Remove=".gitignore" />

StudioZDR.UI.Avalonia/StudioZDR.UI.Avalonia.csproj

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=62107C8A_002D5C7C_002D4D14_002DBC07_002D6C9B6F4DBE0B_002Fdl_003ADataDefinitions_003A_002E_002E_003F_002E_002E_003FDataDefinitions/@EntryIndexedValue">ExplicitlyExcluded</s:String></wpf:ResourceDictionary>