Merge branch 'master' into develop

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           dotnet-version: '8.0.x'
           include-prerelease: true
-      
+
       - name: Build
         shell: pwsh
         run: |

.gitignore

@@ -7,7 +7,9 @@ packages/
 build/*
 !build/build.cake
 !build/build*.nuspec
+!build/build.Lang.template
 !build/create_lang_nuspec_file.py
+!build/create_nupkg_file.ps1
 !build/build.ps1
 !build/LICENSE
 !build/icon.png

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2023 HandyOrg
+Copyright (c) 2018-2024 HandyOrg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README-cn.md

@@ -25,7 +25,7 @@
         <img alt="myget-version" src="https://img.shields.io/myget/handycontrol/v/handycontrol?color=orange&label=myget"></img>
     </a>
     <a href="https://github.com/HandyOrg/HandyControl/actions?query=workflow%3Abuild">
-        <img alt="Github-build-status" src="https://github.com/HandyOrg/HandyControl/workflows/build/badge.svg"></img>
+        <img alt="Github-build-status" src="https://github.com/HandyOrg/HandyControl/actions/workflows/build.yml/badge.svg"></img>
     </a>
     <a href="https://www.nuget.org/packages/HandyControl">
         <img alt="Nuget" src="https://img.shields.io/nuget/dt/handycontrol"></img>
@@ -92,6 +92,11 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina)  组
 <a href="https://github.com/imba-tjd" target="_blank"><img style="border-radius:50%!important" width="64px" alt="imba-tjd" src="https://avatars.githubusercontent.com/u/24759802?s=64&v=4"></a>
 <a href="https://github.com/jhm-ciberman" target="_blank"><img style="border-radius:50%!important" width="64px" alt="jhm-ciberman" src="https://avatars.githubusercontent.com/u/7988351?s=64&v=4"></a>
 <a href="https://github.com/musashi-miyamoto" target="_blank"><img style="border-radius:50%!important" width="64px" alt="musashi-miyamoto" src="https://avatars.githubusercontent.com/u/44890163?s=64&v=4"></a>
+<a href="https://github.com/kingsznhone" target="_blank"><img style="border-radius:50%!important" width="64px" alt="kingsznhone" src="https://avatars.githubusercontent.com/u/35349300?s=64&v=4"></a>
+<a href="https://github.com/asine" target="_blank"><img style="border-radius:50%!important" width="64px" alt="asine" src="https://avatars.githubusercontent.com/u/3248918?s=64&v=4"></a>
+<a href="https://github.com/zsh2401" target="_blank"><img style="border-radius:50%!important" width="64px" alt="zsh2401" src="https://avatars.githubusercontent.com/u/16505828?s=64&v=4"></a>
+<a href="https://github.com/fpprojecta" target="_blank"><img style="border-radius:50%!important" width="64px" alt="fpprojecta" src="https://avatars.githubusercontent.com/u/145004301?s=64&v=4"></a>
+<a href="https://github.com/keytrap-x86" target="_blank"><img style="border-radius:50%!important" width="64px" alt="keytrap-x86" src="https://avatars.githubusercontent.com/u/17864005?s=64&v=4"></a>
 
 ## 赞助者
 

README.md

@@ -66,6 +66,11 @@ This project is based on [HandyControl](https://github.com/handyOrg/HandyControl
 <a href="https://github.com/imba-tjd" target="_blank"><img style="border-radius:50%!important" width="64px" alt="imba-tjd" src="https://avatars.githubusercontent.com/u/24759802?s=64&v=4"></a>
 <a href="https://github.com/jhm-ciberman" target="_blank"><img style="border-radius:50%!important" width="64px" alt="jhm-ciberman" src="https://avatars.githubusercontent.com/u/7988351?s=64&v=4"></a>
 <a href="https://github.com/musashi-miyamoto" target="_blank"><img style="border-radius:50%!important" width="64px" alt="musashi-miyamoto" src="https://avatars.githubusercontent.com/u/44890163?s=64&v=4"></a>
+<a href="https://github.com/kingsznhone" target="_blank"><img style="border-radius:50%!important" width="64px" alt="kingsznhone" src="https://avatars.githubusercontent.com/u/35349300?s=64&v=4"></a>
+<a href="https://github.com/asine" target="_blank"><img style="border-radius:50%!important" width="64px" alt="asine" src="https://avatars.githubusercontent.com/u/3248918?s=64&v=4"></a>
+<a href="https://github.com/zsh2401" target="_blank"><img style="border-radius:50%!important" width="64px" alt="zsh2401" src="https://avatars.githubusercontent.com/u/16505828?s=64&v=4"></a>
+<a href="https://github.com/fpprojecta" target="_blank"><img style="border-radius:50%!important" width="64px" alt="fpprojecta" src="https://avatars.githubusercontent.com/u/145004301?s=64&v=4"></a>
+<a href="https://github.com/keytrap-x86" target="_blank"><img style="border-radius:50%!important" width="64px" alt="keytrap-x86" src="https://avatars.githubusercontent.com/u/17864005?s=64&v=4"></a>
 
 ## Backers
 

build/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2023 HandyOrg
+Copyright (c) 2018-2024 HandyOrg
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build/build-for-myget.nuspec

@@ -10,7 +10,7 @@
     <licenseUrl>https://raw.githubusercontent.com/ghost1372/HandyControls/develop/LICENSE</licenseUrl>
     <projectUrl>https://github.com/ghost1372/HandyControls</projectUrl>
     <description>Contains some simple and commonly used WPF controls based on HandyControl</description>
-    <copyright>Copyright 2018-2023</copyright>
+    <copyright>Copyright 2018-2024</copyright>
     <tags>wpf wpf-ui style styles theme xaml control csharp relativepanel flipclock skin datagrid menu persian calendar gif togglebutton datagrid wpf-controls component cardview navigation dark-theme color-picker notification</tags>
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
@@ -30,6 +30,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -231,6 +232,20 @@
     <file src="lib\net7.0\HandyControl.dll" target="lib\net7.0\HandyControl.dll" />
     <file src="lib\net7.0\HandyControl.pdb" target="lib\net7.0\HandyControl.pdb" />
     <file src="lib\net7.0\HandyControl.xml" target="lib\net7.0\HandyControl.xml" />
+    <file src="lib\net8.0\ca-ES\HandyControl.resources.dll" target="lib\net8.0\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net8.0\en\HandyControl.resources.dll" target="lib\net8.0\en\HandyControl.resources.dll" />
+    <file src="lib\net8.0\fa\HandyControl.resources.dll" target="lib\net8.0\fa\HandyControl.resources.dll" />
+    <file src="lib\net8.0\fr\HandyControl.resources.dll" target="lib\net8.0\fr\HandyControl.resources.dll" />
+    <file src="lib\net8.0\ja\HandyControl.resources.dll" target="lib\net8.0\ja\HandyControl.resources.dll" />
+    <file src="lib\net8.0\ko-KR\HandyControl.resources.dll" target="lib\net8.0\ko-KR\HandyControl.resources.dll" />
+    <file src="lib\net8.0\pl\HandyControl.resources.dll" target="lib\net8.0\pl\HandyControl.resources.dll" />
+    <file src="lib\net8.0\pt-BR\HandyControl.resources.dll" target="lib\net8.0\pt-BR\HandyControl.resources.dll" />
+    <file src="lib\net8.0\ru\HandyControl.resources.dll" target="lib\net8.0\ru\HandyControl.resources.dll" />
+    <file src="lib\net8.0\tr\HandyControl.resources.dll" target="lib\net8.0\tr\HandyControl.resources.dll" />
+    <file src="lib\net8.0\HandyControl.deps.json" target="lib\net8.0\HandyControl.deps.json" />
+    <file src="lib\net8.0\HandyControl.dll" target="lib\net8.0\HandyControl.dll" />
+    <file src="lib\net8.0\HandyControl.pdb" target="lib\net8.0\HandyControl.pdb" />
+    <file src="lib\net8.0\HandyControl.xml" target="lib\net8.0\HandyControl.xml" />
     <file src="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\en\HandyControl.resources.dll" target="lib\netcoreapp3.0\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fa\HandyControl.resources.dll" target="lib\netcoreapp3.0\fa\HandyControl.resources.dll" />

build/build.Lang.ca-ES.nuspec

@@ -12,9 +12,9 @@
     <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2023</copyright>
+    <copyright>Copyright © HandyOrg 2018-2024</copyright>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="e118ac98ccd1db28f25f66ba2da5c2e029a622a4" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="4146ee523eada5aa514b270c46c0f197211522a8" />
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
@@ -33,6 +33,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -51,6 +52,7 @@
     <file src="lib\net5.0\ca-ES\HandyControl.resources.dll" target="lib\net5.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net6.0\ca-ES\HandyControl.resources.dll" target="lib\net6.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\net7.0\ca-ES\HandyControl.resources.dll" target="lib\net7.0\ca-ES\HandyControl.resources.dll" />
+    <file src="lib\net8.0\ca-ES\HandyControl.resources.dll" target="lib\net8.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.0\ca-ES\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\ca-ES\HandyControl.resources.dll" target="lib\netcoreapp3.1\ca-ES\HandyControl.resources.dll" />
     <file src="icon.png" target="icon.png" />

build/build.Lang.cs.nuspec

@@ -12,9 +12,9 @@
     <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2023</copyright>
+    <copyright>Copyright © HandyOrg 2018-2024</copyright>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="e118ac98ccd1db28f25f66ba2da5c2e029a622a4" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="4146ee523eada5aa514b270c46c0f197211522a8" />
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
@@ -33,6 +33,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -51,6 +52,7 @@
     <file src="lib\net5.0\cs\HandyControl.resources.dll" target="lib\net5.0\cs\HandyControl.resources.dll" />
     <file src="lib\net6.0\cs\HandyControl.resources.dll" target="lib\net6.0\cs\HandyControl.resources.dll" />
     <file src="lib\net7.0\cs\HandyControl.resources.dll" target="lib\net7.0\cs\HandyControl.resources.dll" />
+    <file src="lib\net8.0\cs\HandyControl.resources.dll" target="lib\net8.0\cs\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\cs\HandyControl.resources.dll" target="lib\netcoreapp3.0\cs\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\cs\HandyControl.resources.dll" target="lib\netcoreapp3.1\cs\HandyControl.resources.dll" />
     <file src="icon.png" target="icon.png" />

build/build.Lang.en.nuspec

@@ -12,9 +12,9 @@
     <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2023</copyright>
+    <copyright>Copyright © HandyOrg 2018-2024</copyright>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="e118ac98ccd1db28f25f66ba2da5c2e029a622a4" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="4146ee523eada5aa514b270c46c0f197211522a8" />
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
@@ -33,6 +33,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -51,6 +52,7 @@
     <file src="lib\net5.0\en\HandyControl.resources.dll" target="lib\net5.0\en\HandyControl.resources.dll" />
     <file src="lib\net6.0\en\HandyControl.resources.dll" target="lib\net6.0\en\HandyControl.resources.dll" />
     <file src="lib\net7.0\en\HandyControl.resources.dll" target="lib\net7.0\en\HandyControl.resources.dll" />
+    <file src="lib\net8.0\en\HandyControl.resources.dll" target="lib\net8.0\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\en\HandyControl.resources.dll" target="lib\netcoreapp3.0\en\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\en\HandyControl.resources.dll" target="lib\netcoreapp3.1\en\HandyControl.resources.dll" />
     <file src="icon.png" target="icon.png" />

build/build.Lang.es.nuspec

@@ -12,9 +12,9 @@
     <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2023</copyright>
+    <copyright>Copyright © HandyOrg 2018-2024</copyright>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="e118ac98ccd1db28f25f66ba2da5c2e029a622a4" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="4146ee523eada5aa514b270c46c0f197211522a8" />
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
@@ -33,6 +33,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -51,6 +52,7 @@
     <file src="lib\net5.0\es\HandyControl.resources.dll" target="lib\net5.0\es\HandyControl.resources.dll" />
     <file src="lib\net6.0\es\HandyControl.resources.dll" target="lib\net6.0\es\HandyControl.resources.dll" />
     <file src="lib\net7.0\es\HandyControl.resources.dll" target="lib\net7.0\es\HandyControl.resources.dll" />
+    <file src="lib\net8.0\es\HandyControl.resources.dll" target="lib\net8.0\es\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\es\HandyControl.resources.dll" target="lib\netcoreapp3.0\es\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\es\HandyControl.resources.dll" target="lib\netcoreapp3.1\es\HandyControl.resources.dll" />
     <file src="icon.png" target="icon.png" />

build/build.Lang.fa.nuspec

@@ -12,9 +12,9 @@
     <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2023</copyright>
+    <copyright>Copyright © HandyOrg 2018-2024</copyright>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="e118ac98ccd1db28f25f66ba2da5c2e029a622a4" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="4146ee523eada5aa514b270c46c0f197211522a8" />
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
@@ -33,6 +33,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -51,6 +52,7 @@
     <file src="lib\net5.0\fa\HandyControl.resources.dll" target="lib\net5.0\fa\HandyControl.resources.dll" />
     <file src="lib\net6.0\fa\HandyControl.resources.dll" target="lib\net6.0\fa\HandyControl.resources.dll" />
     <file src="lib\net7.0\fa\HandyControl.resources.dll" target="lib\net7.0\fa\HandyControl.resources.dll" />
+    <file src="lib\net8.0\fa\HandyControl.resources.dll" target="lib\net8.0\fa\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fa\HandyControl.resources.dll" target="lib\netcoreapp3.0\fa\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\fa\HandyControl.resources.dll" target="lib\netcoreapp3.1\fa\HandyControl.resources.dll" />
     <file src="icon.png" target="icon.png" />

build/build.Lang.fr.nuspec

@@ -12,9 +12,9 @@
     <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
     <description>Contains some simple and commonly used WPF controls</description>
     <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
-    <copyright>Copyright © HandyOrg 2018-2023</copyright>
+    <copyright>Copyright © HandyOrg 2018-2024</copyright>
     <tags>WPF C# Control</tags>
-    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="e118ac98ccd1db28f25f66ba2da5c2e029a622a4" />
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="4146ee523eada5aa514b270c46c0f197211522a8" />
     <dependencies>
       <group targetFramework=".NETFramework4.0" />
       <group targetFramework=".NETFramework4.5" />
@@ -33,6 +33,7 @@
       <group targetFramework="net5.0" />
       <group targetFramework="net6.0" />
       <group targetFramework="net7.0" />
+      <group targetFramework="net8.0" />
     </dependencies>
   </metadata>
   <files>
@@ -51,6 +52,7 @@
     <file src="lib\net5.0\fr\HandyControl.resources.dll" target="lib\net5.0\fr\HandyControl.resources.dll" />
     <file src="lib\net6.0\fr\HandyControl.resources.dll" target="lib\net6.0\fr\HandyControl.resources.dll" />
     <file src="lib\net7.0\fr\HandyControl.resources.dll" target="lib\net7.0\fr\HandyControl.resources.dll" />
+    <file src="lib\net8.0\fr\HandyControl.resources.dll" target="lib\net8.0\fr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.0\fr\HandyControl.resources.dll" target="lib\netcoreapp3.0\fr\HandyControl.resources.dll" />
     <file src="lib\netcoreapp3.1\fr\HandyControl.resources.dll" target="lib\netcoreapp3.1\fr\HandyControl.resources.dll" />
     <file src="icon.png" target="icon.png" />