diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed17c3ff..4e48dc70 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,31 +16,15 @@ jobs: uses: nuget/setup-nuget@master - name: Restore Nuget packages - run: nuget restore src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj - - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@master + run: nuget restore src/HandyControl.sln - name: Setup .NET Core uses: actions/setup-dotnet@master + with: + dotnet-version: '5.0.100-preview.5.20279.10' - name: Build Net_40 - run: msbuild src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj -p:Configuration=Release + run: dotnet build src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj -p:Configuration=Release-Net40 - name: Build Net_45 - run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net45 - - - name: Build Net_462 - run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net462 - - - name: Build Net_47 - run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net47 - - - name: Build Net_48 - run: msbuild src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release-Net48 - - - name: Build Core_30 - run: dotnet build src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj --configuration Release-Core30 - - - name: Build Core_31 - run: dotnet build src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj --configuration Release-Core31 + run: dotnet build src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj -p:Configuration=Release diff --git a/.gitignore b/.gitignore index 73a9dc99..c6cf94ca 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,7 @@ packages/ build/* !build/build.cake !build/build.nuspec -!build/build.ps1 \ No newline at end of file +!build/build.ps1 +!build/tools/ +build/tools/* +!build/tools/packages.config \ No newline at end of file diff --git a/Installers/VS2019/HandyControl_VS2019/icon_100_100.png b/Installers/VS2019/HandyControl_VS2019/icon_100_100.png index df0bb782..f405be8c 100644 Binary files a/Installers/VS2019/HandyControl_VS2019/icon_100_100.png and b/Installers/VS2019/HandyControl_VS2019/icon_100_100.png differ diff --git a/Installers/VS2019/HandyControl_VS2019/icon_300_300.png b/Installers/VS2019/HandyControl_VS2019/icon_300_300.png index cb318d98..30099ff7 100644 Binary files a/Installers/VS2019/HandyControl_VS2019/icon_300_300.png and b/Installers/VS2019/HandyControl_VS2019/icon_300_300.png differ diff --git a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest index c25560c3..74e40f35 100644 --- a/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest +++ b/Installers/VS2019/HandyControl_VS2019/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + HandyControl for VS2019 This VSIX Project will help people initialize a HandyControl project. https://handyorg.github.io/handycontrol diff --git a/Installers/VS2019/WpfApp/ProjectTemplate.csproj b/Installers/VS2019/WpfApp/ProjectTemplate.csproj index cf36f37a..d6cec36e 100644 --- a/Installers/VS2019/WpfApp/ProjectTemplate.csproj +++ b/Installers/VS2019/WpfApp/ProjectTemplate.csproj @@ -34,8 +34,8 @@ 4 - - ..\packages\HandyControl.2.4.0\lib\net47\HandyControl.dll + + ..\packages\HandyControl.2.5.0.1\lib\net47\HandyControl.dll diff --git a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs index 59f278ed..e2fda6dc 100644 --- a/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/WpfApp/Properties/AssemblyInfo.cs @@ -10,5 +10,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.4.0")] -[assembly: AssemblyFileVersion("2.4.0")] +[assembly: AssemblyVersion("2.5.0")] +[assembly: AssemblyFileVersion("2.5.0")] diff --git a/Installers/VS2019/WpfApp/packages.config b/Installers/VS2019/WpfApp/packages.config index a1fd738f..9e25ff12 100644 --- a/Installers/VS2019/WpfApp/packages.config +++ b/Installers/VS2019/WpfApp/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj index 18af215f..9b17e7cd 100644 --- a/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj +++ b/Installers/VS2019/WpfCoreApp/ProjectTemplate.csproj @@ -19,6 +19,6 @@ TRACE;Core - + \ No newline at end of file diff --git a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs index c0e4b299..6ca08ca9 100644 --- a/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs +++ b/Installers/VS2019/WpfCoreApp/Properties/AssemblyInfo.cs @@ -10,5 +10,5 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] -[assembly: AssemblyVersion("2.4.0")] -[assembly: AssemblyFileVersion("2.4.0")] +[assembly: AssemblyVersion("2.5.0")] +[assembly: AssemblyFileVersion("2.5.0")] diff --git a/README-cn.md b/README-cn.md new file mode 100644 index 00000000..2ecfffdb --- /dev/null +++ b/README-cn.md @@ -0,0 +1,499 @@ +[中文](https://gitee.com/handyorg/HandyControl/blob/master/README-cn.md) - [English](https://github.com/HandyOrg/HandyControl/blob/master/README.md) + +![logo](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/icon.png) + +![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-8.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2019-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) ![Github-build-status](https://github.com/HandyOrg/HandyControl/workflows/build/badge.svg) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![wiki](https://img.shields.io/badge/wiki-Complete-brightgreen.svg)](https://github.com/ghost1372/HandyControl/wiki) [![Nuget](https://img.shields.io/nuget/dt/handycontrol)](https://www.nuget.org/packages/HandyControl) + +# Welcome to HandyControl + +## 面向中国 + +### 加入讨论 + +| | 西江月群 | 定风波群 | 广寒秋群 | +|-|:-:|:-:|:-:| +| 群号码 | [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) | [![qq-group](https://img.shields.io/badge/qq-858784803-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=5c18622a0f6ee07a6f33afa8cdb85b1f72ea50e878271dfcec919c76b55afee7) | 微信群 | +| 二维码 | ![qq-group](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/qq_group_1.png) | ![qq-group](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/qq_group_2.png) | ![wechat-group](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/wechat_group.png) | + +### 码云 + +[https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/) + +### 中文文档 + +[https://handyorg.github.io/handycontrol/](https://handyorg.github.io/handycontrol/) + +### 赞助 +如果您觉得HandyControl还不错，并且刚好有些闲钱，那么可以选择以下两种方式来赞助（记得入群联系我们呀~~）： + +* [以HandyControl的名义为慈善事业做贡献](http://www.chinacharityfederation.org/ConfirmDonation/0.html?zhijie=3) + +* 为我们购买防脱洗发水 +![qrcode](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/qrcode.png) + +## Contributors + +ghost1372 +DingpingZhang +M0n7y5 +guanguanchuangyu +yanchao891012 +noctwolf +xianyun666 +afunc233 +DinoChan +MrZhangYuan +JinhuaChen-OMEC +seedtyx +KleinPan +yxhq +AiHaibara +walterlv +Luoyingliang +lindexi +danwalmsley + +## Backers + + + + + + + + + + + + + + + + + + +## Special thanks to + +[![Visual Studio Community 2019](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/vs2019_logo.png)](https://visualstudio.microsoft.com/free-developer-offers/) +[![JetBrains](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/resharper_logo.png)](https://www.jetbrains.com/?from=HandyControl) +[![Cake](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/cake_logo.png)](https://cakebuild.net/) +[![AppVeyor](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/appveyor_logo.png)](https://www.appveyor.com/) +[![Gitter](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/gitter_logo.png)](https://gitter.im/) + +## Usage + +Step 1: Add a reference to HandyControl or search for HandyControl on the nuget; + +```Install-Package HandyControl``` + +Step 2: Add code in App.xaml as follows: +```XML + + + + + + + + +``` + +Step 3: Add NameSpace: +`xmlns:hc="https://handyorg.github.io/handycontrol"` + +Step 4: Enjoy coding + +## VSIX packages for Visual Studio + +| [VS2019](https://marketplace.visualstudio.com/items?itemName=HandyOrg.handycontrolforvs2019) | +| ------------- | + +## Stargazers over time + +[![Stargazers over time](https://starchart.cc/HandyOrg/HandyControl.svg)](https://starchart.cc/HandyOrg/HandyControl) + +## Overview + +![Overview](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Overview.png) + +![Overview-dark](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Overview-dark.png) + +## Latest examples + +### CheckComboBox + +![CheckComboBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CheckComboBox.png) + +### ImageSelector + +![ImageSelector](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageSelector.png) + +### PropertyGrid + +![PropertyGrid](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/PropertyGrid.png) + +### Screenshot + +![Screenshot](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Screenshot.png) + +### GooeyEffect + +![GooeyEffect](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GooeyEffect.gif) + +## History publication + +### GlowWindow + +![GlowWindow](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GlowWindow.png) + +### FlowDocumentScrollViewerStyle + +![FlowDocumentScrollViewerStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FlowDocumentScrollViewer.png) + +### PinBox + +![PinBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/PinBox.png) + +### Effects + +![Effects](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Effects.png) + +### RelativePanel + +![RelativePanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/RelativePanel.png) + +### Drawer + +![Drawer](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Drawer.gif) + +### Poptip + +![Poptip](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Poptip.gif) + +### Divider + +![Divider](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Divider.png) + +### GeometryAnimation + +![GeometryAnimation](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GeometryAnimation.gif) + +### SplitButton + +![SplitButton](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/SplitButton.png) + +### FloatingBlock + +![FloatingBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FloatingBlock.gif) + +### HoneycombPanel + +![HoneycombPanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/HoneycombPanel.png) + +### RunningBlock + +![RunningBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/RunningBlock.gif) + +### ImageBlock + +![ImageBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageBlock.gif) + +![ImageBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageBlock.png) + +### Magnifier + +![Magnifier](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Magnifier.png) + +### Card + +![Card](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Card.png) + +### ButtonGroup + +![ButtonGroup](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ButtonGroup.png) + +### Grid + +![Grid](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Grid.gif) + +### SideMenu + +![SideMenu](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/SideMenu.png) + +### NotifyIcon + +![NotifyIcon](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/NotifyIcon.png) + +### Dialog + +![Dialog](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Dialog.png) + +### WaveProgressBar + +![WaveProgressBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/WaveProgressBar.gif) + +### Badge + +![Badge](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Badge.png) + +### Gravatar + +![Gravatar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Gravatar.gif) + +### GoToTop + +![GoToTop](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GoToTop.gif) + +### ChatBubble + +![ChatBubble](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ChatBubble.png) + +### Label + +![Label](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Label.png) + +### Transfer + +![Transfer](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Transfer.png) + +### ProgressButton + +![ProgressButton](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ProgressButton.png) + +### CoverFlow + +![CoverFlow](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CoverFlow.gif) + +### CoverView + +![CoverView](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CoverView.gif) + +### MessageBox + +![MessageBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/MessageBox.png) + +### WaterfallPanel + +![WaterfallPanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/WaterfallPanel.png) + +### Rate + +![Rate](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Rate.png) + +### BlurWindow + +![BlurWindow](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/BlurWindow.png) + +### FlipClock + +![FlipClock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/FlipClock.gif) + +### Shield + +![Shield](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Shield.png) + +### OutlineText + +![OutlineText](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/OutlineText.png) + +### Tag + +![Tag](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Tag.png) + +### ToolBar + +![ToolBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ToolBar.png) + +### Slider + +![Slider](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Slider.png) + +### CircleProgressBar + +![CircleProgressBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CircleProgressBar.png) + +### ButtonStyle + +![ButtonStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Button.png) + +### ToggleButtonStyle + +![ToggleButtonStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ToggleButton.png) + +### RadioButtonStyle + +![RadioButtonStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/RadioButton.png) + +### CheckBoxStyle + +![CheckBoxStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CheckBox.png) + +### ListBoxStyle + +![ListBoxStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ListBox.png) + +### TreeViewStyle + +![TreeViewStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TreeView.png) + +### ListViewStyle + +![ListViewStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ListView.png) + +### DataGrid + +![DataGrid](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/DataGrid.png) + +### Now you can switch to dark theme + +![dark theme](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/DarkTheme.png) + +### ColorPicker + +![ColorPicker](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ColorPicker.gif) + +### Loading + +![Loading](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Loading.gif) + +### Carousel + +![Carousel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Carousel.gif) + +### Pagination + +![Pagination](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Pagination.gif) + +### Expander + +![Expander](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Expander.gif) + +### TimeBar + +![TimeBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TimeBar.gif) + +### ImageBrowser + +![ImageBrowser](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ImageBrowser.gif) + +### PreviewSlider + +![PreviewSlider](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/PreviewSlider.gif) + +### CompareSlider + +![CompareSlider](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CompareSlider-h.gif) + +![CompareSlider](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CompareSlider-v.gif) + +### Growl + +![Growl](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Growl.gif) + +### AnimationPath + +![AnimationPath](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/AnimationPath.gif) + +### ProgressBar + +![ProgressBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ProgressBar.gif) + +### TabControl + +![TabControl](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TabControl.gif) + +### TabControlStyle + +![TabControlStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TabControl.png) + +### GroupBox + +![GroupBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GroupBox.png) + +### StepBar + +![StepBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/StepBar.png) + +### GifImage + +![GifImage](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/GifImage.gif) + +### ContextMenu + +![ContextMenu](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ContextMenu.png) + +### Calendar + +![Calendar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Calendar.jpg) + +### Clock + +![Clock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Clock.jpg) + +### CalendarWithClock + +![CalendarWithClock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CalendarWithClock.png) + +### TextBlock + +![TextBlock](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TextBlock.jpg) + +### RichTextBoxStyle + +![RichTextBoxStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/RichTextBox.png) + +### TextBox + +![TextBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TextBox.jpg) + +### ComboBox + +![ComboBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ComboBox.jpg) + +### NumericUpDown + +![NumericUpDown](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/NumericUpDown.png) + +### SearchBar + +![SearchBar](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/SearchBar.png) + +### PasswordBox + +![PasswordBox](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/PasswordBox.jpg) + +### DataPicker + +![DataPicker](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/DataPicker.jpg) + +### TimePicker + +![TimePicker](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TimePicker.jpg) + +### DateTimePicker + +![DateTimePicker](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/DateTimePicker.png) + +### ScrollViewer + +![ScrollViewer](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/ScrollViewer.png) + +### CirclePanel + +![CirclePanel](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/CirclePanel.jpg) + +### TransitioningContentControl + +![TransitioningContentControl](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/TransitioningContentControl.gif) + +### BorderStyle + +![BorderStyle](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Border.png) + +### Brush + +![Brush](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/Brush.png) + +## Switching configuration + +![Switching configuration](https://gitee.com/handyorg/HandyOrgResource/raw/master/HandyControl/Resources/SwitchConfig.png) diff --git a/README.md b/README.md index cf743eaf..f0b3fcbd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ +[中文](https://github.com/HandyOrg/HandyControl/blob/master/README-cn.md) - [English](https://github.com/HandyOrg/HandyControl/blob/master/README.md) + ![logo](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png) -![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-8.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2019-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) [![appveyor-build-status](https://ci.appveyor.com/api/projects/status/github/handyorg/handycontrol?svg=true)](https://ci.appveyor.com/project/handyorg/handycontrol) ![Github-build-status](https://github.com/HandyOrg/HandyControl/workflows/build/badge.svg) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![wiki](https://img.shields.io/badge/wiki-Complete-brightgreen.svg)](https://github.com/ghost1372/HandyControl/wiki) [![Nuget](https://img.shields.io/nuget/dt/handycontrol)](https://www.nuget.org/packages/HandyControl) +![dotnet-version](https://img.shields.io/badge/.net-%3E%3D4.0-blue.svg) ![csharp-version](https://img.shields.io/badge/C%23-8.0-blue.svg) ![IDE-version](https://img.shields.io/badge/IDE-vs2019-blue.svg) [![nuget-version](https://img.shields.io/nuget/v/HandyControl.svg)](https://www.nuget.org/packages/HandyControl) ![Github-build-status](https://github.com/HandyOrg/HandyControl/workflows/build/badge.svg) [![Join the chat at https://gitter.im/HandyControl/Lobby](https://badges.gitter.im/HandyControl/Lobby.svg)](https://gitter.im/HandyControl/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![wiki](https://img.shields.io/badge/wiki-Complete-brightgreen.svg)](https://github.com/ghost1372/HandyControl/wiki) [![Nuget](https://img.shields.io/nuget/dt/handycontrol)](https://www.nuget.org/packages/HandyControl) # Welcome to HandyControl @@ -8,10 +10,14 @@ ### 加入讨论 -| | 1群 (已满) | 2群 | -|-|:-:|:-:| -| 群号码 | [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) | [![qq-group](https://img.shields.io/badge/qq-858784803-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=5c18622a0f6ee07a6f33afa8cdb85b1f72ea50e878271dfcec919c76b55afee7) | -| 二维码 | ![qq-group](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/qq_group_1.png) | ![qq-group](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/qq_group_2.png) | +| | 西江月群 | 定风波群 | 广寒秋群 | +|-|:-:|:-:|:-:| +| 群号码 | [![qq-group](https://img.shields.io/badge/qq-714704041-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=a571e5553c9d41e49c4f22f3a8b2865451497a795ff281fedf3285def247efc1) | [![qq-group](https://img.shields.io/badge/qq-858784803-red.svg)](//shang.qq.com/wpa/qunwpa?idkey=5c18622a0f6ee07a6f33afa8cdb85b1f72ea50e878271dfcec919c76b55afee7) | 微信群 | +| 二维码 | ![qq-group](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/qq_group_1.png) | ![qq-group](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/qq_group_2.png) | ![wechat-group](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/wechat_group.png) | + +### 码云 + +[https://gitee.com/handyorg/HandyControl/](https://gitee.com/handyorg/HandyControl/) ### 中文文档 @@ -27,55 +33,59 @@ ## Contributors -ghost1372 -DingpingZhang -M0n7y5 -guanguanchuangyu -yanchao891012 -noctwolf -xianyun666 -afunc233 -DinoChan -MrZhangYuan -JinhuaChen-OMEC -seedtyx -KleinPan -yxhq +ghost1372 +DingpingZhang +M0n7y5 +guanguanchuangyu +yanchao891012 +noctwolf +xianyun666 +afunc233 +DinoChan +MrZhangYuan +JinhuaChen-OMEC +seedtyx +KleinPan +yxhq +AiHaibara +walterlv +Luoyingliang +lindexi +danwalmsley ## Backers - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + ## Special thanks to [![Visual Studio Community 2019](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/vs2019_logo.png)](https://visualstudio.microsoft.com/free-developer-offers/) [![JetBrains](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/resharper_logo.png)](https://www.jetbrains.com/?from=HandyControl) [![Cake](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/cake_logo.png)](https://cakebuild.net/) -[![AppVeyor](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/appveyor_logo.png)](https://www.appveyor.com/) [![Gitter](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/gitter_logo.png)](https://gitter.im/) ## Usage -Step 1：Add a reference to HandyControl or search for HandyControl on the nuget; +Step 1: Add a reference to HandyControl or search for HandyControl on the nuget; ```Install-Package HandyControl``` -Step 2：Add code in App.xaml as follows: +Step 2: Add code in App.xaml as follows: ```XML @@ -90,13 +100,17 @@ Step 2：Add code in App.xaml as follows: Step 3: Add NameSpace: `xmlns:hc="https://handyorg.github.io/handycontrol"` -Step 4：enjoy coding +Step 4: Enjoy coding ## VSIX packages for Visual Studio | [VS2019](https://marketplace.visualstudio.com/items?itemName=HandyOrg.handycontrolforvs2019) | | ------------- | +## Stargazers over time + +[![Stargazers over time](https://starchart.cc/HandyOrg/HandyControl.svg)](https://starchart.cc/HandyOrg/HandyControl) + ## Overview ![Overview](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Overview.png) @@ -105,6 +119,18 @@ Step 4：enjoy coding ## Latest examples +### CheckComboBox + +![CheckComboBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/CheckComboBox.png) + +### ImageSelector + +![ImageSelector](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/ImageSelector.png) + +### PropertyGrid + +![PropertyGrid](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PropertyGrid.png) + ### Screenshot ![Screenshot](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Screenshot.png) @@ -113,6 +139,8 @@ Step 4：enjoy coding ![GooeyEffect](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GooeyEffect.gif) +## History publication + ### GlowWindow ![GlowWindow](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/GlowWindow.png) @@ -125,8 +153,6 @@ Step 4：enjoy coding ![PinBox](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/PinBox.png) -## History publication - ### Effects ![Effects](https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/Effects.png) diff --git a/build/build.cake b/build/build.cake index 7538862b..7d17c5cc 100644 --- a/build/build.cake +++ b/build/build.cake @@ -10,61 +10,71 @@ Task("Build") .IsDependentOn("Clean") .Does(() => { - var vsLatest = VSWhereLatest(); - var msBuildPath = vsLatest?.CombineWithFilePath("./MSBuild/Current/Bin/MSBuild.exe"); - NuGetRestore("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj"); + NuGetRestore("../src/HandyControl.sln"); - var settingsNet40 = new MSBuildSettings + var settingsNet40 = new DotNetCoreBuildSettings + { + Configuration = "Release-Net40", + OutputDirectory = "lib/net40" + }; + + var settingsNet45 = new DotNetCoreBuildSettings { Configuration = "Release", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net40")).FullPath); + Framework = "net45", + OutputDirectory = "lib/net45" + }; - var settingsNet45 = new MSBuildSettings + var settingsNet462 = new DotNetCoreBuildSettings { - Configuration = "Release-Net45", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net45")).FullPath); + Configuration = "Release", + Framework = "net462", + OutputDirectory = "lib/net462" + }; - var settingsNet462 = new MSBuildSettings + var settingsNet47 = new DotNetCoreBuildSettings { - Configuration = "Release-Net462", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net462")).FullPath); + Configuration = "Release", + Framework = "net47", + OutputDirectory = "lib/net47" + }; - var settingsNet47 = new MSBuildSettings + var settingsNet48 = new DotNetCoreBuildSettings { - Configuration = "Release-Net47", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net47")).FullPath); - - var settingsNet48 = new MSBuildSettings - { - Configuration = "Release-Net48", - ToolPath = msBuildPath, - }.WithProperty("OutputPath", MakeAbsolute(Directory("lib/net48")).FullPath); + Configuration = "Release", + Framework = "net48", + OutputDirectory = "lib/net48" + }; var settingsCore30 = new DotNetCoreBuildSettings { + Configuration = "Release", Framework = "netcoreapp3.0", - Configuration = "Release-Core30", OutputDirectory = "lib/netcoreapp3.0" }; var settingsCore31 = new DotNetCoreBuildSettings { + Configuration = "Release", Framework = "netcoreapp3.1", - Configuration = "Release-Core31", OutputDirectory = "lib/netcoreapp3.1" }; - MSBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47); - MSBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48); - DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore30); - DotNetCoreBuild("../src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj", settingsCore31); + var settingsNet50 = new DotNetCoreBuildSettings + { + Configuration = "Release", + Framework = "net5.0", + OutputDirectory = "lib/net50" + }; + + DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet45); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet462); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet47); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet48); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore30); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsCore31); + DotNetCoreBuild("../src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj", settingsNet50); }); RunTarget(target); \ No newline at end of file diff --git a/build/build.nuspec b/build/build.nuspec index f48902dc..63028dbc 100644 --- a/build/build.nuspec +++ b/build/build.nuspec @@ -2,19 +2,19 @@ HandyControl - 2.4.0 + 2.5.0.2 HandyOrg HandyOrg HandyOrg - false + true + LICENSE + icon.png https://github.com/NaBian/HandyControl - https://raw.githubusercontent.com/HandyOrg/HandyOrgResource/master/HandyControl/Resources/icon.png Contains some commonly used simple WPF controls Changes are detailed at https://github.com/HandyOrg/HandyControl/releases Copyright © HandyOrg 2018-2020 - WPF C# Control - + @@ -24,47 +24,77 @@ + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/tools/packages.config b/build/tools/packages.config new file mode 100644 index 00000000..ec87d006 --- /dev/null +++ b/build/tools/packages.config @@ -0,0 +1,4 @@ + + + + diff --git a/doc/themes/next/source/images/algolia_logo.svg b/doc/themes/next/source/images/algolia_logo.svg index 47024234..1299c4ce 100644 --- a/doc/themes/next/source/images/algolia_logo.svg +++ b/doc/themes/next/source/images/algolia_logo.svg @@ -1,9 +1 @@ - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/apple-touch-icon-HandyOrg.png b/doc/themes/next/source/images/apple-touch-icon-HandyOrg.png index efe93546..d1474481 100644 Binary files a/doc/themes/next/source/images/apple-touch-icon-HandyOrg.png and b/doc/themes/next/source/images/apple-touch-icon-HandyOrg.png differ diff --git a/doc/themes/next/source/images/avatar.gif b/doc/themes/next/source/images/avatar.gif index 98990257..3b5d744b 100644 Binary files a/doc/themes/next/source/images/avatar.gif and b/doc/themes/next/source/images/avatar.gif differ diff --git a/doc/themes/next/source/images/cc-by-nc-nd.svg b/doc/themes/next/source/images/cc-by-nc-nd.svg index 79a4f2e0..7e37337f 100644 --- a/doc/themes/next/source/images/cc-by-nc-nd.svg +++ b/doc/themes/next/source/images/cc-by-nc-nd.svg @@ -1,121 +1 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/cc-by-nc-sa.svg b/doc/themes/next/source/images/cc-by-nc-sa.svg index bf6bc26f..d6853214 100644 --- a/doc/themes/next/source/images/cc-by-nc-sa.svg +++ b/doc/themes/next/source/images/cc-by-nc-sa.svg @@ -1,121 +1 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/cc-by-nc.svg b/doc/themes/next/source/images/cc-by-nc.svg index 36973490..64e02307 100644 --- a/doc/themes/next/source/images/cc-by-nc.svg +++ b/doc/themes/next/source/images/cc-by-nc.svg @@ -1,121 +1 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/cc-by-nd.svg b/doc/themes/next/source/images/cc-by-nd.svg index 934c61e1..a56f8d3a 100644 --- a/doc/themes/next/source/images/cc-by-nd.svg +++ b/doc/themes/next/source/images/cc-by-nd.svg @@ -1,117 +1 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/cc-by-sa.svg b/doc/themes/next/source/images/cc-by-sa.svg index 463276a8..47d75790 100644 --- a/doc/themes/next/source/images/cc-by-sa.svg +++ b/doc/themes/next/source/images/cc-by-sa.svg @@ -1,121 +1 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/cc-by.svg b/doc/themes/next/source/images/cc-by.svg index 4bccd14f..5b1db2b5 100644 --- a/doc/themes/next/source/images/cc-by.svg +++ b/doc/themes/next/source/images/cc-by.svg @@ -1,121 +1 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/cc-zero.svg b/doc/themes/next/source/images/cc-zero.svg index 0f866392..0c08ee65 100644 --- a/doc/themes/next/source/images/cc-zero.svg +++ b/doc/themes/next/source/images/cc-zero.svg @@ -1,72 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/favicon-16x16-HandyOrg.png b/doc/themes/next/source/images/favicon-16x16-HandyOrg.png index beabd0e8..804b2f4d 100644 Binary files a/doc/themes/next/source/images/favicon-16x16-HandyOrg.png and b/doc/themes/next/source/images/favicon-16x16-HandyOrg.png differ diff --git a/doc/themes/next/source/images/favicon-32x32-HandyOrg.png b/doc/themes/next/source/images/favicon-32x32-HandyOrg.png index 9a2b3614..b9fcd607 100644 Binary files a/doc/themes/next/source/images/favicon-32x32-HandyOrg.png and b/doc/themes/next/source/images/favicon-32x32-HandyOrg.png differ diff --git a/doc/themes/next/source/images/logo.svg b/doc/themes/next/source/images/logo.svg index ad0fa686..c69a8264 100644 --- a/doc/themes/next/source/images/logo.svg +++ b/doc/themes/next/source/images/logo.svg @@ -1,2 +1 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/doc/themes/next/source/images/quote-l.svg b/doc/themes/next/source/images/quote-l.svg index 6dd94a4a..95c2f2ce 100644 --- a/doc/themes/next/source/images/quote-l.svg +++ b/doc/themes/next/source/images/quote-l.svg @@ -1,13 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/quote-r.svg b/doc/themes/next/source/images/quote-r.svg index 312b64d7..810d935d 100644 --- a/doc/themes/next/source/images/quote-r.svg +++ b/doc/themes/next/source/images/quote-r.svg @@ -1,12 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/doc/themes/next/source/images/searchicon.png b/doc/themes/next/source/images/searchicon.png index 14a16cad..b833b567 100644 Binary files a/doc/themes/next/source/images/searchicon.png and b/doc/themes/next/source/images/searchicon.png differ diff --git a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj b/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj deleted file mode 100644 index 9a72efda..00000000 --- a/src/Core_GE30/HandyControlDemo_Core_GE30/HandyControlDemo_Core_GE30.csproj +++ /dev/null @@ -1,552 +0,0 @@ - - - WinExe - true - HandyControlDemo - HandyControlDemo - 2.5.0 - ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico - Debug-Core30;Debug-Core31;Release-Core30;Release-Core31 - Copyright © HandyOrg 2018-2020 - 2.5.0 - 2.5.0 - 8.0 - HandyOrg - - - TRACE;Core - netcoreapp3.0 - false - NU1701;0108 - - - TRACE;Core - netcoreapp3.1 - - - TRACE;Core - netcoreapp3.0 - - - TRACE;Core - netcoreapp3.1 - 0108;NU1701 - - - - - - - - - - Data\MessageToken.cs - True - True - MessageToken.tt - - - Properties\Langs\LangProvider.cs - True - True - LangProvider.tt - - - Properties\Langs\Lang.Designer.cs - True - True - Lang.resx - - - - - - - - - - - - - - Data\DemoInfo.json - - - Resources\Img\Cover.png - - - Resources\Img\QQ\1.gif - - - Resources\Img\QQ\2.gif - - - Resources\Img\QQ\3.gif - - - Resources\Img\QQ\4.gif - - - Resources\Img\QQ\5.gif - - - Resources\Img\QQ\6.gif - - - Resources\Img\QQ\7.gif - - - Resources\Img\QQ\8.gif - - - Resources\Img\QQ\9.gif - - - Resources\Img\QQ\10.gif - - - Resources\Img\1.jpg - - - Resources\Img\2.jpg - - - Resources\Img\3.jpg - - - Resources\Img\4.jpg - - - Resources\Img\5.jpg - - - Resources\Img\Album\1.jpg - - - Resources\Img\Album\10.jpg - - - Resources\Img\Album\2.jpg - - - Resources\Img\Album\3.jpg - - - Resources\Img\Album\4.jpg - - - Resources\Img\Album\5.jpg - - - Resources\Img\Album\6.jpg - - - Resources\Img\Album\7.jpg - - - Resources\Img\Album\8.jpg - - - Resources\Img\Album\9.jpg - - - Resources\Img\Avatar\avatar1.png - - - Resources\Img\Avatar\avatar2.png - - - Resources\Img\Avatar\avatar3.png - - - Resources\Img\Avatar\avatar4.png - - - Resources\Img\Avatar\avatar5.png - - - Resources\Img\Avatar\avatar6.png - - - Resources\Img\b1.jpg - - - Resources\Img\b2.jpg - - - Resources\Img\car_chase.gif - - - Resources\Img\Chat\chat_back1.jpg - - - Resources\Img\Chat\chat_back2.jpg - - - Resources\Img\Flag\cn.png - - - Resources\Img\Flag\en.png - - - Resources\Img\Flag\fa.png - - - Resources\Img\Flag\fr.png - - - Resources\Img\Flag\ko-KR.png - - - Resources\Img\Flag\ru.png - - - Resources\Img\Flag\tr.png - - - Resources\Img\icon-white.ico - - - Resources\Img\icon.ico - - - Resources\Img\qq_group_1.jpg - - - Resources\Img\qq_group_2.jpg - - - Resources\Img\LeftMainContent\Animation_16x.png - - - Resources\Img\LeftMainContent\BorderElement_16x.png - - - Resources\Img\LeftMainContent\Brush_16x.png - - - Resources\Img\LeftMainContent\Bubble_16xLG.png - - - Resources\Img\LeftMainContent\ButtonClick_16x.png - - - Resources\Img\LeftMainContent\Calendar_16x.png - - - Resources\Img\LeftMainContent\Carousel_16x.png - - - Resources\Img\LeftMainContent\CheckBox_16x.png - - - Resources\Img\LeftMainContent\ColorPalette_16x.png - - - Resources\Img\LeftMainContent\ColorWheel_16x.png - - - Resources\Img\LeftMainContent\ComboBox_16x.png - - - Resources\Img\LeftMainContent\ContextMenu_16x.png - - - Resources\Img\LeftMainContent\DataGrid_16x.png - - - Resources\Img\LeftMainContent\DatePicker_16x.png - - - Resources\Img\LeftMainContent\DetailDataView_16x.png - - - Resources\Img\LeftMainContent\Dialog_16x.png - - - Resources\Img\LeftMainContent\DotLarge_16x.png - - - Resources\Img\LeftMainContent\Expander_16x.png - - - Resources\Img\LeftMainContent\FlipVertical_16x.png - - - Resources\Img\LeftMainContent\Flow_16x.png - - - Resources\Img\LeftMainContent\GoToTop_16x.png - - - Resources\Img\LeftMainContent\GroupBox_16x.png - - - Resources\Img\LeftMainContent\HoverMenu_16x.png - - - Resources\Img\LeftMainContent\ImageBrowser_16x.png - - - Resources\Img\LeftMainContent\Label_16x.png - - - Resources\Img\LeftMainContent\LinearCarousel_16x.png - - - Resources\Img\LeftMainContent\ListBox_16x.png - - - Resources\Img\LeftMainContent\ListView_16x.png - - - Resources\Img\LeftMainContent\Loading_Blue_16x.png - - - Resources\Img\LeftMainContent\Message_16x.png - - - Resources\Img\LeftMainContent\NotificationHub_16x.png - - - Resources\Img\LeftMainContent\NumericListBox_16x.png - - - Resources\Img\LeftMainContent\Paginator_16x.png - - - Resources\Img\LeftMainContent\Panel_16x.png - - - Resources\Img\LeftMainContent\PasswordBox_16x.png - - - Resources\Img\LeftMainContent\Path_16x.png - - - Resources\Img\LeftMainContent\ProgressBar_16x.png - - - Resources\Img\LeftMainContent\ProgressButton_16x.png - - - Resources\Img\LeftMainContent\RadioButton_16x.png - - - Resources\Img\LeftMainContent\RepeatButton_16x.png - - - Resources\Img\LeftMainContent\RichTextBox_16x.png - - - Resources\Img\LeftMainContent\ScrollBox_16x.png - - - Resources\Img\LeftMainContent\Search_16x.png - - - Resources\Img\LeftMainContent\Shield_16x.png - - - Resources\Img\LeftMainContent\Slider_16x.png - - - Resources\Img\LeftMainContent\SortAscending_grey_16x.png - - - Resources\Img\LeftMainContent\SplitterControl_16x.png - - - Resources\Img\LeftMainContent\Star.png - - - Resources\Img\LeftMainContent\TabPage_16x.png - - - Resources\Img\LeftMainContent\Tag_16x.png - - - Resources\Img\LeftMainContent\TextBlock_16x.png - - - Resources\Img\LeftMainContent\TextBox_16x.png - - - Resources\Img\LeftMainContent\Timeline_16x.png - - - Resources\Img\LeftMainContent\TimePicker_16x.png - - - Resources\Img\LeftMainContent\Time_color_16x.png - - - Resources\Img\LeftMainContent\Toggle_16x.png - - - Resources\Img\LeftMainContent\ToolBar_16x.png - - - Resources\Img\LeftMainContent\Transfer_16x.png - - - Resources\Img\LeftMainContent\TreeView_16x.png - - - Resources\Img\LeftMainContent\User_16x.png - - - Resources\Img\LeftMainContent\WindowsForm_16x.png - - - Resources\Img\LeftMainContent\GridPane_16x.png - - - Resources\Img\under_construction.gif - - - Resources\Img\DevOps\DevOps-Boards.png - - - Resources\Img\DevOps\DevOps-Overview.png - - - Resources\Img\DevOps\DevOps-Pipelines.png - - - Resources\Img\DevOps\DevOps-Repos.png - - - Resources\Img\DevOps\DevOps-TestPlans.png - - - Resources\Img\LeftMainContent\MainMenuControl_16x.png - - - Resources\fabric-icons.ttf - - - Resources\Registry.txt - - - Resources\Img\LeftMainContent\brackets_Square_16xLG.png - - - Resources\Img\LeftMainContent\ButtonGroup_16x.png - - - Resources\Img\LeftMainContent\VSO_Card_16x.png - - - Resources\Img\LeftMainContent\ImageStack_16x.png - - - Resources\Img\LeftMainContent\Dynamic_16x.png - - - Resources\Img\LeftMainContent\PolygonHexagon_16x.png - - - Resources\Img\LeftMainContent\HandyControl.png - - - Resources\Img\LeftMainContent\Procedure_16x.png - - - Resources\Img\Dance.png - - - Resources\Img\LeftMainContent\thumbs_up.png - - - Resources\Img\LeftMainContent\SplitButton_16x.png - - - Resources\Img\LeftMainContent\DataGenerator_16x.png - - - Resources\Img\LeftMainContent\DottedSplitter_16x.png - - - Resources\Img\LeftMainContent\PopupCursor_16x.png - - - Resources\Img\LeftMainContent\TransitioningContentControl_16x.png - - - Resources\Img\LeftMainContent\View_Portrait_16x.png - - - Resources\Img\LeftMainContent\TransformRelative_16x.png - - - Resources\Img\LeftMainContent\Effects_16x.png - - - Resources\Img\LeftMainContent\Ellipsis_16x.png - - - Resources\Img\LeftMainContent\WPFFlowDocument_16x.png - - - Resources\Img\LeftMainContent\OutlinedRectangleTool_16x.png - - - Resources\Img\LeftMainContent\frame_16xLG.png - - - Resources\Img\cloud.png - - - Resources\Img\LeftMainContent\WindowScreenshot_16x.png - - - - - Properties\Langs\Lang.tr.resx - - - Properties\Langs\Lang.en.resx - - - Properties\Langs\Lang.fa.resx - - - Properties\Langs\Lang.fr.resx - - - Properties\Langs\Lang.ko-KR.resx - - - Properties\Langs\Lang.ru.resx - - - Properties\Langs\Lang.resx - PublicResXFileCodeGenerator - Lang.Designer.cs - - - - - Properties\App.config - - - - - Data\MessageToken.tt - TextTemplatingFileGenerator - MessageToken.cs - - - Properties\Langs\LangProvider.tt - TextTemplatingFileGenerator - LangProvider.cs - - - - - TextTemplatingFileGenerator - - - - \ No newline at end of file diff --git a/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj b/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj deleted file mode 100644 index df7c660e..00000000 --- a/src/Core_GE30/HandyControl_Core_GE30/HandyControl_Core_GE30.csproj +++ /dev/null @@ -1,161 +0,0 @@ - - - true - HandyControl - HandyControl - 2.5.0 - 2.5.0 - false - false - Copyright © HandyOrg 2018-2020 - Contains some commonly used simple WPF controls - Debug-Core30;Debug-Core31;Release-Core30;Release-Core31 - 8.0 - HandyOrg - HandyControl - - - TRACE;Core - netcoreapp3.0 - 0067;0649 - false - - - - TRACE;Core - netcoreapp3.1 - - - TRACE;Core - netcoreapp3.0 - C:\Code\GitHub\HandyControl\src\Core_GE30\HandyControl_Core_GE30\HandyControl.xml - - - TRACE;Core - netcoreapp3.1 - C:\Code\GitHub\HandyControl\src\Core_GE30\HandyControl_Core_GE30\HandyControl.xml - 0067;0649;1591 - - - - Properties\Langs\Lang.Designer.cs - True - True - Lang.resx - - - Properties\Langs\LangProvider.cs - True - True - LangProvider.tt - - - - - Properties\Langs\Lang.tr.resx - - - Properties\Langs\Lang.en.resx - - - Properties\Langs\Lang.fa.resx - - - Properties\Langs\Lang.fr.resx - - - Properties\Langs\Lang.ko-KR.resx - - - Properties\Langs\Lang.ru.resx - - - Properties\Langs\Lang.resx - PublicResXFileCodeGenerator - Lang.Designer.cs - - - Properties\CoreAssemblyInfo.cs - - - - - Properties\Langs\LangProvider.tt - TextTemplatingFileGenerator - LangProvider.cs - - - - - - Resources\dropper.cur - - - - - Resources\Effects\BrightnessEffect.ps - - - Resources\Effects\ColorComplementEffect.ps - - - Resources\Effects\ColorMatrixEffect.ps - - - Resources\Effects\ContrastEffect.ps - - - Resources\Effects\GrayScaleEffect.ps - - - - - Resources\Images\GlowWindow\bottom.png - - - Resources\Images\GlowWindow\bottomleft.png - - - Resources\Images\GlowWindow\bottomright.png - - - Resources\Images\GlowWindow\cornerbottomleft.png - - - Resources\Images\GlowWindow\cornerbottomright.png - - - Resources\Images\GlowWindow\cornertopleft.png - - - Resources\Images\GlowWindow\cornertopright.png - - - Resources\Images\GlowWindow\left.png - - - Resources\Images\GlowWindow\leftbottom.png - - - Resources\Images\GlowWindow\lefttop.png - - - Resources\Images\GlowWindow\right.png - - - Resources\Images\GlowWindow\rightbottom.png - - - Resources\Images\GlowWindow\righttop.png - - - Resources\Images\GlowWindow\top.png - - - Resources\Images\GlowWindow\topleft.png - - - Resources\Images\GlowWindow\topright.png - - - diff --git a/src/Directory.Build.Props b/src/Directory.Build.Props new file mode 100644 index 00000000..f9bf59c1 --- /dev/null +++ b/src/Directory.Build.Props @@ -0,0 +1,11 @@ + + + true + 3.0.0.0 + 3.0.0.0 + 3.0.0.0 + 8.0 + Copyright © HandyOrg 2018-2020 + HandyOrg + + \ No newline at end of file diff --git a/src/HandyControl.sln b/src/HandyControl.sln index 45fa85fc..bee946d8 100644 --- a/src/HandyControl.sln +++ b/src/HandyControl.sln @@ -17,12 +17,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{35E3F9C0-8924-4536-BE09-F3761FDBF066}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{B838C973-06F0-48A1-B259-A357AAF2D8D4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{BE4A567D-B6E0-413E-8F64-E1A53B4F9366}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{D7107690-8592-4F9F-9379-9B82C1C15D2A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}" @@ -31,172 +25,52 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Sh EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 4 + Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5 + Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5 Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{be4a567d-b6e0-413e-8f64-e1a53b4f9366}*SharedItemsImports = 5 Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d7107690-8592-4f9f-9379-9b82c1c15d2a}*SharedItemsImports = 5 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 4 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 4 + Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5 + Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-Core30|Any CPU = Debug-Core30|Any CPU - Debug-Core31|Any CPU = Debug-Core31|Any CPU + Debug|Any CPU = Debug|Any CPU Debug-Net40|Any CPU = Debug-Net40|Any CPU - Debug-Net45|Any CPU = Debug-Net45|Any CPU - Debug-Net462|Any CPU = Debug-Net462|Any CPU - Debug-Net47|Any CPU = Debug-Net47|Any CPU - Debug-Net48|Any CPU = Debug-Net48|Any CPU - Release-Core30|Any CPU = Release-Core30|Any CPU - Release-Core31|Any CPU = Release-Core31|Any CPU + Release|Any CPU = Release|Any CPU Release-Net40|Any CPU = Release-Net40|Any CPU - Release-Net45|Any CPU = Release-Net45|Any CPU - Release-Net462|Any CPU = Release-Net462|Any CPU - Release-Net47|Any CPU = Release-Net47|Any CPU - Release-Net48|Any CPU = Release-Net48|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core30|Any CPU.ActiveCfg = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Core31|Any CPU.ActiveCfg = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.ActiveCfg = Debug-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core30|Any CPU.Build.0 = Debug-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Core31|Any CPU.Build.0 = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net40|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.ActiveCfg = Release-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core30|Any CPU.Build.0 = Release-Core30|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Core31|Any CPU.Build.0 = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net40|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net45|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net462|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net47|Any CPU.ActiveCfg = Release-Core31|Any CPU - {D7107690-8592-4F9F-9379-9B82C1C15D2A}.Release-Net48|Any CPU.ActiveCfg = Release-Core31|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release|Any CPU.Build.0 = Release|Any CPU + {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release|Any CPU.Build.0 = Release|Any CPU + {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU + {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU + {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release|Any CPU.ActiveCfg = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net40|Any CPU.Build.0 = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core30|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Core31|Any CPU.ActiveCfg = Debug|Any CPU + {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net462|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net47|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug-Net48|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core30|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Core31|Any CPU.ActiveCfg = Release|Any CPU + {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net40|Any CPU.Build.0 = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net462|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net47|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release-Net48|Any CPU.ActiveCfg = Release|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core30|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Core31|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.ActiveCfg = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.Build.0 = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core30|Any CPU.Build.0 = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Core31|Any CPU.Build.0 = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.ActiveCfg = Release-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.Build.0 = Release-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.ActiveCfg = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net40|Any CPU.Build.0 = Debug|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.ActiveCfg = Release|Any CPU + {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net40|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -206,8 +80,6 @@ Global {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {BE4A567D-B6E0-413E-8F64-E1A53B4F9366} = {B838C973-06F0-48A1-B259-A357AAF2D8D4} - {D7107690-8592-4F9F-9379-9B82C1C15D2A} = {B838C973-06F0-48A1-B259-A357AAF2D8D4} {32204503-2EF0-4681-AE13-AA1FEB6C658A} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066} {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} diff --git a/src/HandyControl_Core_GE30.sln b/src/HandyControl_Core_GE30.sln deleted file mode 100644 index 5d0f3b84..00000000 --- a/src/HandyControl_Core_GE30.sln +++ /dev/null @@ -1,56 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{60DCDCCA-3902-49EB-BC24-488143BE832E}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shared\HandyControl_Shared\HandyControl_Shared.shproj", "{AAC11083-FACA-405D-9197-5C1212D65656}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core_GE30", "Core_GE30", "{7BB7D82E-48B1-4673-91B6-37D563A0A624}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Core_GE30", "Core_GE30\HandyControl_Core_GE30\HandyControl_Core_GE30.csproj", "{A85722CF-CDF4-4164-94E4-EB71E543361A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControlDemo_Core_GE30", "Core_GE30\HandyControlDemo_Core_GE30\HandyControlDemo_Core_GE30.csproj", "{BF712555-531A-4C8D-9AB5-3109DC178A8E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A85722CF-CDF4-4164-94E4-EB71E543361A}.Release|Any CPU.Build.0 = Release|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF712555-531A-4C8D-9AB5-3109DC178A8E}.Release|Any CPU.Build.0 = Release|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net48|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {AAC11083-FACA-405D-9197-5C1212D65656} = {60DCDCCA-3902-49EB-BC24-488143BE832E} - {C4694269-C9B8-45D5-87F8-D0088C532510} = {60DCDCCA-3902-49EB-BC24-488143BE832E} - {A85722CF-CDF4-4164-94E4-EB71E543361A} = {7BB7D82E-48B1-4673-91B6-37D563A0A624} - {BF712555-531A-4C8D-9AB5-3109DC178A8E} = {7BB7D82E-48B1-4673-91B6-37D563A0A624} - {D8A4748C-0500-4F63-BC47-3506658C68F7} = {60DCDCCA-3902-49EB-BC24-488143BE832E} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6C8B9B9F-B396-4C31-BA28-11BCB1ED94C5} - EndGlobalSection -EndGlobal diff --git a/src/HandyControl_Net_40.sln b/src/HandyControl_Net_40.sln deleted file mode 100644 index e33e7cc8..00000000 --- a/src/HandyControl_Net_40.sln +++ /dev/null @@ -1,58 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_40", "Net_40", "{763DABFC-950A-4965-97CB-15C59A928401}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0938270D-E9F0-489B-AF9E-5C5AD7C69897}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shared\HandyControl_Shared\HandyControl_Shared.shproj", "{AAC11083-FACA-405D-9197-5C1212D65656}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_40", "Net_40\HandyControl_Net_40\HandyControl_Net_40.csproj", "{32204503-2EF0-4681-AE13-AA1FEB6C658A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_40", "Net_40\HandyControlDemo_Net_40\HandyControlDemo_Net_40.csproj", "{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 4 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A}.Release|Any CPU.Build.0 = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231}.Release|Any CPU.Build.0 = Release|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.ActiveCfg = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug|Any CPU.Build.0 = Debug-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.ActiveCfg = Release-Net40|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release|Any CPU.Build.0 = Release-Net40|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {32204503-2EF0-4681-AE13-AA1FEB6C658A} = {763DABFC-950A-4965-97CB-15C59A928401} - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {763DABFC-950A-4965-97CB-15C59A928401} - {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} - EndGlobalSection -EndGlobal diff --git a/src/HandyControl_Net_GE45.sln b/src/HandyControl_Net_GE45.sln deleted file mode 100644 index 34b9d63d..00000000 --- a/src/HandyControl_Net_GE45.sln +++ /dev/null @@ -1,100 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28729.10 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Net_GE45", "Net_GE45\HandyControlDemo_Net_GE45\HandyControlDemo_Net_GE45.csproj", "{9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net_GE45", "Net_GE45", "{2F551C62-77F7-4FA5-8AD7-FCF53E92AE08}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{0938270D-E9F0-489B-AF9E-5C5AD7C69897}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Shared\HandyControl_Shared\HandyControl_Shared.shproj", "{AAC11083-FACA-405D-9197-5C1212D65656}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControlDemo_Shared", "Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.shproj", "{C4694269-C9B8-45D5-87F8-D0088C532510}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandyControlDemo_Code", "Shared\HandyControlDemo_Code\HandyControlDemo_Code.csproj", "{D8A4748C-0500-4F63-BC47-3506658C68F7}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 4 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13 - Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13 - Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug-Net45|Any CPU = Debug-Net45|Any CPU - Debug-Net462|Any CPU = Debug-Net462|Any CPU - Debug-Net47|Any CPU = Debug-Net47|Any CPU - Debug-Net48|Any CPU = Debug-Net48|Any CPU - Release-Net45|Any CPU = Release-Net45|Any CPU - Release-Net462|Any CPU = Release-Net462|Any CPU - Release-Net47|Any CPU = Release-Net47|Any CPU - Release-Net48|Any CPU = Release-Net48|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {DC966E3D-BCFF-4652-98CF-070E5494749A}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.ActiveCfg = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net45|Any CPU.Build.0 = Debug-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.ActiveCfg = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net462|Any CPU.Build.0 = Debug-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.ActiveCfg = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net47|Any CPU.Build.0 = Debug-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.ActiveCfg = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Debug-Net48|Any CPU.Build.0 = Debug-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.ActiveCfg = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net45|Any CPU.Build.0 = Release-Net45|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.ActiveCfg = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net462|Any CPU.Build.0 = Release-Net462|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.ActiveCfg = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net47|Any CPU.Build.0 = Release-Net47|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.ActiveCfg = Release-Net48|Any CPU - {D8A4748C-0500-4F63-BC47-3506658C68F7}.Release-Net48|Any CPU.Build.0 = Release-Net48|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {DC966E3D-BCFF-4652-98CF-070E5494749A} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} - {9A7B52E6-94BB-4E7E-BB6A-7CF6761B79A7} = {2F551C62-77F7-4FA5-8AD7-FCF53E92AE08} - {AAC11083-FACA-405D-9197-5C1212D65656} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {C4694269-C9B8-45D5-87F8-D0088C532510} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - {D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179} - EndGlobalSection -EndGlobal diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 2afd198a..de147646 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -1,75 +1,20 @@ - - - + - Debug - AnyCPU - {D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} WinExe - HandyControlDemo HandyControlDemo - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - 0108 - - + HandyControlDemo + net40 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico - - - OnOutputUpdated + 0108 - - - - 4.0 - - - - - - - - 6.0.1 - - - 5.4.1.1 - - - 11.0.2 - + + + @@ -84,11 +29,6 @@ True LangProvider.tt - - Properties\AssemblyInfo.cs - - - Properties\Langs\Lang.Designer.cs True @@ -97,6 +37,24 @@ + + + + + + + + + + + Data\DemoInfo.json + + + Resources\Img\chrome_dragon.png + + + Resources\Img\Cover.png + Resources\Img\QQ\1.gif @@ -220,6 +178,9 @@ Resources\Img\Flag\ko-KR.png + + Resources\Img\Flag\pt-BR.png + Resources\Img\Flag\ru.png @@ -232,6 +193,12 @@ Resources\Img\icon.ico + + Resources\Img\qq_group_1.jpg + + + Resources\Img\qq_group_2.jpg + Resources\Img\LeftMainContent\Animation_16x.png @@ -256,6 +223,9 @@ Resources\Img\LeftMainContent\CheckBox_16x.png + + Resources\Img\LeftMainContent\CheckBoxList_16x.png + Resources\Img\LeftMainContent\ColorPalette_16x.png @@ -301,6 +271,9 @@ Resources\Img\LeftMainContent\HoverMenu_16x.png + + Resources\Img\LeftMainContent\Image_16x.png + Resources\Img\LeftMainContent\ImageBrowser_16x.png @@ -349,6 +322,12 @@ Resources\Img\LeftMainContent\RadioButton_16x.png + + Resources\Img\LeftMainContent\PropertyGridEditorPart_16x.png + + + Resources\Img\LeftMainContent\RepeatButton_16x.png + Resources\Img\LeftMainContent\RichTextBox_16x.png @@ -412,137 +391,11 @@ Resources\Img\LeftMainContent\WindowsForm_16x.png - - Resources\Img\under_construction.gif - - - - - {d8a4748c-0500-4f63-bc47-3506658c68f7} - HandyControlDemo_Code - - - {32204503-2ef0-4681-ae13-aa1feb6c658a} - HandyControl_Net_40 - - - - - Properties\Langs\Lang.tr.resx - - - Properties\Langs\Lang.en.resx - - - Properties\Langs\Lang.fa.resx - - - Properties\Langs\Lang.fr.resx - - - Properties\Langs\Lang.ko-KR.resx - - - Properties\Langs\Lang.ru.resx - - - Properties\Langs\Lang.resx - PublicResXFileCodeGenerator - Lang.Designer.cs - - - - - Properties\App.config - - - - - Resources\fabric-icons.ttf - - - Resources\Registry.txt - - - - - Data\MessageToken.tt - TextTemplatingFileGenerator - MessageToken.cs - - - Properties\Langs\LangProvider.tt - TextTemplatingFileGenerator - LangProvider.cs - - - Resources\Img\LeftMainContent\Effects_16x.png - - - Resources\Img\LeftMainContent\TransformRelative_16x.png - - - Resources\Img\LeftMainContent\View_Portrait_16x.png - - - Resources\Img\LeftMainContent\TransitioningContentControl_16x.png - - - Resources\Img\LeftMainContent\PopupCursor_16x.png - - - Resources\Img\Cover.png - - - Resources\Img\LeftMainContent\DottedSplitter_16x.png - - - Resources\Img\qq_group_1.jpg - - - Resources\Img\qq_group_2.jpg - - - Resources\Img\LeftMainContent\DataGenerator_16x.png - - - Resources\Img\LeftMainContent\SplitButton_16x.png - - - Resources\Img\LeftMainContent\thumbs_up.png - - - Resources\Img\LeftMainContent\Procedure_16x.png - - - Resources\Img\LeftMainContent\HandyControl.png - - - Resources\Img\LeftMainContent\PolygonHexagon_16x.png - - - Resources\Img\LeftMainContent\Dynamic_16x.png - - - Resources\Img\Dance.png - - - Resources\Img\LeftMainContent\ImageStack_16x.png - - - Resources\Img\LeftMainContent\VSO_Card_16x.png - - - Resources\Img\LeftMainContent\ButtonGroup_16x.png - - - Resources\Img\LeftMainContent\brackets_Square_16xLG.png - Resources\Img\LeftMainContent\GridPane_16x.png - - Resources\Img\LeftMainContent\MainMenuControl_16x.png + + Resources\Img\under_construction.gif Resources\Img\DevOps\DevOps-Boards.png @@ -559,8 +412,68 @@ Resources\Img\DevOps\DevOps-TestPlans.png - - Resources\Img\LeftMainContent\RepeatButton_16x.png + + Resources\Img\LeftMainContent\MainMenuControl_16x.png + + + Resources\fabric-icons.ttf + + + Resources\Registry.txt + + + Resources\Img\LeftMainContent\brackets_Square_16xLG.png + + + Resources\Img\LeftMainContent\ButtonGroup_16x.png + + + Resources\Img\LeftMainContent\VSO_Card_16x.png + + + Resources\Img\LeftMainContent\ImageStack_16x.png + + + Resources\Img\LeftMainContent\Dynamic_16x.png + + + Resources\Img\LeftMainContent\PolygonHexagon_16x.png + + + Resources\Img\LeftMainContent\HandyControl.png + + + Resources\Img\LeftMainContent\Procedure_16x.png + + + Resources\Img\Dance.png + + + Resources\Img\LeftMainContent\thumbs_up.png + + + Resources\Img\LeftMainContent\SplitButton_16x.png + + + Resources\Img\LeftMainContent\DataGenerator_16x.png + + + Resources\Img\LeftMainContent\DottedSplitter_16x.png + + + Resources\Img\LeftMainContent\PopupCursor_16x.png + + + Resources\Img\LeftMainContent\TransitioningContentControl_16x.png + + + Resources\Img\LeftMainContent\View_Portrait_16x.png + + + Resources\Img\LeftMainContent\TransformRelative_16x.png + + + Resources\Img\LeftMainContent\Effects_16x.png Resources\Img\LeftMainContent\Ellipsis_16x.png @@ -582,24 +495,70 @@ - - Data\DemoInfo.json - + + Properties\Langs\Lang.tr.resx + + + Properties\Langs\Lang.en.resx + + + Properties\Langs\Lang.fa.resx + + + Properties\Langs\Lang.fr.resx + + + Properties\Langs\Lang.ko-KR.resx + + + Properties\Langs\Lang.pt-BR.resx + + + Properties\Langs\Lang.ru.resx + + + Properties\Langs\Lang.resx + PublicResXFileCodeGenerator + Lang.Designer.cs + + + + + Properties\App.config + + + + + Data\MessageToken.tt + TextTemplatingFileGenerator + MessageToken.cs + + + Properties\Langs\LangProvider.tt + TextTemplatingFileGenerator + LangProvider.cs + + + + + TextTemplatingFileGenerator + - if not exist Langs md Langs rd /s /q Langs\en rd /s /q Langs\fa rd /s /q Langs\fr rd /s /q Langs\ko-KR +rd /s /q Langs\pt-BR rd /s /q Langs\ru rd /s /q Langs\tr move en Langs move fa Langs move fr Langs move ko-KR Langs +move pt-BR Langs move ru Langs move tr Langs diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index 5d4fa598..1a5a3a2e 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -1,47 +1,49 @@ - - + - Debug - AnyCPU - {32204503-2EF0-4681-AE13-AA1FEB6C658A} - library - HandyControl HandyControl - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 + HandyControl + net40 + Contains some commonly used simple WPF controls HandyControl - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE;netle45;netle40 - prompt - 4 - v4.0 - 8.0 - - - pdbonly - true - bin\Release\ - TRACE;netle45;netle40 - prompt - 4 - bin\Release\HandyControl.xml - v4.0 - 8.0 + true + snupkg 0067;0649;1591 + + bin\$(Configuration)\$(TargetFramework)\HandyControl.xml + + + + 3.0.1 + + + + + Designer + XamlIntelliSenseFileGenerator + + + MSBuild:Compile + Designer + + + Designer + XamlIntelliSenseFileGenerator + + + Designer + XamlIntelliSenseFileGenerator + + + Designer + XamlIntelliSenseFileGenerator + + + Designer + XamlIntelliSenseFileGenerator + + - - Properties\NetAssemblyInfo.cs - Properties\Langs\Lang.Designer.cs True @@ -56,62 +58,24 @@ - - - - - - - - - - - - Designer - XamlIntelliSenseFileGenerator - - - MSBuild:Compile - Designer - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator - - - Designer - XamlIntelliSenseFileGenerator - - - - - 3.0.1 - - - - + Properties\Langs\Lang.tr.resx Properties\Langs\Lang.en.resx - + Properties\Langs\Lang.fa.resx - + Properties\Langs\Lang.fr.resx Properties\Langs\Lang.ko-KR.resx + + Properties\Langs\Lang.pt-BR.resx + Properties\Langs\Lang.ru.resx @@ -120,12 +84,18 @@ PublicResXFileCodeGenerator Lang.Designer.cs + + Properties\AssemblyInfo.cs + + + Properties\Langs\LangProvider.tt TextTemplatingFileGenerator LangProvider.cs + Resources\dropper.cur @@ -198,9 +168,8 @@ Resources\Images\GlowWindow\topright.png - - + @@ -208,4 +177,4 @@ - + \ No newline at end of file diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml new file mode 100644 index 00000000..d441fcf2 --- /dev/null +++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/CheckComboBoxBaseStyle.xaml @@ -0,0 +1,586 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -