diff --git a/build/build.cake b/build/build.cake index 7d17c5cc..745cc7ce 100644 --- a/build/build.cake +++ b/build/build.cake @@ -64,7 +64,7 @@ Task("Build") { Configuration = "Release", Framework = "net5.0", - OutputDirectory = "lib/net50" + OutputDirectory = "lib/net5.0" }; DotNetCoreBuild("../src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj", settingsNet40); diff --git a/build/build.nuspec b/build/build.nuspec index 63028dbc..232dc078 100644 --- a/build/build.nuspec +++ b/build/build.nuspec @@ -2,7 +2,7 @@ HandyControl - 2.5.0.2 + 3.0.0-rc.1 HandyOrg HandyOrg HandyOrg @@ -25,6 +25,7 @@ + @@ -74,6 +75,17 @@ + + + + + + + + + + + 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 27ea16cb..b7b50a5e 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -6,6 +6,7 @@ net40 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico 0108 + true 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 1a5a3a2e..77e8ee5e 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -8,8 +8,9 @@ true snupkg 0067;0649;1591 + true - + bin\$(Configuration)\$(TargetFramework)\HandyControl.xml diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index a07b3848..ab9d4cac 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -6,6 +6,7 @@ netcoreapp3.0;netcoreapp3.1;net45;net462;net47;net48;net5.0 ..\..\Shared\HandyControlDemo_Shared\Resources\Img\icon.ico 0108 + true diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index 0c2a5ff4..9fae21a3 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -8,6 +8,7 @@ true snupkg 0067;0649;1591 + true bin\$(Configuration)\$(TargetFramework)\HandyControl.xml diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index 292313cf..36356852 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -1100,4 +1100,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AnimationPath.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AnimationPath.icon.bmp new file mode 100644 index 00000000..e75905dc Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.AnimationPath.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Arc.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Arc.icon.bmp new file mode 100644 index 00000000..60374549 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Arc.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Badge.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Badge.icon.bmp new file mode 100644 index 00000000..33e79209 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Badge.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.BlendEffectBox.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.BlendEffectBox.icon.bmp new file mode 100644 index 00000000..74ceecd2 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.BlendEffectBox.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ButtonGroup.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ButtonGroup.icon.bmp new file mode 100644 index 00000000..c20207cb Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ButtonGroup.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CalendarWithClock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CalendarWithClock.icon.bmp new file mode 100644 index 00000000..5228613d Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CalendarWithClock.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Card.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Card.icon.bmp new file mode 100644 index 00000000..a364463d Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Card.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Carousel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Carousel.icon.bmp new file mode 100644 index 00000000..a752c4db Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Carousel.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CheckComboBox.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CheckComboBox.icon.bmp new file mode 100644 index 00000000..b67eaead Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CheckComboBox.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CirclePanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CirclePanel.icon.bmp new file mode 100644 index 00000000..6ba8b2ea Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CirclePanel.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CircleProgressBar.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CircleProgressBar.icon.bmp new file mode 100644 index 00000000..8b03f289 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CircleProgressBar.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Clock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Clock.icon.bmp new file mode 100644 index 00000000..b244f277 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Clock.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Col.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Col.icon.bmp new file mode 100644 index 00000000..32d0589e Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Col.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ColorPicker.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ColorPicker.icon.bmp new file mode 100644 index 00000000..6dd8fb41 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ColorPicker.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CompareSlider.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CompareSlider.icon.bmp new file mode 100644 index 00000000..3cb5fc60 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CompareSlider.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ContextMenuButton.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ContextMenuButton.icon.bmp new file mode 100644 index 00000000..ad377afc Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ContextMenuButton.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ContextMenuToggleButton.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ContextMenuToggleButton.icon.bmp new file mode 100644 index 00000000..ad377afc Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ContextMenuToggleButton.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CoverFlow.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CoverFlow.icon.bmp new file mode 100644 index 00000000..2307d6e7 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CoverFlow.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CoverView.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CoverView.icon.bmp new file mode 100644 index 00000000..402ec272 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.CoverView.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.DashedBorder.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.DashedBorder.icon.bmp new file mode 100644 index 00000000..d2b305c3 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.DashedBorder.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.DateTimePicker.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.DateTimePicker.icon.bmp new file mode 100644 index 00000000..a25c8fab Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.DateTimePicker.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Dialog.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Dialog.icon.bmp new file mode 100644 index 00000000..54496c3a Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Dialog.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Divider.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Divider.icon.bmp new file mode 100644 index 00000000..69ccd529 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Divider.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Drawer.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Drawer.icon.bmp new file mode 100644 index 00000000..07a4bbbd Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Drawer.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlexPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlexPanel.icon.bmp new file mode 100644 index 00000000..0b4456e0 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlexPanel.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp new file mode 100644 index 00000000..c432a7c7 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.FlipClock.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.GifImage.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.GifImage.icon.bmp new file mode 100644 index 00000000..e75905dc Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.GifImage.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.GotoTop.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.GotoTop.icon.bmp new file mode 100644 index 00000000..69869210 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.GotoTop.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Gravatar.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Gravatar.icon.bmp new file mode 100644 index 00000000..aeecd441 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Gravatar.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Growl.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Growl.icon.bmp new file mode 100644 index 00000000..f0a6c5dc Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Growl.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.HoneycombPanel.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.HoneycombPanel.icon.bmp new file mode 100644 index 00000000..4c90e144 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.HoneycombPanel.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageBlock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageBlock.icon.bmp new file mode 100644 index 00000000..66f04b9e Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageBlock.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageSelector.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageSelector.icon.bmp new file mode 100644 index 00000000..3d51ea88 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageSelector.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageViewer.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageViewer.icon.bmp new file mode 100644 index 00000000..49b5c376 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ImageViewer.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ListClock.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ListClock.icon.bmp new file mode 100644 index 00000000..388d8c09 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.ListClock.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.LoadingCircle.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.LoadingCircle.icon.bmp new file mode 100644 index 00000000..8b03f289 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.LoadingCircle.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.LoadingLine.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.LoadingLine.icon.bmp new file mode 100644 index 00000000..8b03f289 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.LoadingLine.icon.bmp differ diff --git a/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Magnifier.icon.bmp b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Magnifier.icon.bmp new file mode 100644 index 00000000..a60b5a78 Binary files /dev/null and b/src/Shared/HandyControl_Shared/Resources/Icons/HandyControl.Controls.Magnifier.icon.bmp differ