diff --git a/.github/workflows/Pack.yml b/.github/workflows/Pack.yml index a8f0669a..24850ca8 100644 --- a/.github/workflows/Pack.yml +++ b/.github/workflows/Pack.yml @@ -16,11 +16,14 @@ jobs: - name: Nuget Semi.Avalonia run: dotnet pack ./src/Semi.Avalonia -o ./nugets + - name: Nuget Semi.Avalonia.ColorPicker + run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets + - name: Nuget Semi.Avalonia.DataGrid run: dotnet pack ./src/Semi.Avalonia.DataGrid -o ./nugets - - name: Nuget Semi.Avalonia.ColorPicker - run: dotnet pack ./src/Semi.Avalonia.ColorPicker -o ./nugets + - name: Nuget Semi.Avalonia.TreeDataGrid + run: dotnet pack ./src/Semi.Avalonia.TreeDataGrid -o ./nugets - name: Desktop run: dotnet publish ./demo/Semi.Avalonia.Demo.Desktop -r win-x64 -c Release /p:PublishSingleFile=true /p:IncludeNativeLibrariesForSelfExtract=true --self-contained true diff --git a/README.md b/README.md index 1df01174..9c54f24f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Avalonia Theme inspired by Semi Design ## Installation ```bash -dotnet add package Semi.Avalonia --version 11.0.0 +dotnet add package Semi.Avalonia --version 11.0.1 ``` Include Semi Design Styles in application: @@ -21,15 +21,17 @@ Include Semi Design Styles in application: That's all. -DataGrid and ColorPicker are distributed in separated packages. Please install if you need. +ColorPicker, DataGrid and TreeDataGrid are distributed in separated packages. Please install if you need. ```bash -dotnet add package Semi.Avalonia.ColorPicker --version 11.0.0 -dotnet add package Semi.Avalonia.DataGrid --version 11.0.0 +dotnet add package Semi.Avalonia.ColorPicker --version 11.0.1 +dotnet add package Semi.Avalonia.DataGrid --version 11.0.1 +dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.1 ``` ```xaml - + + ``` @@ -42,7 +44,7 @@ https://github.com/irihitech/Semi.Avalonia/releases | Semi Design Version | Avalonia Version | |:--------------------|:-----------------| -| 11.0.0 | 11.0.0 | +| 11.0.x | 11.0.x | ## TODO * FocusAdorner diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml index cefbdf0f..05710e05 100644 --- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml +++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml @@ -352,6 +352,21 @@ + + + + + + + + + + + + @@ -367,17 +382,17 @@ - + - + diff --git a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs index 09fc3622..0f1db187 100644 --- a/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs +++ b/demo/Semi.Avalonia.Demo/Pages/Overview.axaml.cs @@ -13,27 +13,35 @@ public Overview() InitializeComponent(); } - public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.0"; + public string MainInstall { get; set; } = "dotnet add package Semi.Avalonia --version 11.0.1"; public string MainStyle { get; set; } = """ """; - - public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.0"; + + public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.1"; + + public string ColorPickerStyle { get; set; } = """ + + + +"""; + + public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.1"; public string DataGridStyle { get; set; } = """ """; - - public string ColorPickerInstall { get; set; } = "dotnet add package Semi.Avalonia.ColorPicker --version 11.0.0"; - public string ColorPickerStyle { get; set; } = """ + public string TreeDataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.TreeDataGrid --version 11.0.1"; + + public string TreeDataGridStyle { get; set; } = """ - + """; } \ No newline at end of file diff --git a/demo/global.json b/demo/global.json index d97078cf..5ee5bd14 100644 --- a/demo/global.json +++ b/demo/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.100" + "version": "7.0" } } diff --git a/docs/Dark.png b/docs/Dark.png index 84910800..9a17efa5 100644 Binary files a/docs/Dark.png and b/docs/Dark.png differ diff --git a/docs/Light.png b/docs/Light.png index c37f57e7..0fcbbd3d 100644 Binary files a/docs/Light.png and b/docs/Light.png differ diff --git a/docs/cover.png b/docs/cover.png deleted file mode 100644 index a740a3c7..00000000 Binary files a/docs/cover.png and /dev/null differ diff --git a/src/Package.props b/src/Package.props index 0dfb90cb..c3a98e08 100644 --- a/src/Package.props +++ b/src/Package.props @@ -2,10 +2,10 @@ net6.0;netstandard2.0 enable - 10 - 11.0.0 + 11 + 11.0.1 IRIHI Technology - Avalonia Theme inspired by Semi Design. + Avalonia Theme inspired by Semi Design. https://github.com/irihitech/Semi.Avalonia 11.0.0 MIT diff --git a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj index 1ce6a9e6..0dd35397 100644 --- a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj +++ b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj @@ -1,15 +1,15 @@ - + Semi.Avalonia.ColorPicker - Update to Avalonia 11.0.0-rc1 + Update to 11.0.1 - - + + diff --git a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj index e84e6b44..467fe7fe 100644 --- a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj +++ b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj @@ -1,15 +1,15 @@ - - + + Semi.Avalonia.DataGrid - Update to Avalonia 11.0.0-rc1 + Update to 11.0.1 - - + + - + diff --git a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj index 7cfd5ae6..9844f10f 100644 --- a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj +++ b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj @@ -2,11 +2,18 @@ net6.0 - 10 + enable + 11 + 11.0.1 + IRIHI Technology + Avalonia Theme inspired by Semi Design. + https://github.com/irihitech/Semi.Avalonia + 11.0.0 + MIT - + diff --git a/src/Semi.Avalonia/Semi.Avalonia.csproj b/src/Semi.Avalonia/Semi.Avalonia.csproj index 166c1f0a..b1d5f654 100644 --- a/src/Semi.Avalonia/Semi.Avalonia.csproj +++ b/src/Semi.Avalonia/Semi.Avalonia.csproj @@ -4,7 +4,7 @@ Semi.Avalonia - Update to Avalonia 11.0.0-rc1 + Update to 11.0.1