ci: add adroid workload.

misc: bump version.
fix: ClearButton shouble not be focusable.
2026-03-03 00:00:55 +08:00 · 2025-12-30 16:04:07 +08:00 · 2025-12-30 15:26:35 +08:00 · 2025-12-29 16:02:00 +08:00 · 2025-12-22 19:32:57 +08:00 · 2025-12-16 17:08:07 +08:00
24 changed files with 145 additions and 200 deletions
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages

 env:
  PROJECT_PATH: demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
-  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net9.0-browser/publish/wwwroot
+  OUTPUT_PATH: demo/Semi.Avalonia.Demo.Web/bin/Release/net10.0-browser/publish/wwwroot
 on:
  workflow_dispatch:

@@ -17,8 +17,7 @@ jobs:
        uses: actions/setup-dotnet@v5
        with:
          dotnet-version: |
-            8.0.x
-            9.0.x
+            10.0.x

      - name: Install wasm-tools
        run: dotnet workload install wasm-tools
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -212,12 +212,12 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v5
-      - name: CD Android
-        run: cd demo/Semi.Avalonia.Demo.Android
+      - name: Install Android workload
+        run: dotnet workload install android
      - name: Restore Dependencies
-        run: dotnet restore
+        run: dotnet restore demo/Semi.Avalonia.Demo.Android
      - name: Publish Android
-        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net9.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64
+        run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net10.0-android --no-restore -o publish /p:RuntimeIdentifier=android-arm64
      - name: Upload a Build Artifact
        uses: actions/upload-artifact@v4.6.2
        with:
--- a/Semi.Avalonia.sln
+++ b/Semi.Avalonia.sln
@@ -1,99 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32929.385
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia", "src\Semi.Avalonia\Semi.Avalonia.csproj", "{90D0B063-BC64-40AB-A56C-AC11909CF410}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{B1E6A7D4-0AFB-4D32-9969-5FBDAC0CFF3E}"
-	ProjectSection(SolutionItems) = preProject
-		demo\Directory.Build.props = demo\Directory.Build.props
-		demo\global.json = demo\global.json
-		src\Package.props = src\Package.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Action", "GitHub Action", "{318534A1-1CC3-40FB-B4AE-736F94465232}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\deploy.yml = .github\workflows\deploy.yml
-		.github\workflows\pack.yml = .github\workflows\pack.yml
-		.github\workflows\pack-nightly.yml = .github\workflows\pack-nightly.yml
-		.github\workflows\publish.yml = .github\workflows\publish.yml
-		.github\workflows\release-tag.yml = .github\workflows\release-tag.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{43091528-9509-43CB-A003-9C5C11E96DD6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Desktop", "demo\Semi.Avalonia.Demo.Desktop\Semi.Avalonia.Demo.Desktop.csproj", "{2ADCA724-2B6D-46EC-87F7-604D7918B89A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Web", "demo\Semi.Avalonia.Demo.Web\Semi.Avalonia.Demo.Web.csproj", "{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo", "demo\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj", "{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.DataGrid", "src\Semi.Avalonia.DataGrid\Semi.Avalonia.DataGrid.csproj", "{8A90C292-8761-4F70-8E1F-EFC097FEADB3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.ColorPicker", "src\Semi.Avalonia.ColorPicker\Semi.Avalonia.ColorPicker.csproj", "{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semi.Avalonia.Demo.Android", "demo\Semi.Avalonia.Demo.Android\Semi.Avalonia.Demo.Android.csproj", "{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.Demo.Drm", "demo\Semi.Avalonia.Demo.Drm\Semi.Avalonia.Demo.Drm.csproj", "{86D93406-412A-4429-93B2-92AAD0407784}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Semi.Avalonia.TreeDataGrid", "src\Semi.Avalonia.TreeDataGrid\Semi.Avalonia.TreeDataGrid.csproj", "{398D2998-0835-41F5-99A3-608CAB8051E2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90D0B063-BC64-40AB-A56C-AC11909CF410}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A90C292-8761-4F70-8E1F-EFC097FEADB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B64C2F2-FDCD-48E4-AB9D-7CCC63B006CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86D93406-412A-4429-93B2-92AAD0407784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{398D2998-0835-41F5-99A3-608CAB8051E2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2ADCA724-2B6D-46EC-87F7-604D7918B89A} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{69A2C77D-6DB7-4AE4-B179-D1F5CF5E2DF0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{D789AEDB-EBDF-4450-8E8E-B4A03FB257B0} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{0C81FC1C-5D2D-478A-9876-923A0C85EC2F} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-		{86D93406-412A-4429-93B2-92AAD0407784} = {43091528-9509-43CB-A003-9C5C11E96DD6}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7CA41ED3-2CED-40CC-AA21-28C3B42B1E86}
-	EndGlobalSection
-EndGlobal
--- a/Semi.Avalonia.slnx
+++ b/Semi.Avalonia.slnx
@@ -0,0 +1,28 @@
+<Solution>
+    <Folder Name="/Demo/">
+        <Project Path="demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj"/>
+        <Project Path="demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj"/>
+    </Folder>
+    <Folder Name="/GitHub Action/">
+        <File Path=".github/workflows/deploy.yml"/>
+        <File Path=".github/workflows/pack-nightly.yml"/>
+        <File Path=".github/workflows/pack.yml"/>
+        <File Path=".github/workflows/publish.yml"/>
+        <File Path=".github/workflows/release-tag.yml"/>
+    </Folder>
+    <Folder Name="/Solution Items/Demo/">
+        <File Path="demo/Directory.Packages.props"/>
+        <File Path="demo/global.json"/>
+    </Folder>
+    <Folder Name="/Solution Items/Package/">
+        <File Path="src/Directory.Packages.props"/>
+        <File Path="src/Directory.Build.props"/>
+    </Folder>
+    <Project Path="src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj"/>
+    <Project Path="src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj"/>
+    <Project Path="src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj"/>
+    <Project Path="src/Semi.Avalonia/Semi.Avalonia.csproj"/>
+</Solution>
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,7 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <AvaloniaVersion>11.3.7</AvaloniaVersion>
-        <DataGridVersion>11.3.7</DataGridVersion>
-        <CommunityToolkitVersion>8.4.0</CommunityToolkitVersion>
-    </PropertyGroup>
-</Project>
--- a/demo/Directory.Packages.props
+++ b/demo/Directory.Packages.props
@@ -0,0 +1,27 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <AvaloniaVersion>11.3.10</AvaloniaVersion>
+        <DataGridVersion>11.3.10</DataGridVersion>
+        <SkiaSharpVersion>3.119.1</SkiaSharpVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
+
+        <PackageVersion Include="SkiaSharp" Version="$(SkiaSharpVersion)"/>
+        <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="$(SkiaSharpVersion)"/>
+
+        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0"/>
+
+        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
+        <PackageVersion Include="Irihi.Avalonia.Shared" Version="0.3.1"/>
+    </ItemGroup>
+</Project>
--- a/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
+++ b/demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0-android</TargetFramework>
+        <TargetFramework>net10.0-android</TargetFramework>
        <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
        <Nullable>enable</Nullable>
        <ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
@@ -19,8 +19,8 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
+        <PackageReference Include="Avalonia.Android"/>
+        <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
+++ b/demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
@@ -23,7 +23,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
+++ b/demo/Semi.Avalonia.Demo.Drm/Semi.Avalonia.Demo.Drm.csproj
@@ -23,8 +23,8 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.LinuxFramebuffer" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Desktop"/>
+        <PackageReference Include="Avalonia.LinuxFramebuffer"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
+++ b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WebAssembly">
    <PropertyGroup>
-        <TargetFramework>net9.0-browser</TargetFramework>
+        <TargetFramework>net10.0-browser</TargetFramework>
        <OutputType>Exe</OutputType>
        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
        <Nullable>enable</Nullable>
@@ -11,7 +11,9 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Browser"/>
+        <PackageReference Include="SkiaSharp"/>
+        <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly"/>
    </ItemGroup>

    <ItemGroup>
--- a/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
+++ b/demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj
@@ -11,16 +11,16 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
+        <PackageReference Include="Avalonia"/>
+        <PackageReference Include="Avalonia.Controls.ColorPicker"/>
+        <PackageReference Include="Avalonia.Controls.DataGrid"/>
        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
+        <PackageReference Include="Avalonia.Diagnostics">
            <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
            <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
        </PackageReference>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="$(CommunityToolkitVersion)"/>
-        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.3.0" />
+        <PackageReference Include="CommunityToolkit.Mvvm"/>
+        <PackageReference Include="Irihi.Avalonia.Shared"/>
    </ItemGroup>

    <ItemGroup>
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,17 +1,21 @@
 <Project>
    <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.3.7.1</Version>
+        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+        <IsAotCompatible>true</IsAotCompatible>
+    </PropertyGroup>
+
+    <PropertyGroup>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
+        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
        <PackageIcon>irihi.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <AvaloniaVersion>11.3.7</AvaloniaVersion>
-        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
        <PackageReadmeFile>README.md</PackageReadmeFile>
    </PropertyGroup>

--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -0,0 +1,13 @@
+<Project>
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <AvaloniaVersion>11.3.7</AvaloniaVersion>
+        <DataGridVersion>11.3.7</DataGridVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
+        <PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
+        <PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10"/>
+    </ItemGroup>
+</Project>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -1,19 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Import Project="../Package.props"/>
-
    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.2</PackageReleaseNotes>
        <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.1</PackageReleaseNotes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia.Controls.ColorPicker"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia.ColorPicker/irihi.png
+++ b/src/Semi.Avalonia.ColorPicker/irihi.png
--- a/src/Semi.Avalonia.DataGrid/DataGrid.axaml
+++ b/src/Semi.Avalonia.DataGrid/DataGrid.axaml
@@ -86,7 +86,7 @@
                        <Rectangle
                            Name="PART_RightGridLine"
                            Grid.Column="1"
-                            Width="1"
+                            Width="{DynamicResource DataGridGridLineThickness}"
                            VerticalAlignment="Stretch"
                            Fill="{DynamicResource DataGridLineBrush}" />
                    </Grid>
@@ -145,7 +145,7 @@
                        <Rectangle
                            Name="VerticalSeparator"
                            Grid.Column="1"
-                            Width="1"
+                            Width="{DynamicResource DataGridGridLineThickness}"
                            VerticalAlignment="Stretch"
                            Fill="{TemplateBinding SeparatorBrush}"
                            IsVisible="{TemplateBinding AreSeparatorsVisible}" />
@@ -209,7 +209,7 @@
                    <Rectangle
                        Grid.Row="0"
                        Grid.RowSpan="2"
-                        Height="1"
+                        Height="{DynamicResource DataGridGridLineThickness}"
                        VerticalAlignment="Bottom"
                        Fill="{DynamicResource DataGridLineBrush}"
                        StrokeThickness="1" />
@@ -250,7 +250,7 @@
                        Grid.Row="2"
                        Grid.Column="0"
                        Grid.ColumnSpan="2"
-                        Height="1"
+                        Height="{DynamicResource DataGridGridLineThickness}"
                        Margin="1,0,1,0"
                        HorizontalAlignment="Stretch"
                        Fill="{TemplateBinding SeparatorBrush}"
@@ -315,7 +315,7 @@
                            Name="PART_BottomGridLine"
                            Grid.Row="2"
                            Grid.Column="1"
-                            Height="1"
+                            Height="{DynamicResource DataGridGridLineThickness}"
                            HorizontalAlignment="Stretch" />
                    </DataGridFrozenGrid>
                </Border>
@@ -452,7 +452,7 @@
                        Grid.Row="1"
                        Grid.Column="0"
                        Grid.ColumnSpan="5"
-                        Height="1"
+                        Height="{DynamicResource DataGridGridLineThickness}"
                        Fill="{DynamicResource DataGridLineBrush}" />
                </DataGridFrozenGrid>
            </ControlTemplate>
@@ -498,7 +498,7 @@
                            Grid.Row="0"
                            Grid.Column="0"
                            Grid.ColumnSpan="3"
-                            Height="1"
+                            Height="{DynamicResource DataGridGridLineThickness}"
                            VerticalAlignment="Bottom"
                            Fill="{DynamicResource DataGridLineBrush}" />

--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -2,29 +2,14 @@

    <PropertyGroup>
        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.3.7</Version>
-        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.1</PackageReleaseNotes>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
-        <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.2</PackageReleaseNotes>
        <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.7"/>
-        <None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia.Controls.DataGrid"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia.DataGrid/Shared.axaml
+++ b/src/Semi.Avalonia.DataGrid/Shared.axaml
@@ -19,4 +19,7 @@
    <StaticResource x:Key="DataGridRowGroupHeaderVisualStrokeThickness" ResourceKey="SemiBorderSpacingControl" />

    <StaticResource x:Key="DataGridDisabledCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
+
+    <!-- Grid line thickness -->
+    <x:Double x:Key="DataGridGridLineThickness">1</x:Double>
 </ResourceDictionary>
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -2,28 +2,14 @@

    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <Version>11.0.10.4</Version>
-        <PackageReleaseNotes>Update to 11.0.10.4</PackageReleaseNotes>
-        <Authors>IRIHI Technology Co., Ltd.</Authors>
-        <Description>Avalonia Theme inspired by Semi Design.</Description>
-        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>irihi.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
-        <PackageReadmeFile>README.md</PackageReadmeFile>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
+        <Version>11.1.1</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia.TreeDataGrid 11.1.1</PackageReleaseNotes>
+        <Title>Semi.Avalonia.TreeDataGrid</Title>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10"/>
-        <None Include="..\..\irihi.png" Pack="true" PackagePath="\" Link="Properties\irihi.png"/>
-        <None Include="..\..\LICENSE" Pack="true" PackagePath="\" Link="Properties\LICENSE"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia.Controls.TreeDataGrid"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -239,7 +239,8 @@
                            Margin="0,0,9,0"
                            Command="{Binding $parent[DatePicker].Clear}"
                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False" />
+                            IsVisible="False"
+                            Focusable="False" />
                    </Grid>
                </DataValidationErrors>
            </ControlTemplate>
--- a/src/Semi.Avalonia/Controls/TextBox.axaml
+++ b/src/Semi.Avalonia/Controls/TextBox.axaml
@@ -107,6 +107,7 @@
                                Command="{Binding $parent[TextBox].Clear}"
                                Content="{DynamicResource IconButtonClearData}"
                                IsVisible="False"
+                                Focusable="False"
                                Theme="{StaticResource InnerIconButton}" />
                            <ToggleButton
                                Name="PART_RevealButton"
@@ -260,7 +261,6 @@
        <Setter Property="BorderThickness" Value="{DynamicResource TextBoxBorderThickness}" />
        <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
        <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
-        <Setter Property="Cursor" Value="Ibeam" />
        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
        <Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
@@ -328,6 +328,11 @@
                                        TextAlignment="{TemplateBinding TextAlignment}"
                                        TextWrapping="{TemplateBinding TextWrapping}" />
                                </Panel>
+                                <ScrollViewer.Styles>
+                                    <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                                        <Setter Property="Cursor" Value="Ibeam" />
+                                    </Style>
+                                </ScrollViewer.Styles>
                            </ScrollViewer>
                            <Button
                                Name="PART_ClearButton"
@@ -335,6 +340,7 @@
                                Command="{Binding $parent[TextBox].Clear}"
                                Content="{DynamicResource IconButtonClearData}"
                                IsVisible="False"
+                                Focusable="False"
                                Theme="{StaticResource InnerIconButton}" />
                            <ToggleButton
                                Name="PART_RevealButton"
@@ -483,7 +489,6 @@
        <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
        <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
        <Setter Property="SelectionForegroundBrush" Value="{DynamicResource TextBoxSelectionForeground}" />
-        <Setter Property="Cursor" Value="Ibeam" />
        <Setter Property="CaretBrush" Value="{DynamicResource TextBoxTextCaretBrush}" />
        <Setter Property="Padding" Value="{DynamicResource TextBoxContentPadding}" />
        <Setter Property="MinHeight" Value="{DynamicResource TextBoxDefaultHeight}" />
@@ -542,6 +547,11 @@
                                    TextAlignment="{TemplateBinding TextAlignment}"
                                    TextWrapping="{TemplateBinding TextWrapping}" />
                            </Panel>
+                            <ScrollViewer.Styles>
+                                <Style Selector="ScrollContentPresenter#PART_ContentPresenter">
+                                    <Setter Property="Cursor" Value="Ibeam" />
+                                </Style>
+                            </ScrollViewer.Styles>
                        </ScrollViewer>
                        <ContentPresenter
                            Grid.Column="2"
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -305,7 +305,8 @@
                            Margin="0,0,9,0"
                            Command="{Binding $parent[TimePicker].Clear}"
                            Content="{DynamicResource IconButtonClearData}"
-                            IsVisible="False" />
+                            IsVisible="False"
+                            Focusable="False" />
                    </Grid>
                </DataValidationErrors>
            </ControlTemplate>
--- a/src/Semi.Avalonia/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -16,7 +16,7 @@
                <ResourceInclude Source="/Themes/Shared/_index.axaml" />
                <ResourceInclude Source="/Tokens/Variables.axaml" />
                <ResourceInclude Source="/Locale/zh-cn.axaml" />
-                <ResourceInclude Source="/Icons/_index.axaml" />
+                <semi:Icons />
            </ResourceDictionary.MergedDictionaries>
        </ResourceDictionary>
    </Styles.Resources>
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -1,19 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">

-    <Import Project="../Package.props"/>
-
    <PropertyGroup>
+        <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+        <Version>11.3.7.2</Version>
+        <PackageReleaseNotes>Update to Semi.Avalonia 11.3.7.2</PackageReleaseNotes>
        <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to Semi.Avalonia 11.3.7.1</PackageReleaseNotes>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
-        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <None Include="README.md" Pack="true" PackagePath="\" />
+        <PackageReference Include="Avalonia"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
    </ItemGroup>

 </Project>
Author	SHA1	Message	Date
Zhang Dian	622c8c23b7	ci: add adroid workload.	2025-12-30 16:04:07 +08:00
Zhang Dian	104ba2f1f4	misc: bump version.	2025-12-30 15:26:35 +08:00
Zhang Dian	4895d2f51b	fix: ClearButton shouble not be focusable.	2025-12-29 16:02:00 +08:00
Shatyuka	414736443d	fix: controls under TextBox inheriting Ibeam cursor (#710 )	2025-12-22 19:32:57 +08:00
Copilot	65d2f88cab	Make DataGrid cell grid lines use dynamic resources for thickness (#666 ) * Initial plan * Implement dynamic resources for DataGrid grid line thickness and color Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com> * Revert DynamicResource to StaticResource for DataGridLineBrush in theme files Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>	2025-12-16 17:08:07 +08:00
Zhang Dian	0a622772f4	ci: specify project path for dotnet restore in publish.yml.	2025-12-10 15:11:49 +08:00
Dong Bin	5ef8f7ddaf	fix: replace icon resource include with semi:Icons in Index.axaml (#707 )	2025-12-09 16:06:04 +08:00
Zhang Dian	ba9dd0a574	chore: turn on CPM & slnx.	2025-12-09 13:58:01 +08:00
Dong Bin	f784a2c927	fix: try to fix wasm deployment issue. (#698 )	2025-11-17 11:23:45 +08:00
Zhang Dian	69cc9b9ca3	misc: bump version.	2025-11-15 15:18:45 +08:00