Merge remote-tracking branch 'origin/main'

feat: bump version.
Merge pull request #361 from irihitech/issue/359
2026-03-03 00:00:55 +08:00 · 2024-06-15 19:35:35 +08:00 · 2024-06-15 19:34:48 +08:00 · 2024-05-29 22:27:08 +08:00 · 2024-05-29 22:11:50 +08:00
7 changed files with 9 additions and 7 deletions
--- a/demo/Directory.Build.props
+++ b/demo/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
    <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.1.0-beta2</AvaloniaVersion>
+    <AvaloniaVersion>11.1.0-rc1</AvaloniaVersion>
  </PropertyGroup>
 </Project>
--- a/src/Package.props
+++ b/src/Package.props
@@ -3,14 +3,14 @@
        <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.1.0-beta2</Version>
+        <Version>11.1.0-rc1</Version>
        <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>
-        <AvaloniaVersion>11.1.0-beta2</AvaloniaVersion>
+        <AvaloniaVersion>11.1.0-rc1</AvaloniaVersion>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
+++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -4,7 +4,7 @@

    <PropertyGroup>
        <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
+++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -4,7 +4,7 @@
    
    <PropertyGroup>
        <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
    </PropertyGroup>

    <ItemGroup>
--- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
+++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -4,7 +4,7 @@
        <TargetFramework>net6.0</TargetFramework>
        <Nullable>enable</Nullable>
        <LangVersion>latest</LangVersion>
-        <Version>11.0.1</Version>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
        <Authors>IRIHI Technology Co., Ltd.</Authors>
        <Description>Avalonia Theme inspired by Semi Design.</Description>
        <RepositoryUrl>https://github.com/irihitech/Semi.Avalonia</RepositoryUrl>
--- a/src/Semi.Avalonia/Controls/Menu.axaml
+++ b/src/Semi.Avalonia/Controls/Menu.axaml
@@ -159,6 +159,7 @@
                                HorizontalAlignment="Stretch"
                                VerticalAlignment="Center"
                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
                                RecognizesAccessKey="True" />
                            <TextBlock
                                x:Name="PART_InputGestureText"
--- a/src/Semi.Avalonia/Semi.Avalonia.csproj
+++ b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -4,7 +4,8 @@

    <PropertyGroup>
        <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to 11.0.7</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to Avalonia 11.1-rc1</PackageReleaseNotes>
+        <IsAotCompatible>true</IsAotCompatible>
    </PropertyGroup>

    <ItemGroup>
Author	SHA1	Message	Date
rabbitism	d5dce72a34	Merge remote-tracking branch 'origin/main'	2024-06-15 19:35:35 +08:00
rabbitism	b1a29c67a9	feat: bump version.	2024-06-15 19:34:48 +08:00
Dong Bin	471106f825	Merge pull request #361 from irihitech/issue/359 Add ContentTemplate to MenuItem Header	2024-05-29 22:27:08 +08:00
Zhang Dian	ec070d2f67	fix: add ContentTemplate to MenuItem Header.	2024-05-29 22:11:50 +08:00