misc: upgrade to 11.0.1.

irihitech · Aug 30, 2023 · b8df9c2 · b8df9c2
1 parent 255e21d
commit b8df9c2
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 35 deletions.
diff --git 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
@@ -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
 <Application.Styles>
-    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
     <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
 </Application.Styles>
 ```
 
@@ -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
@@ -352,6 +352,21 @@
                             </Border>
                         </StackPanel>
                     </TabItem>
+                    <TabItem Header="ColorPicker">
+                        <StackPanel>
+                            <TextBlock Text="Install via nuget: " />
+                            <Border Margin="0,16" Classes="CodeBlock">
+                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].ColorPickerInstall}" />
+                            </Border>
+                            <TextBlock Text="Reference styles: " />
+                            <Border Margin="0,16" Classes="CodeBlock">
+                                <SelectableTextBlock
+                                    FontFamily="Consolas"
+                                    Text="{Binding $parent[local:Overview].ColorPickerStyle}"
+                                    TextWrapping="Wrap" />
+                            </Border>
+                        </StackPanel>
+                    </TabItem>
                     <TabItem Header="DataGrid">
                         <StackPanel>
                             <TextBlock Text="Install via nuget: " />
@@ -367,17 +382,17 @@
                             </Border>
                         </StackPanel>
                     </TabItem>
-                    <TabItem Header="ColorPicker">
+                    <TabItem Header="TreeDataGrid">
                         <StackPanel>
                             <TextBlock Text="Install via nuget: " />
                             <Border Margin="0,16" Classes="CodeBlock">
-                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].ColorPickerInstall}" />
+                                <SelectableTextBlock FontFamily="Consolas" Text="{Binding $parent[local:Overview].TreeDataGridInstall}" />
                             </Border>
                             <TextBlock Text="Reference styles: " />
                             <Border Margin="0,16" Classes="CodeBlock">
                                 <SelectableTextBlock
                                     FontFamily="Consolas"
-                                    Text="{Binding $parent[local:Overview].ColorPickerStyle}"
+                                    Text="{Binding $parent[local:Overview].TreeDataGridStyle}"
                                     TextWrapping="Wrap" />
                             </Border>
                         </StackPanel>

diff --git 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; } = """
 <Application.Styles>
     <StyleInclude Source="avares://Semi.Avalonia/Themes/Index.axaml" />
 </Application.Styles>
 """;
-
-    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; } = """
+<Application.Styles>
+    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+</Application.Styles>
+""";
+
+    public string DataGridInstall { get; set; } = "dotnet add package Semi.Avalonia.DataGrid --version 11.0.1";
 
     public string DataGridStyle { get; set; } = """
 <Application.Styles>
     <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
 </Application.Styles>
 """;
-
-    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; } = """
 <Application.Styles>
-    <StyleInclude Source="avares://Semi.Avalonia.ColorPicker/Index.axaml" />
+    <StyleInclude Source="avares://Semi.Avalonia.TreeDataGrid/Index.axaml" />
 </Application.Styles>
 """;
 }
diff --git 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
diff --git a/docs/Light.png b/docs/Light.png
diff --git a/docs/cover.png b/docs/cover.png
diff --git a/src/Package.props b/src/Package.props
@@ -2,10 +2,10 @@
     <PropertyGroup>
         <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
         <Nullable>enable</Nullable>
-        <LangVersion>10</LangVersion>
-        <Version>11.0.0</Version>
+        <LangVersion>11</LangVersion>
+        <Version>11.0.1</Version>
         <Authors>IRIHI Technology</Authors>
-        <Description>Avalonia Theme inspired by Semi Design. </Description>
+        <Description>Avalonia Theme inspired by Semi Design.</Description>
         <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
         <AvaloniaVersion>11.0.0</AvaloniaVersion>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj b/src/Semi.Avalonia.ColorPicker/Semi.Avalonia.ColorPicker.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Import Project="../Package.props" />
+    <Import Project="../Package.props"/>
 
     <PropertyGroup>
         <Title>Semi.Avalonia.ColorPicker</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.0.0-rc1</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.1</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-      <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj b/src/Semi.Avalonia.DataGrid/Semi.Avalonia.DataGrid.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Import Project="../Package.props" />
-    
+    <Import Project="../Package.props"/>
+
     <PropertyGroup>
         <Title>Semi.Avalonia.DataGrid</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.0.0-rc1</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.1</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj b/src/Semi.Avalonia.TreeDataGrid/Semi.Avalonia.TreeDataGrid.csproj
@@ -2,11 +2,18 @@
 
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
-        <LangVersion>10</LangVersion>
+        <Nullable>enable</Nullable>
+        <LangVersion>11</LangVersion>
+        <Version>11.0.1</Version>
+        <Authors>IRIHI Technology</Authors>
+        <Description>Avalonia Theme inspired by Semi Design.</Description>
+        <PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
+        <AvaloniaVersion>11.0.0</AvaloniaVersion>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.0" />
+        <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/Semi.Avalonia/Semi.Avalonia.csproj b/src/Semi.Avalonia/Semi.Avalonia.csproj
@@ -4,7 +4,7 @@
 
     <PropertyGroup>
         <Title>Semi.Avalonia</Title>
-        <PackageReleaseNotes>Update to Avalonia 11.0.0-rc1</PackageReleaseNotes>
+        <PackageReleaseNotes>Update to 11.0.1</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>