删除不必要的内容。增加支持的版本

StarryXYJ · StarryXYJ · commit 797c14aff34b · 2026-03-17T21:40:52.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -69,4 +69,7 @@ AgentHelper/
 Task.md
 manual/dev
 build.ps1
-build.sh
+build.sh
+publish-nuget.ps1
+global.json
+push-nuget.ps1
diff --git a/AutoSettingUI.Demo.Shared/AutoSettingUI.Demo.Shared.csproj b/AutoSettingUI.Demo.Shared/AutoSettingUI.Demo.Shared.csproj
diff --git a/AutoSettingUI.Demo.Shared/Class1.cs b/AutoSettingUI.Demo.Shared/Class1.cs
diff --git a/AutoSettingUI.Extension.Shared/AutoSettingUI.Extension.Shared.csproj b/AutoSettingUI.Extension.Shared/AutoSettingUI.Extension.Shared.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAotCompatible>true</IsAotCompatible>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+        <NoWarn>$(NoWarn);IL2026;IL2057;IL2070;IL2072;IL2075;IL3050</NoWarn>
         
         <!-- NuGet Packaging -->
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.Android/AutoSettingUI.Avalonia.CrossPlatform.Demo.Android.csproj b/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.Android/AutoSettingUI.Avalonia.CrossPlatform.Demo.Android.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net9.0-android</TargetFramework>
         <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
+        <NoWarn>$(NoWarn);MSB3277;XA0141</NoWarn>
         <ApplicationId>com.CompanyName.AutoSettingUI.Avalonia.CrossPlatform.Demo</ApplicationId>
         <ApplicationVersion>1</ApplicationVersion>
         <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
diff --git a/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.Browser/AutoSettingUI.Avalonia.CrossPlatform.Demo.Browser.csproj b/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.Browser/AutoSettingUI.Avalonia.CrossPlatform.Demo.Browser.csproj
@@ -4,6 +4,7 @@
         <OutputType>Exe</OutputType>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <Nullable>enable</Nullable>
+        <NoWarn>$(NoWarn);MSB3277</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -13,4 +14,5 @@
     <ItemGroup>
         <ProjectReference Include="..\AutoSettingUI.Avalonia.CrossPlatform.Demo\AutoSettingUI.Avalonia.CrossPlatform.Demo.csproj"/>
     </ItemGroup>
+
 </Project>
diff --git a/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.iOS/AutoSettingUI.Avalonia.CrossPlatform.Demo.iOS.csproj b/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.iOS/AutoSettingUI.Avalonia.CrossPlatform.Demo.iOS.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>net9.0-ios</TargetFramework>
         <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
+        <NoWarn>$(NoWarn);MSB3277</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.csproj b/Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo/AutoSettingUI.Avalonia.CrossPlatform.Demo.csproj
@@ -4,6 +4,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <NoWarn>$(NoWarn);IL2026;IL2057;IL2067;IL2070;IL2072;IL2075;IL2104;IL3050</NoWarn>
 
   <PublishAot>true</PublishAot>
   <SelfContained>true</SelfContained>
@@ -30,7 +31,16 @@
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\AutoSettingUI.Core\AutoSettingUI.Core.csproj"/>
         <ProjectReference Include="..\..\..\src\Extensions\AutoSettingUI.Avalonia\AutoSettingUI.Avalonia.csproj"/>
-        <!-- 直接引用Generator以确保为Demo项目中的Models生成AOT代码 -->
-        <ProjectReference Include="..\..\..\src\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
+    </ItemGroup>
+
+    <!-- Generator: project reference for normal builds, prebuilt analyzer for AOT publish -->
+    <ItemGroup Condition="'$(PublishAot)' != 'true'">
+        <ProjectReference Include="..\..\..\src\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj"
+                          OutputItemType="Analyzer"
+                          ReferenceOutputAssembly="false"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(PublishAot)' == 'true'">
+        <Analyzer Include="..\..\..\src\AutoSettingUI.Generator\bin\Release\netstandard2.0\AutoSettingUI.Generator.dll" />
     </ItemGroup>
 </Project>
diff --git a/Demo/AutoSettingUI.Ursa.Demo/AutoSettingUI.Ursa.Demo.csproj b/Demo/AutoSettingUI.Ursa.Demo/AutoSettingUI.Ursa.Demo.csproj
@@ -7,6 +7,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <IsAotCompatible>true</IsAotCompatible>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <NoWarn>$(NoWarn);IL2026;IL2057;IL2067;IL2070;IL2072;IL2075;IL2104;IL3050</NoWarn>
 
         <PublishAot>true</PublishAot>
         <SelfContained>true</SelfContained>
@@ -35,8 +36,18 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Extensions\AutoSettingUI.Ursa\AutoSettingUI.Ursa.csproj" />
-      <!-- 直接引用Generator以确保为Demo项目中的Models生成AOT代码 -->
-      <ProjectReference Include="..\..\src\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+      <ProjectReference Include="..\..\src\Extensions\AutoSettingUI.Ursa\AutoSettingUI.Ursa.csproj"
+                        RemoveProperties="PublishAot" />
+    </ItemGroup>
+
+    <!-- Generator: project reference for normal builds, prebuilt analyzer for AOT publish -->
+    <ItemGroup Condition="'$(PublishAot)' != 'true'">
+      <ProjectReference Include="..\..\src\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj"
+                        OutputItemType="Analyzer"
+                        ReferenceOutputAssembly="false" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(PublishAot)' == 'true'">
+      <Analyzer Include="..\..\src\AutoSettingUI.Generator\bin\Release\netstandard2.0\AutoSettingUI.Generator.dll" />
     </ItemGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -26,7 +26,11 @@ Install the package for your preferred UI framework:
 <PackageReference Include="AutoSettingUI.WPF" Version="1.0.0" />
 ```
 
-> **Note:** `AutoSettingUI.Core` and `AutoSettingUI.Generator` are automatically included as dependencies.
+> **Note:** `AutoSettingUI.Core` is automatically included as a dependency. `AutoSettingUI.Generator` is only needed for AOT and should be referenced by the app project.
+
+**Target frameworks:** `AutoSettingUI.Core`, `AutoSettingUI.Avalonia`, and `AutoSettingUI.Ursa` target `net8.0;net9.0;net10.0`. `AutoSettingUI.WPF` targets `net8.0-windows;net9.0-windows;net10.0-windows`.
+
+**Avalonia version range:** `AutoSettingUI.Avalonia` references `[11.0.0,12.0.0)`. `AutoSettingUI.Ursa` references `[11.1.1,12.0.0)` (Ursa 1.13.0 requires Avalonia >= 11.1.1).
 
 ## Quick Start
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -26,7 +26,11 @@
 <PackageReference Include="AutoSettingUI.WPF" Version="1.0.0" />
 ```
 
-> **注意：** `AutoSettingUI.Core` 和 `AutoSettingUI.Generator` 会作为依赖自动引入。
+> **注意：** `AutoSettingUI.Core` 会作为依赖自动引入。`AutoSettingUI.Generator` 仅在 AOT 场景需要，需要在应用项目中单独引用。
+
+**目标框架：** `AutoSettingUI.Core`、`AutoSettingUI.Avalonia`、`AutoSettingUI.Ursa` 支持 `net8.0;net9.0;net10.0`，`AutoSettingUI.WPF` 支持 `net8.0-windows;net9.0-windows;net10.0-windows`。
+
+**Avalonia 版本范围：** `AutoSettingUI.Avalonia` 为 `[11.0.0,12.0.0)`；`AutoSettingUI.Ursa` 为 `[11.1.1,12.0.0)`（Ursa 1.13.0 依赖 Avalonia >= 11.1.1）。
 
 ## 快速上手
 
diff --git a/global.json b/global.json
diff --git a/src/AutoSettingUI.Core/AutoSettingUI.Core.csproj b/src/AutoSettingUI.Core/AutoSettingUI.Core.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAotCompatible>true</IsAotCompatible>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+        <NoWarn>$(NoWarn);IL2026;IL2057;IL2070;IL2072;IL2075;IL3050</NoWarn>
         
         <!-- NuGet Packaging -->
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/src/AutoSettingUI.Core/Providers/ReflectionSettingDescriptorProvider.cs b/src/AutoSettingUI.Core/Providers/ReflectionSettingDescriptorProvider.cs
@@ -76,7 +76,7 @@ public bool HasDescriptor(string typeName)
 
         var mainHeaderAttr = type.GetCustomAttribute<MainHeaderAttribute>();
 
-        // Use ordered list to preserve declaration order of sub-sections
+        // Use ordered list to preserve declaration order of subsections
         var subSectionList = new List<(string Title, List<PropertyDescriptor> Props)>();
         var directProperties = new List<PropertyDescriptor>();
         List<PropertyDescriptor>? currentSubProps = null;
@@ -88,7 +88,7 @@ public bool HasDescriptor(string typeName)
             if (prop.GetCustomAttribute<HideAttribute>() is not null)
                 continue;
 
-            // SubHeader: flush previous sub-section and start a new one.
+            // SubHeader: flush previous subsection and start a new one.
             // Do NOT skip the property itself — it should be the first item in the new group.
             var subHeader = prop.GetCustomAttribute<SubHeaderAttribute>();
             if (subHeader is not null)
@@ -175,7 +175,7 @@ public bool HasDescriptor(string typeName)
                 directProperties.Add(propDescriptor);
         }
 
-        // Flush final sub-section
+        // Flush final subsection
         if (currentSubHeader is not null && currentSubProps is not null)
             subSectionList.Add((currentSubHeader, currentSubProps));
 
@@ -196,7 +196,7 @@ public bool HasDescriptor(string typeName)
     }
 
     /// <summary>
-    /// Gets the element type of a collection type.
+    /// Gets the element type of collection type.
     /// </summary>
     private static Type? GetCollectionElementType(Type collectionType)
     {
diff --git a/src/AutoSettingUI.Generator/AutoSettingUI.Generator.csproj b/src/AutoSettingUI.Generator/AutoSettingUI.Generator.csproj
@@ -9,6 +9,9 @@
         <IsRoslynComponent>true</IsRoslynComponent>
         <IncludeBuildOutput>false</IncludeBuildOutput>
         <DevelopmentDependency>true</DevelopmentDependency>
+        <NoWarn>$(NoWarn);RS2008;NU5128</NoWarn>
+        <MSBuildTreatAsLocalProperty>PublishAot</MSBuildTreatAsLocalProperty>
+        <PublishAot>false</PublishAot>
         
         <!-- NuGet Packaging -->
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
diff --git a/src/AutoSettingUI.Generator/Incremental/AutoSettingGenerator.cs b/src/AutoSettingUI.Generator/Incremental/AutoSettingGenerator.cs
@@ -496,8 +496,8 @@ private static void AppendRegisterMethod(StringBuilder sb, INamedTypeSymbol cls,
                 if (maskCharArg is char c)
                     passwordMaskChar = c;
                 var namedMaskChar = GetNamedArgRaw(passwordAttr, "MaskChar");
-                if (!string.IsNullOrEmpty(namedMaskChar) && namedMaskChar.Length > 0)
-                    passwordMaskChar = namedMaskChar[0];
+                if (!string.IsNullOrEmpty(namedMaskChar))
+                    passwordMaskChar = namedMaskChar![0];
                 var maskFlag = GetNamedArgRaw(passwordAttr, "Mask");
                 if (maskFlag == "False")
                     isPassword = false;
diff --git a/src/Extensions/AutoSettingUI.Avalonia/AutoSettingUI.Avalonia.csproj b/src/Extensions/AutoSettingUI.Avalonia/AutoSettingUI.Avalonia.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAotCompatible>true</IsAotCompatible>
-<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+        <NoWarn>$(NoWarn);IL2026;IL2057;IL2067;IL2070;IL2072;IL2075;IL3050</NoWarn>
         
         <!-- NuGet Packaging -->
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -23,15 +24,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.2.7" />
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.7" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.7" />
+        <PackageReference Include="Avalonia" Version="[11.0.0,12.0.0)" />
+        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="[11.0.0,12.0.0)" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="[11.0.0,12.0.0)" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\AutoSettingUI.Core\AutoSettingUI.Core.csproj" />
         <ProjectReference Include="..\..\..\AutoSettingUI.Extension.Shared\AutoSettingUI.Extension.Shared.csproj" />
-        <ProjectReference Include="..\..\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Extensions/AutoSettingUI.Ursa/AutoSettingUI.Ursa.csproj b/src/Extensions/AutoSettingUI.Ursa/AutoSettingUI.Ursa.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <IsAotCompatible>true</IsAotCompatible>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <NoWarn>$(NoWarn);IL2026;IL2057;IL2067;IL2070;IL2072;IL2075;IL3050</NoWarn>
         
         <!-- NuGet Packaging -->
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -23,15 +24,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.2.7" />
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.7" />
+        <PackageReference Include="Avalonia" Version="[11.1.1,12.0.0)" />
+        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="[11.1.1,12.0.0)" />
         <PackageReference Include="Irihi.Ursa" Version="1.13.0" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\AutoSettingUI.Core\AutoSettingUI.Core.csproj" />
         <ProjectReference Include="..\..\..\AutoSettingUI.Extension.Shared\AutoSettingUI.Extension.Shared.csproj" />
-        <ProjectReference Include="..\..\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Extensions/AutoSettingUI.WPF/AutoSettingUI.WPF.csproj b/src/Extensions/AutoSettingUI.WPF/AutoSettingUI.WPF.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net9.0-windows</TargetFramework>
+        <TargetFrameworks>net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
         <IsAotCompatible>true</IsAotCompatible>
         <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+        <NoWarn>$(NoWarn);CS8604;IL2026;IL2057;IL2067;IL2070;IL2072;IL2075;IL3050</NoWarn>
         
         <!-- NuGet Packaging -->
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -25,7 +26,6 @@
     <ItemGroup>
       <ProjectReference Include="..\..\AutoSettingUI.Core\AutoSettingUI.Core.csproj" />
       <ProjectReference Include="..\..\..\AutoSettingUI.Extension.Shared\AutoSettingUI.Extension.Shared.csproj" />
-      <ProjectReference Include="..\..\AutoSettingUI.Generator\AutoSettingUI.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>
