diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index f5471605..cae0129a 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index dcf40dad..08d5d68e 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.deps.json b/Bin/net5.0-windows/SunnyUI.deps.json
index 60c66244..124bf079 100644
--- a/Bin/net5.0-windows/SunnyUI.deps.json
+++ b/Bin/net5.0-windows/SunnyUI.deps.json
@@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v5.0": {
- "SunnyUI/3.0.0": {
+ "SunnyUI/3.0.1": {
"dependencies": {
"SunnyUI.Common": "3.0.0"
},
@@ -25,7 +25,7 @@
}
},
"libraries": {
- "SunnyUI/3.0.0": {
+ "SunnyUI/3.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 9041db45..3df23e84 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll
index 68f48d3b..c12b5264 100644
Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.deps.json b/Bin/netcoreapp3.1/SunnyUI.deps.json
index b3e05ad4..2d6b1038 100644
--- a/Bin/netcoreapp3.1/SunnyUI.deps.json
+++ b/Bin/netcoreapp3.1/SunnyUI.deps.json
@@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v3.1": {
- "SunnyUI/3.0.0": {
+ "SunnyUI/3.0.1": {
"dependencies": {
"SunnyUI.Common": "3.0.0"
},
@@ -25,7 +25,7 @@
}
},
"libraries": {
- "SunnyUI/3.0.0": {
+ "SunnyUI/3.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index fd5a5b20..f8a8eeae 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Properties/AssemblyInfo.cs b/SunnyUI.Demo/Properties/AssemblyInfo.cs
index 9b06d420..1c7f74ac 100644
--- a/SunnyUI.Demo/Properties/AssemblyInfo.cs
+++ b/SunnyUI.Demo/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
+[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyFileVersion("3.0.1.0")]
diff --git a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
index 688742b4..8cf9663f 100644
--- a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
+++ b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
@@ -8,7 +8,7 @@
SunnyUI.ico
3.0.0.0
3.0.0.0
- 3.0.0
+ 3.0.1
SunnyUI
SunnyUI.Net
Copyright ©SunnyUI.Net 2012-2021
@@ -24,7 +24,7 @@
-
+
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
index 125be8d1..2cddc8fb 100644
--- a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
+++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
@@ -6,7 +6,7 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v5.0": {
- "SunnyUI.Net5.Demo/3.0.0": {
+ "SunnyUI.Net5.Demo/3.0.1": {
"dependencies": {
"SunnyUI": "3.0.0"
},
@@ -36,7 +36,7 @@
}
},
"libraries": {
- "SunnyUI.Net5.Demo/3.0.0": {
+ "SunnyUI.Net5.Demo/3.0.1": {
"type": "project",
"serviceable": false,
"sha512": ""
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll
index f66a94ed..a61a472a 100644
Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll differ
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe
index 62a08fb3..bdefaafc 100644
Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe differ
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
index 376e9695..14df11c9 100644
--- a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
+++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
@@ -1,8 +1,8 @@
{
"runtimeOptions": {
"additionalProbingPaths": [
- "C:\\Users\\Administrator\\.dotnet\\store\\|arch|\\|tfm|",
- "C:\\Users\\Administrator\\.nuget\\packages",
+ "C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|",
+ "C:\\Users\\Sunny\\.nuget\\packages",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
]
}
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll
index a8f3ac43..624fd84c 100644
Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll differ
diff --git a/SunnyUI/Controls/UIButton.cs b/SunnyUI/Controls/UIButton.cs
index 1b5f0277..b54c1c34 100644
--- a/SunnyUI/Controls/UIButton.cs
+++ b/SunnyUI/Controls/UIButton.cs
@@ -150,6 +150,7 @@ namespace Sunny.UI
private Color tipsColor = Color.Red;
+ [Description("角标文字颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "Red")]
public Color TipsColor
{
diff --git a/SunnyUI/Controls/UISwitch.cs b/SunnyUI/Controls/UISwitch.cs
index 8d2c77d5..ef49522f 100644
--- a/SunnyUI/Controls/UISwitch.cs
+++ b/SunnyUI/Controls/UISwitch.cs
@@ -28,7 +28,7 @@ using System.Drawing.Drawing2D;
namespace Sunny.UI
{
[DefaultEvent("ValueChanged")]
- [DefaultProperty("ActiveValue")]
+ [DefaultProperty("Active")]
[ToolboxItem(true)]
public sealed class UISwitch : UIControl
{
diff --git a/SunnyUI/Properties/Resources.Designer.cs b/SunnyUI/Properties/Resources.Designer.cs
index 2e02df36..47ea30c6 100644
--- a/SunnyUI/Properties/Resources.Designer.cs
+++ b/SunnyUI/Properties/Resources.Designer.cs
@@ -200,7 +200,7 @@ namespace Sunny.UI.Properties {
}
///
- /// 查找类似 V3.0.0 的本地化字符串。
+ /// 查找类似 V3.0.1 的本地化字符串。
///
internal static string Version {
get {
diff --git a/SunnyUI/Properties/Resources.resx b/SunnyUI/Properties/Resources.resx
index fd10dc06..fdaff8a7 100644
--- a/SunnyUI/Properties/Resources.resx
+++ b/SunnyUI/Properties/Resources.resx
@@ -156,14 +156,14 @@
SunnyUI.Net
- 基于 GPL-3.0 的 .Net Framework 4.0+、.Net Core3.1、.Net 5 WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
+ 基于 .Net Framework 4.0+、.Net Core3.1、.Net 5 WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
..\Resources\notifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- V3.0.0
- 2021-01-01
+ V3.0.1
+ 2021-01-28
..\Resources\wind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj
index 47bf6f49..042dcdd0 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -5,17 +5,17 @@
{AB1CB247-E20B-4CBE-B269-570ADDD96C53}
true
Sunny.UI
- 基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
+ SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
CopyRight © SunnyUI.Net 2012-2021
LICENSE
- 3.0.0
+ 3.0.1
ShenYonghua
SunnyUI.Net
SunnyUI
https://gitee.com/yhuse/SunnyUI
https://gitee.com/yhuse/SunnyUI
false
- true
+ false
SunnyUI.png
@@ -54,7 +54,7 @@
-
+