From d5e06758082d8fd86d21bfad0357f8cf2e537491 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 29 May 2025 16:35:45 +0800 Subject: [PATCH 1/4] misc: update project references. --- .../irihi.png => irihi.png | Bin src/Package.props | 3 ++- .../{ => Properties}/AssemblyInfo.cs | 0 .../{ => Properties}/AssemblyInfo.cs | 0 .../Semi.Avalonia.DataGrid.csproj | 3 ++- .../{ => Properties}/AssemblyInfo.cs | 0 .../Semi.Avalonia.TreeDataGrid.csproj | 3 ++- src/Semi.Avalonia.TreeDataGrid/irihi.png | Bin 1508 -> 0 bytes .../{ => Properties}/AssemblyInfo.cs | 0 src/Semi.Avalonia/irihi.png | Bin 1508 -> 0 bytes 10 files changed, 6 insertions(+), 3 deletions(-) rename src/Semi.Avalonia.DataGrid/irihi.png => irihi.png (100%) rename src/Semi.Avalonia.ColorPicker/{ => Properties}/AssemblyInfo.cs (100%) rename src/Semi.Avalonia.DataGrid/{ => Properties}/AssemblyInfo.cs (100%) rename src/Semi.Avalonia.TreeDataGrid/{ => Properties}/AssemblyInfo.cs (100%) delete mode 100644 src/Semi.Avalonia.TreeDataGrid/irihi.png rename src/Semi.Avalonia/{ => Properties}/AssemblyInfo.cs (100%) delete mode 100644 src/Semi.Avalonia/irihi.png diff --git a/src/Semi.Avalonia.DataGrid/irihi.png b/irihi.png similarity index 100% rename from src/Semi.Avalonia.DataGrid/irihi.png rename to irihi.png diff --git a/src/Package.props b/src/Package.props index 668f5c6..fde408f 100644 --- a/src/Package.props +++ b/src/Package.props @@ -14,6 +14,7 @@ - + + \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/AssemblyInfo.cs b/src/Semi.Avalonia.ColorPicker/Properties/AssemblyInfo.cs similarity index 100% rename from src/Semi.Avalonia.ColorPicker/AssemblyInfo.cs rename to src/Semi.Avalonia.ColorPicker/Properties/AssemblyInfo.cs diff --git a/src/Semi.Avalonia.DataGrid/AssemblyInfo.cs b/src/Semi.Avalonia.DataGrid/Properties/AssemblyInfo.cs similarity index 100% rename from src/Semi.Avalonia.DataGrid/AssemblyInfo.cs rename to src/Semi.Avalonia.DataGrid/Properties/AssemblyInfo.cs diff --git a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj index 0b9f999..ded9294 100644 --- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj +++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj @@ -21,7 +21,8 @@ - + + diff --git a/src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs b/src/Semi.Avalonia.TreeDataGrid/Properties/AssemblyInfo.cs similarity index 100% rename from src/Semi.Avalonia.TreeDataGrid/AssemblyInfo.cs rename to src/Semi.Avalonia.TreeDataGrid/Properties/AssemblyInfo.cs diff --git a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj index 0f3a76d..e3efa84 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj +++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj @@ -20,7 +20,8 @@ - + + diff --git a/src/Semi.Avalonia.TreeDataGrid/irihi.png b/src/Semi.Avalonia.TreeDataGrid/irihi.png deleted file mode 100644 index 01c68d918e31705d8d659505b74b764ec3b72ac4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1508 zcmeAS@N?(olHy`uVBq!ia0y~yV9Wqv4mO}j)zieQK#H@#BeIx*f$uN~Gak=hkpdKy zEOCt}3C>R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fwb0YWF{EP7+iM4NpE&R^ z9K7tvnbRUYTPcL2gyCDUqS>2OEGHP*c;$?Z|1+HUxqmMMgS~J@gGM7;htMcRd=OY| z7q7VWv1R|DNig)WhgH%*UQYyE>2D?NY%?PN}v7CMv8%fwb0YWF{EP7+iM4NpE&R^ z9K7tvnbRUYTPcL2gyCDUqS>2OEGHP*c;$?Z|1+HUxqmMMgS~J@gGM7;htMcRd=OY| z7q7VWv1 Date: Thu, 29 May 2025 17:07:24 +0800 Subject: [PATCH 2/4] misc: simplify resources include paths and clean up XAML formatting. --- .../Controls/_index.axaml | 10 +- src/Semi.Avalonia.ColorPicker/Index.axaml | 8 +- src/Semi.Avalonia.DataGrid/Index.axaml | 8 +- src/Semi.Avalonia.TreeDataGrid/Index.axaml | 8 +- .../Animations/SemiPopupAnimations.axaml | 9 +- .../Animations/SemiPopupAnimations.axaml.cs | 5 +- src/Semi.Avalonia/Controls/_index.axaml | 112 +++++++++--------- src/Semi.Avalonia/Icons/_index.axaml | 9 +- src/Semi.Avalonia/Index.axaml | 24 ++-- src/Semi.Avalonia/Locale/_index.cs | 21 ++++ src/Semi.Avalonia/Locale/de-de.axaml | 7 +- src/Semi.Avalonia/Locale/de-de.axaml.cs | 8 -- src/Semi.Avalonia/Locale/en-us.axaml.cs | 8 -- src/Semi.Avalonia/Locale/es-es.axaml.cs | 8 -- src/Semi.Avalonia/Locale/ja-jp.axaml | 2 +- src/Semi.Avalonia/Locale/ja-jp.axaml.cs | 8 -- src/Semi.Avalonia/Locale/pl-pl.axaml.cs | 8 -- src/Semi.Avalonia/Locale/ru-ru.axaml.cs | 8 -- src/Semi.Avalonia/Locale/uk-ua.axaml.cs | 8 -- src/Semi.Avalonia/Locale/zh-cn.axaml.cs | 8 -- src/Semi.Avalonia/Locale/zh-tw.axaml.cs | 8 -- src/Semi.Avalonia/Schemes/AquaticScheme.axaml | 4 +- src/Semi.Avalonia/Schemes/DarkScheme.axaml | 4 +- src/Semi.Avalonia/Schemes/DesertScheme.axaml | 4 +- src/Semi.Avalonia/Schemes/DuskScheme.axaml | 4 +- src/Semi.Avalonia/Schemes/LightScheme.axaml | 4 +- .../Schemes/NightSkyScheme.axaml | 4 +- src/Semi.Avalonia/SemiTheme.axaml | 24 ++-- src/Semi.Avalonia/Styles/_index.axaml | 4 +- src/Semi.Avalonia/Themes/Dark/_index.axaml | 86 +++++++------- .../Themes/HighContrast/_index.axaml | 86 +++++++------- src/Semi.Avalonia/Themes/Light/_index.axaml | 86 +++++++------- src/Semi.Avalonia/Themes/Shared/_index.axaml | 86 +++++++------- src/Semi.Avalonia/Tokens/Palette/Dark.axaml | 5 +- src/Semi.Avalonia/Tokens/Palette/Light.axaml | 5 +- 35 files changed, 329 insertions(+), 372 deletions(-) create mode 100644 src/Semi.Avalonia/Locale/_index.cs delete mode 100644 src/Semi.Avalonia/Locale/de-de.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/en-us.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/es-es.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/ja-jp.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/pl-pl.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/ru-ru.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/uk-ua.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/zh-cn.axaml.cs delete mode 100644 src/Semi.Avalonia/Locale/zh-tw.axaml.cs diff --git a/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml b/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml index d18df4d..cb68870 100644 --- a/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml +++ b/src/Semi.Avalonia.ColorPicker/Controls/_index.axaml @@ -3,10 +3,10 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - - - + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia.ColorPicker/Index.axaml b/src/Semi.Avalonia.ColorPicker/Index.axaml index 2d4da5d..c2e551f 100644 --- a/src/Semi.Avalonia.ColorPicker/Index.axaml +++ b/src/Semi.Avalonia.ColorPicker/Index.axaml @@ -2,12 +2,12 @@ - - + + - - + + diff --git a/src/Semi.Avalonia.DataGrid/Index.axaml b/src/Semi.Avalonia.DataGrid/Index.axaml index 4d798eb..c20a7a0 100644 --- a/src/Semi.Avalonia.DataGrid/Index.axaml +++ b/src/Semi.Avalonia.DataGrid/Index.axaml @@ -2,12 +2,12 @@ - - + + - - + + diff --git a/src/Semi.Avalonia.TreeDataGrid/Index.axaml b/src/Semi.Avalonia.TreeDataGrid/Index.axaml index 4165bb7..d7d886b 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Index.axaml +++ b/src/Semi.Avalonia.TreeDataGrid/Index.axaml @@ -2,12 +2,12 @@ - - + + - - + + diff --git a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml index 3cf0c44..21c6443 100644 --- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml +++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml @@ -1,7 +1,8 @@ - + diff --git a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs index 00d769e..8b766c2 100644 --- a/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs +++ b/src/Semi.Avalonia/Animations/SemiPopupAnimations.axaml.cs @@ -2,7 +2,4 @@ using Avalonia.Styling; namespace Semi.Avalonia; -public class SemiPopupAnimations: Styles -{ - -} \ No newline at end of file +public class SemiPopupAnimations : Styles; \ No newline at end of file diff --git a/src/Semi.Avalonia/Controls/_index.axaml b/src/Semi.Avalonia/Controls/_index.axaml index 425ce0c..b65b3a1 100644 --- a/src/Semi.Avalonia/Controls/_index.axaml +++ b/src/Semi.Avalonia/Controls/_index.axaml @@ -3,61 +3,61 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Icons/_index.axaml b/src/Semi.Avalonia/Icons/_index.axaml index 48d4869..71b74fa 100644 --- a/src/Semi.Avalonia/Icons/_index.axaml +++ b/src/Semi.Avalonia/Icons/_index.axaml @@ -1,6 +1,9 @@ - + - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml index 1f16c58..4fcd2e7 100644 --- a/src/Semi.Avalonia/Index.axaml +++ b/src/Semi.Avalonia/Index.axaml @@ -4,22 +4,22 @@ - - - - - - + + + + + + - - - - - + + + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/_index.cs b/src/Semi.Avalonia/Locale/_index.cs new file mode 100644 index 0000000..f024267 --- /dev/null +++ b/src/Semi.Avalonia/Locale/_index.cs @@ -0,0 +1,21 @@ +using Avalonia.Controls; + +namespace Semi.Avalonia.Locale; + +public class de_de : ResourceDictionary; + +public class en_us : ResourceDictionary; + +public class es_es : ResourceDictionary; + +public class ja_jp : ResourceDictionary; + +public class pl_pl : ResourceDictionary; + +public class ru_ru : ResourceDictionary; + +public class uk_ua : ResourceDictionary; + +public class zh_cn : ResourceDictionary; + +public class zh_tw : ResourceDictionary; \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/de-de.axaml b/src/Semi.Avalonia/Locale/de-de.axaml index 8b1fd67..ebb4b3e 100644 --- a/src/Semi.Avalonia/Locale/de-de.axaml +++ b/src/Semi.Avalonia/Locale/de-de.axaml @@ -1,6 +1,7 @@ - + Tag Monat diff --git a/src/Semi.Avalonia/Locale/de-de.axaml.cs b/src/Semi.Avalonia/Locale/de-de.axaml.cs deleted file mode 100644 index 76dcfb7..0000000 --- a/src/Semi.Avalonia/Locale/de-de.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class de_de : ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/en-us.axaml.cs b/src/Semi.Avalonia/Locale/en-us.axaml.cs deleted file mode 100644 index f9a9730..0000000 --- a/src/Semi.Avalonia/Locale/en-us.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class en_us: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/es-es.axaml.cs b/src/Semi.Avalonia/Locale/es-es.axaml.cs deleted file mode 100644 index 0f4284d..0000000 --- a/src/Semi.Avalonia/Locale/es-es.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class es_es: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/ja-jp.axaml b/src/Semi.Avalonia/Locale/ja-jp.axaml index 18e7811..c9dbd6b 100644 --- a/src/Semi.Avalonia/Locale/ja-jp.axaml +++ b/src/Semi.Avalonia/Locale/ja-jp.axaml @@ -24,4 +24,4 @@ 種類 サイズ {0} はすでに存在します。置き換えますか？ - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/ja-jp.axaml.cs b/src/Semi.Avalonia/Locale/ja-jp.axaml.cs deleted file mode 100644 index d054d32..0000000 --- a/src/Semi.Avalonia/Locale/ja-jp.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class ja_jp: ResourceDictionary -{ - -} diff --git a/src/Semi.Avalonia/Locale/pl-pl.axaml.cs b/src/Semi.Avalonia/Locale/pl-pl.axaml.cs deleted file mode 100644 index 70a8200..0000000 --- a/src/Semi.Avalonia/Locale/pl-pl.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class pl_pl: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/ru-ru.axaml.cs b/src/Semi.Avalonia/Locale/ru-ru.axaml.cs deleted file mode 100644 index ad9bc07..0000000 --- a/src/Semi.Avalonia/Locale/ru-ru.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class ru_ru : ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/uk-ua.axaml.cs b/src/Semi.Avalonia/Locale/uk-ua.axaml.cs deleted file mode 100644 index 6387ed0..0000000 --- a/src/Semi.Avalonia/Locale/uk-ua.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class uk_ua : ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/zh-cn.axaml.cs b/src/Semi.Avalonia/Locale/zh-cn.axaml.cs deleted file mode 100644 index 530a7de..0000000 --- a/src/Semi.Avalonia/Locale/zh-cn.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class zh_cn: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Locale/zh-tw.axaml.cs b/src/Semi.Avalonia/Locale/zh-tw.axaml.cs deleted file mode 100644 index 18f4508..0000000 --- a/src/Semi.Avalonia/Locale/zh-tw.axaml.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Avalonia.Controls; - -namespace Semi.Avalonia.Locale; - -public class zh_tw: ResourceDictionary -{ - -} \ No newline at end of file diff --git a/src/Semi.Avalonia/Schemes/AquaticScheme.axaml b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml index 4181245..251c757 100644 --- a/src/Semi.Avalonia/Schemes/AquaticScheme.axaml +++ b/src/Semi.Avalonia/Schemes/AquaticScheme.axaml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Schemes/DarkScheme.axaml b/src/Semi.Avalonia/Schemes/DarkScheme.axaml index 0666d38..9269f84 100644 --- a/src/Semi.Avalonia/Schemes/DarkScheme.axaml +++ b/src/Semi.Avalonia/Schemes/DarkScheme.axaml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Schemes/DesertScheme.axaml b/src/Semi.Avalonia/Schemes/DesertScheme.axaml index 6fdac84..90d53b7 100644 --- a/src/Semi.Avalonia/Schemes/DesertScheme.axaml +++ b/src/Semi.Avalonia/Schemes/DesertScheme.axaml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Schemes/DuskScheme.axaml b/src/Semi.Avalonia/Schemes/DuskScheme.axaml index fe3d1b4..ba61cd2 100644 --- a/src/Semi.Avalonia/Schemes/DuskScheme.axaml +++ b/src/Semi.Avalonia/Schemes/DuskScheme.axaml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Schemes/LightScheme.axaml b/src/Semi.Avalonia/Schemes/LightScheme.axaml index 28a6714..0788b04 100644 --- a/src/Semi.Avalonia/Schemes/LightScheme.axaml +++ b/src/Semi.Avalonia/Schemes/LightScheme.axaml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml index a337c82..74d6e92 100644 --- a/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml +++ b/src/Semi.Avalonia/Schemes/NightSkyScheme.axaml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml index cbf8643..3b63207 100644 --- a/src/Semi.Avalonia/SemiTheme.axaml +++ b/src/Semi.Avalonia/SemiTheme.axaml @@ -5,22 +5,22 @@ - - - - - - + + + + + + - - - - - + + + + + - + \ No newline at end of file diff --git a/src/Semi.Avalonia/Styles/_index.axaml b/src/Semi.Avalonia/Styles/_index.axaml index 5afce03..bcc6bca 100644 --- a/src/Semi.Avalonia/Styles/_index.axaml +++ b/src/Semi.Avalonia/Styles/_index.axaml @@ -1,4 +1,4 @@  - - + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Dark/_index.axaml b/src/Semi.Avalonia/Themes/Dark/_index.axaml index b2620b9..3290cda 100644 --- a/src/Semi.Avalonia/Themes/Dark/_index.axaml +++ b/src/Semi.Avalonia/Themes/Dark/_index.axaml @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/HighContrast/_index.axaml b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml index 0a4ac27..3290cda 100644 --- a/src/Semi.Avalonia/Themes/HighContrast/_index.axaml +++ b/src/Semi.Avalonia/Themes/HighContrast/_index.axaml @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Light/_index.axaml b/src/Semi.Avalonia/Themes/Light/_index.axaml index 6ce2972..3290cda 100644 --- a/src/Semi.Avalonia/Themes/Light/_index.axaml +++ b/src/Semi.Avalonia/Themes/Light/_index.axaml @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Themes/Shared/_index.axaml b/src/Semi.Avalonia/Themes/Shared/_index.axaml index 3ff987e..3290cda 100644 --- a/src/Semi.Avalonia/Themes/Shared/_index.axaml +++ b/src/Semi.Avalonia/Themes/Shared/_index.axaml @@ -1,47 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml index 00f103c..11ab37e 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Dark.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Dark.axaml @@ -1,4 +1,7 @@ - + White Black diff --git a/src/Semi.Avalonia/Tokens/Palette/Light.axaml b/src/Semi.Avalonia/Tokens/Palette/Light.axaml index e560278..7b4b843 100644 --- a/src/Semi.Avalonia/Tokens/Palette/Light.axaml +++ b/src/Semi.Avalonia/Tokens/Palette/Light.axaml @@ -1,4 +1,7 @@ - + White Black From 4e897596ac07fc2bb2bf63a3cf235c6ceeb3d093 Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 29 May 2025 17:48:30 +0800 Subject: [PATCH 3/4] misc: simplify actions. --- .github/workflows/deploy.yml | 3 -- .github/workflows/pack-nightly.yml | 12 +++--- .github/workflows/pack.yml | 12 +++--- .github/workflows/publish.yml | 62 ++++++++++++++++++------------ .github/workflows/release-tag.yml | 36 ++++++++--------- 5 files changed, 68 insertions(+), 57 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4271d73..e6b2376 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,9 +24,6 @@ jobs: - name: Publish .NET Project run: dotnet publish $PROJECT_PATH -c Release --nologo - - name: Change base-tag in index.html - run: sed -i 's###g' $OUTPUT_PATH/index.html - - name: copy index.html to 404.html run: cp $OUTPUT_PATH/index.html $OUTPUT_PATH/404.html diff --git a/.github/workflows/pack-nightly.yml b/.github/workflows/pack-nightly.yml index 2d07356..089cd2b 100644 --- a/.github/workflows/pack-nightly.yml +++ b/.github/workflows/pack-nightly.yml @@ -45,29 +45,29 @@ jobs: - name: Pack Semi.Avalonia if: ${{ github.event.inputs.Semi_Avalonia == 'true' }} - run: dotnet pack ./src/Semi.Avalonia -o ./nugets /p:Version=${{ env.VERSION }} + run: dotnet pack src/Semi.Avalonia -o nugets /p:Version=${{ env.VERSION }} - name: Pack Semi.Avalonia.ColorPicker if: ${{ github.event.inputs.Semi_Avalonia_ColorPicker == 'true' }} - run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets /p:Version=${{ env.VERSION }} + run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets /p:Version=${{ env.VERSION }} - name: Pack Semi.Avalonia.DataGrid if: ${{ github.event.inputs.Semi_Avalonia_DataGrid == 'true' }} - run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets /p:Version=${{ env.VERSION }} + run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets /p:Version=${{ env.VERSION }} - name: Pack Semi.Avalonia.TreeDataGrid if: ${{ github.event.inputs.Semi_Avalonia_TreeDataGrid == 'true' }} - run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets /p:Version=${{ env.VERSION }} + run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets /p:Version=${{ env.VERSION }} - name: Add NuGet Source run: dotnet nuget add source ${{ secrets.IRIHI_NUGET_NIGHTLY_FEED }} -n irihi.tech -u ${{ secrets.IRIHI_NUGET_USERNAME }} -p ${{ secrets.IRIHI_NUGET_PASSWORD }} --store-password-in-clear-text - name: Publish Nightly Package - run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate + run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.IRIHI_NUGET_API_KEY }} --source irihi.tech --skip-duplicate - name: Upload a Build Artifact uses: actions/upload-artifact@v4.3.1 with: name: nugets - path: ./nugets + path: nugets if: always() \ No newline at end of file diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index d7fe43a..0731a46 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -34,26 +34,26 @@ jobs: - name: Pack Semi.Avalonia if: ${{ github.event.inputs.Semi_Avalonia == 'true' }} - run: dotnet pack ./src/Semi.Avalonia -o ./nugets + run: dotnet pack src/Semi.Avalonia -o nugets - name: Pack Semi.Avalonia.ColorPicker if: ${{ github.event.inputs.Semi_Avalonia_ColorPicker == 'true' }} - run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets + run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets - name: Pack Semi.Avalonia.DataGrid if: ${{ github.event.inputs.Semi_Avalonia_DataGrid == 'true' }} - run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets + run: dotnet pack src/Semi.Avalonia.DataGrid -o nugets - name: Pack Semi.Avalonia.TreeDataGrid if: ${{ github.event.inputs.Semi_Avalonia_TreeDataGrid == 'true' }} - run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets + run: dotnet pack src/Semi.Avalonia.TreeDataGrid -o nugets - name: Publish NuGet package - run: dotnet nuget push "./nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate + run: dotnet nuget push "nugets/*.nupkg" --api-key ${{ secrets.NUGET_ORG_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate - name: Upload a Build Artifact uses: actions/upload-artifact@v4.3.1 with: name: nugets - path: ./nugets + path: nugets if: always() \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fc634e3..08c4120 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,13 +13,23 @@ on: - 'linux' - 'android' - 'all' - include_aot: - description: 'Include Windows AOT packaging' + win64: + description: 'Windows x64' required: true default: true type: boolean - include_drm: - description: 'Include Linux DRM packaging' + win64_aot: + description: 'Windows x64 AOT' + required: true + default: true + type: boolean + linux64: + description: 'Linux x64 AOT' + required: true + default: true + type: boolean + linux64_drm: + description: 'Linux x64 DRM' required: true default: true type: boolean @@ -36,34 +46,36 @@ jobs: run: mkdir upload - name: Publish win-x64 - run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64 + if: ${{ github.event.inputs.win64 == 'true' }} + run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Zip win-x64 + if: ${{ github.event.inputs.win64 == 'true' }} run: | - $files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb - Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip + $files = Get-ChildItem -Path publish/win64/* -Recurse -Exclude *.pdb + Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.zip - name: Enable Native AOT in .csproj - if: ${{ github.event.inputs.include_aot == 'true' }} + if: ${{ github.event.inputs.win64_aot == 'true' }} run: | sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish win-x64 AOT - if: ${{ github.event.inputs.include_aot == 'true' }} - run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot + if: ${{ github.event.inputs.win64_aot == 'true' }} + run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64-aot - name: Zip win-x64 AOT - if: ${{ github.event.inputs.include_aot == 'true' }} + if: ${{ github.event.inputs.win64_aot == 'true' }} run: | - $files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb - Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip + $files = Get-ChildItem -Path publish/win64-aot/* -Recurse -Exclude *.pdb + Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip - name: Upload a Build Artifact uses: actions/upload-artifact@v4.3.1 with: name: windows - path: ./upload + path: upload linux: if: ${{ github.event.inputs.platform == 'linux' || github.event.inputs.platform == 'all' }} @@ -76,24 +88,26 @@ jobs: run: mkdir upload - name: Publish linux-x64 - run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64 + if: ${{ github.event.inputs.linux64 == 'true' }} + run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish/linux64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Zip linux-x64 - run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb" + if: ${{ github.event.inputs.linux64 == 'true' }} + run: zip -j -r upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip publish/linux64 -x "*.pdb" - name: Publish linux-x64 DRM - if: ${{ github.event.inputs.include_drm == 'true' }} - run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm + if: ${{ github.event.inputs.linux64_drm == 'true' }} + run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish/drm --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Zip linux-x64 DRM - if: ${{ github.event.inputs.include_drm == 'true' }} - run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb" + if: ${{ github.event.inputs.linux64_drm == 'true' }} + run: zip -j -r upload/Semi.Avalonia.Demo.Drm.linux-x64.zip publish/drm -x "*.pdb" - name: Upload a Build Artifact uses: actions/upload-artifact@v4.3.1 with: name: linux - path: ./upload + path: upload android: if: ${{ github.event.inputs.platform == 'android' || github.event.inputs.platform == 'all' }} @@ -103,16 +117,16 @@ jobs: uses: actions/checkout@v4.1.1 - name: CD Android - run: cd ./demo/Semi.Avalonia.Demo.Android + run: cd demo/Semi.Avalonia.Demo.Android - name: Restore Dependencies run: dotnet restore - name: Publish Android - run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish -p:RuntimeIdentifier=android-arm64 + run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64 - name: Upload a Build Artifact uses: actions/upload-artifact@v4.3.1 with: name: android - path: ./publish/*Signed.apk + path: publish/*Signed.apk diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index be462f7..b208355 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -15,16 +15,16 @@ jobs: uses: actions/checkout@v4 - name: Pack Semi.Avalonia - run: dotnet pack ./src/Semi.Avalonia -o ./nugets + run: dotnet pack src/Semi.Avalonia -o nugets - name: Pack Semi.Avalonia.ColorPicker - run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets + run: dotnet pack src/Semi.Avalonia.ColorPicker -o nugets - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: nugets - path: ./nugets + path: nugets publish-windows: runs-on: windows-latest @@ -36,12 +36,12 @@ jobs: run: mkdir upload - name: Publish win-x64 - run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/win64 + run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Zip win-x64 run: | - $files = Get-ChildItem -Path ./publish/win64/* -Recurse -Exclude *.pdb - Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.zip + $files = Get-ChildItem -Path publish/win64/* -Recurse -Exclude *.pdb + Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.zip - name: Enable Native AOT in .csproj run: | @@ -49,18 +49,18 @@ jobs: sed -i 's##true#' demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj - name: Publish win-x64 AOT - run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o ./publish/win64-aot + run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release -o publish/win64-aot - name: Zip win-x64 AOT run: | - $files = Get-ChildItem -Path ./publish/win64-aot/* -Recurse -Exclude *.pdb - Compress-Archive -Path $files.FullName -DestinationPath ./upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip + $files = Get-ChildItem -Path publish/win64-aot/* -Recurse -Exclude *.pdb + Compress-Archive -Path $files.FullName -DestinationPath upload/Semi.Avalonia.Demo.Desktop.win-x64.NativeAOT.zip - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: windows - path: ./upload + path: upload publish-linux: runs-on: ubuntu-latest @@ -72,22 +72,22 @@ jobs: run: mkdir upload - name: Publish linux-x64 - run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/linux64 + run: dotnet publish demo/Semi.Avalonia.Demo.Desktop -r linux-x64 -c Release -o publish/linux64 --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Zip linux-x64 - run: zip -j -r ./upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip ./publish/linux64 -x "*.pdb" + run: zip -j -r upload/Semi.Avalonia.Demo.Desktop.linux-x64.zip publish/linux64 -x "*.pdb" - name: Publish linux-x64 DRM - run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true -o ./publish/drm + run: dotnet publish demo/Semi.Avalonia.Demo.Drm -r linux-x64 -c Release -o publish/drm --sc /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true - name: Zip linux-x64 DRM - run: zip -j -r ./upload/Semi.Avalonia.Demo.Drm.linux-x64.zip ./publish/drm -x "*.pdb" + run: zip -j -r upload/Semi.Avalonia.Demo.Drm.linux-x64.zip publish/drm -x "*.pdb" - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: linux - path: ./upload + path: upload publish-android: runs-on: windows-latest @@ -96,19 +96,19 @@ jobs: uses: actions/checkout@v4 - name: CD Android - run: cd ./demo/Semi.Avalonia.Demo.Android + run: cd demo/Semi.Avalonia.Demo.Android - name: Restore Dependencies run: dotnet restore - name: Publish Android - run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o ./publish -p:RuntimeIdentifier=android-arm64 + run: dotnet publish demo/Semi.Avalonia.Demo.Android -c Release -f net8.0-android --no-restore -o publish -p:RuntimeIdentifier=android-arm64 - name: Upload a Build Artifact uses: actions/upload-artifact@v4 with: name: android - path: ./publish/*Signed.apk + path: publish/*Signed.apk draft-release: needs: [ pack, publish-windows, publish-linux, publish-android ] From 9b70613b6a2a70c6ebca960cfd1911d347d5bddf Mon Sep 17 00:00:00 2001 From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com> Date: Thu, 29 May 2025 17:49:40 +0800 Subject: [PATCH 4/4] misc: correct copyright name in LICENSE file. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 7595a1a..91a5382 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 iriHi Technology +Copyright (c) 2022 IRIHI Technology Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal