diff --git a/Bin/net40/SunnyUI.Common.dll b/Bin/net40/SunnyUI.Common.dll
index 5a11edef..261f9a4a 100644
Binary files a/Bin/net40/SunnyUI.Common.dll and b/Bin/net40/SunnyUI.Common.dll differ
diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index 08c92a50..d40da9e5 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 3e1fb77e..69441f16 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net45/SunnyUI.Common.dll b/Bin/net45/SunnyUI.Common.dll
deleted file mode 100644
index 5ad29e0e..00000000
Binary files a/Bin/net45/SunnyUI.Common.dll and /dev/null differ
diff --git a/Bin/net462/SunnyUI.Common.dll b/Bin/net462/SunnyUI.Common.dll
new file mode 100644
index 00000000..b3c7a72a
Binary files /dev/null and b/Bin/net462/SunnyUI.Common.dll differ
diff --git a/Bin/net45/SunnyUI.dll b/Bin/net462/SunnyUI.dll
similarity index 55%
rename from Bin/net45/SunnyUI.dll
rename to Bin/net462/SunnyUI.dll
index 8c54a01e..92b72b1d 100644
Binary files a/Bin/net45/SunnyUI.dll and b/Bin/net462/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.deps.json b/Bin/net5.0-windows/SunnyUI.deps.json
index d5eff432..83506c5d 100644
--- a/Bin/net5.0-windows/SunnyUI.deps.json
+++ b/Bin/net5.0-windows/SunnyUI.deps.json
@@ -6,36 +6,36 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v5.0": {
- "SunnyUI/3.0.5": {
+ "SunnyUI/3.0.6": {
"dependencies": {
- "SunnyUI.Common": "3.0.5"
+ "SunnyUI.Common": "3.0.6"
},
"runtime": {
"SunnyUI.dll": {}
}
},
- "SunnyUI.Common/3.0.5": {
+ "SunnyUI.Common/3.0.6": {
"runtime": {
"lib/net5.0/SunnyUI.Common.dll": {
- "assemblyVersion": "3.0.5.0",
- "fileVersion": "3.0.5.0"
+ "assemblyVersion": "3.0.6.0",
+ "fileVersion": "3.0.6.0"
}
}
}
}
},
"libraries": {
- "SunnyUI/3.0.5": {
+ "SunnyUI/3.0.6": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "SunnyUI.Common/3.0.5": {
+ "SunnyUI.Common/3.0.6": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-bP9fQW8P4fJAV6FfU2Xfw3MtOduLoj/j+MRfdIn3eq9bGqDepg/w5/xqXi393Vuxvxk24eY9+5YMRVyeS+tiRg==",
- "path": "sunnyui.common/3.0.5",
- "hashPath": "sunnyui.common.3.0.5.nupkg.sha512"
+ "sha512": "sha512-yzYi+kU3zvox8QLQ34Hhgj3rg6nniwE2Tbt77sDDV/gM2++jqVCVYVIOwvd0p/eMqu1UrNsDQax6L8AGkfZMyA==",
+ "path": "sunnyui.common/3.0.6",
+ "hashPath": "sunnyui.common.3.0.6.nupkg.sha512"
}
}
}
\ No newline at end of file
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 245280d9..3c72d084 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 68d897d7..1f3df78c 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 527fff3c..9d863a83 100644
--- a/Bin/netcoreapp3.1/SunnyUI.deps.json
+++ b/Bin/netcoreapp3.1/SunnyUI.deps.json
@@ -6,36 +6,36 @@
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v3.1": {
- "SunnyUI/3.0.5": {
+ "SunnyUI/3.0.6": {
"dependencies": {
- "SunnyUI.Common": "3.0.5"
+ "SunnyUI.Common": "3.0.6"
},
"runtime": {
"SunnyUI.dll": {}
}
},
- "SunnyUI.Common/3.0.5": {
+ "SunnyUI.Common/3.0.6": {
"runtime": {
"lib/netcoreapp3.1/SunnyUI.Common.dll": {
- "assemblyVersion": "3.0.5.0",
- "fileVersion": "3.0.5.0"
+ "assemblyVersion": "3.0.6.0",
+ "fileVersion": "3.0.6.0"
}
}
}
}
},
"libraries": {
- "SunnyUI/3.0.5": {
+ "SunnyUI/3.0.6": {
"type": "project",
"serviceable": false,
"sha512": ""
},
- "SunnyUI.Common/3.0.5": {
+ "SunnyUI.Common/3.0.6": {
"type": "package",
"serviceable": true,
- "sha512": "sha512-bP9fQW8P4fJAV6FfU2Xfw3MtOduLoj/j+MRfdIn3eq9bGqDepg/w5/xqXi393Vuxvxk24eY9+5YMRVyeS+tiRg==",
- "path": "sunnyui.common/3.0.5",
- "hashPath": "sunnyui.common.3.0.5.nupkg.sha512"
+ "sha512": "sha512-yzYi+kU3zvox8QLQ34Hhgj3rg6nniwE2Tbt77sDDV/gM2++jqVCVYVIOwvd0p/eMqu1UrNsDQax6L8AGkfZMyA==",
+ "path": "sunnyui.common/3.0.6",
+ "hashPath": "sunnyui.common.3.0.6.nupkg.sha512"
}
}
}
\ No newline at end of file
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index efe19f7a..a8cf004c 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 37e23ad3..7374d636 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.5.0")]
-[assembly: AssemblyFileVersion("3.0.5.0")]
+[assembly: AssemblyVersion("3.0.6.0")]
+[assembly: AssemblyFileVersion("3.0.6.0")]
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index 4663ed73..3bbc4626 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -35,13 +35,12 @@
SunnyUI.ico
-
+
False
..\Bin\net40\SunnyUI.dll
-
- False
- ..\Bin\net40\SunnyUI.Common.dll
+
+ ..\packages\SunnyUI.Common.3.0.6\lib\net40\SunnyUI.Common.dll
@@ -522,6 +521,7 @@
.editorconfig
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
new file mode 100644
index 00000000..16032b60
--- /dev/null
+++ b/SunnyUI.Demo/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/SunnyUI.Net5.Demo/Controls/FFlowLayoutPanel.cs b/SunnyUI.Net5.Demo/Controls/FFlowLayoutPanel.cs
index a4455f2d..3db8002f 100644
--- a/SunnyUI.Net5.Demo/Controls/FFlowLayoutPanel.cs
+++ b/SunnyUI.Net5.Demo/Controls/FFlowLayoutPanel.cs
@@ -26,7 +26,7 @@
{
UIButton btn = new UIButton();
btn.Text = "Button" + index++.ToString("D2");
- uiFlowLayoutPanel1.AddControl(btn);
+ uiFlowLayoutPanel1.Add(btn);
}
}
}
diff --git a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
index c7faa4e1..d90b48f7 100644
--- a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
+++ b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
@@ -6,9 +6,9 @@
true
Sunny.UI.Demo
SunnyUI.ico
- 3.0.5.0
- 3.0.5.0
- 3.0.5
+ 3.0.6.0
+ 3.0.6.0
+ 3.0.6
SunnyUI
SunnyUI.Net
Copyright ©SunnyUI.Net 2012-2021
@@ -24,7 +24,7 @@
-
+
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll
new file mode 100644
index 00000000..f4c2c627
Binary files /dev/null and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll differ
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
new file mode 100644
index 00000000..9272b498
--- /dev/null
+++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
@@ -0,0 +1,59 @@
+{
+ "runtimeTarget": {
+ "name": ".NETCoreApp,Version=v5.0",
+ "signature": ""
+ },
+ "compilationOptions": {},
+ "targets": {
+ ".NETCoreApp,Version=v5.0": {
+ "SunnyUI.Net5.Demo/3.0.6": {
+ "dependencies": {
+ "SunnyUI": "3.0.6"
+ },
+ "runtime": {
+ "SunnyUI.Net5.Demo.dll": {}
+ }
+ },
+ "SunnyUI/3.0.6": {
+ "dependencies": {
+ "SunnyUI.Common": "3.0.6"
+ },
+ "runtime": {
+ "lib/net5.0-windows7.0/SunnyUI.dll": {
+ "assemblyVersion": "3.0.6.0",
+ "fileVersion": "3.0.6.0"
+ }
+ }
+ },
+ "SunnyUI.Common/3.0.6": {
+ "runtime": {
+ "lib/net5.0/SunnyUI.Common.dll": {
+ "assemblyVersion": "3.0.6.0",
+ "fileVersion": "3.0.6.0"
+ }
+ }
+ }
+ }
+ },
+ "libraries": {
+ "SunnyUI.Net5.Demo/3.0.6": {
+ "type": "project",
+ "serviceable": false,
+ "sha512": ""
+ },
+ "SunnyUI/3.0.6": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-lS2AD3CrSMRnzwjrh9FxNYgU4CzPd7+XYwaX5TgurnDAFWkLGTZrLn4q05pDB/4TqwzAPcUJfwSlIgMtFtUEHg==",
+ "path": "sunnyui/3.0.6",
+ "hashPath": "sunnyui.3.0.6.nupkg.sha512"
+ },
+ "SunnyUI.Common/3.0.6": {
+ "type": "package",
+ "serviceable": true,
+ "sha512": "sha512-yzYi+kU3zvox8QLQ34Hhgj3rg6nniwE2Tbt77sDDV/gM2++jqVCVYVIOwvd0p/eMqu1UrNsDQax6L8AGkfZMyA==",
+ "path": "sunnyui.common/3.0.6",
+ "hashPath": "sunnyui.common.3.0.6.nupkg.sha512"
+ }
+ }
+}
\ No newline at end of file
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
new file mode 100644
index 00000000..6209ece6
Binary files /dev/null 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
new file mode 100644
index 00000000..33b9f47d
Binary files /dev/null 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
new file mode 100644
index 00000000..14df11c9
--- /dev/null
+++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
@@ -0,0 +1,9 @@
+{
+ "runtimeOptions": {
+ "additionalProbingPaths": [
+ "C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|",
+ "C:\\Users\\Sunny\\.nuget\\packages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json
new file mode 100644
index 00000000..dae617c0
--- /dev/null
+++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.json
@@ -0,0 +1,9 @@
+{
+ "runtimeOptions": {
+ "tfm": "net5.0",
+ "framework": {
+ "name": "Microsoft.WindowsDesktop.App",
+ "version": "5.0.0"
+ }
+ }
+}
\ No newline at end of file
diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll
new file mode 100644
index 00000000..74762afb
Binary files /dev/null and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll differ
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
new file mode 100644
index 00000000..96e93784
Binary files /dev/null and b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll differ
diff --git a/SunnyUI/Properties/Resources.Designer.cs b/SunnyUI/Properties/Resources.Designer.cs
index 1634077e..657b25c8 100644
--- a/SunnyUI/Properties/Resources.Designer.cs
+++ b/SunnyUI/Properties/Resources.Designer.cs
@@ -200,7 +200,7 @@ namespace Sunny.UI.Properties {
}
///
- /// 查找类似 V3.0.5 的本地化字符串。
+ /// 查找类似 V3.0.6 的本地化字符串。
///
internal static string Version {
get {
diff --git a/SunnyUI/Properties/Resources.resx b/SunnyUI/Properties/Resources.resx
index 79593fa0..78b04d7a 100644
--- a/SunnyUI/Properties/Resources.resx
+++ b/SunnyUI/Properties/Resources.resx
@@ -162,8 +162,8 @@
..\Resources\notifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- V3.0.5
- 2021-07-11
+ V3.0.6
+ 2021-08-12
..\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 76c21b7c..bafed0f9 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -1,7 +1,7 @@
- net5.0-windows;netcoreapp3.1;net40;net45
+ net5.0-windows;netcoreapp3.1;net462;net40
9.0
{AB1CB247-E20B-4CBE-B269-570ADDD96C53}
true
@@ -9,7 +9,7 @@
SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。
CopyRight © SunnyUI.Net 2012-2021
LICENSE
- 3.0.5
+ 3.0.6
ShenYonghua
SunnyUI.Net
SunnyUI
@@ -56,7 +56,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
diff --git a/Updates.md b/Updates.md
index 9f011b01..99ed3e36 100644
--- a/Updates.md
+++ b/Updates.md
@@ -1,5 +1,51 @@
:fa-plus:增加； :fa-asterisk:修改； :fa-minus:删除
+#### 2021-08-12 V3.0.6
+:fa-plus: UIPipe: 增加管道控件
+:fa-plus: UIValve: 增加阀门控件
+:fa-plus: UIStyle：增加多彩主题，以颜色深色，文字白色为主
+:fa-plus: UIStyle：增加紫色主题
+:fa-plus: UITableLayoutPanel：增加控件
+:fa-plus: Demo：增加工控分类
+:fa-plus: ITranslate：增加多语翻译接口
+:fa-plus: UGif: GIF图片解析类
+:fa-plus: SunnyUI: Nuget项目引用增加签名
+:fa-asterisk: UIFlowLayoutPanel: 增加了几个原生方法
+:fa-asterisk: UITransfer: 增加了显示多个移动的属性
+:fa-asterisk: UIProcessBar: 增加垂直方向的进度显示
+:fa-asterisk: UILight: 默认不显示灯光亮线
+:fa-asterisk: UINavMenu：显示子节点提示箭头
+:fa-asterisk: UINavBar: 增加选中项圆角
+:fa-asterisk: UIImageListBox: 从文件载入图片，并且解除占用
+:fa-asterisk: UICombobox: 增加几个原生方法
+:fa-asterisk: UIListBox: 增加一大波ListBox原生方法
+:fa-asterisk: UIListBox：增加Items变更的事件
+:fa-asterisk: UIForm: 修复最大化盖住任务栏的问题
+:fa-asterisk: UITextBox: 增加GotFocus和LostFocus事件
+:fa-asterisk: UIFlowLayoutPanel: 可像原生控件一样通过Controls.Add增加
+:fa-asterisk: UIListBox: 选中项显示方角
+:fa-asterisk: UIListBox：增加多选行
+:fa-asterisk: UIComboTreeView : 修复SelectedNode=null的问题
+:fa-asterisk: UIRichTextBox: 修改滚动条没有文字时自动隐藏
+:fa-asterisk: UIPage: 修复OnMouseMove事件
+:fa-asterisk: UIStyle: 更新了放在TableLayoutPanel里控件的自定义颜色问题
+:fa-asterisk: UILocalize: 内置支付串已经处理完国际化
+:fa-asterisk: UILineChart：可自定义背景色
+:fa-asterisk: UILineChart：增加实时数据的Demo
+:fa-asterisk: UIBarChart, UIPieChart, UIDoughnutChart增加更新数据的方法
+:fa-asterisk: UITreeView: 调整了显示CheckBoxes时图片位置
+:fa-asterisk: ISymbol: 将字体图标最大尺寸从64调整到128
+:fa-asterisk: UITextBox: 修改Focus可用
+:fa-asterisk: UIButton：增加ShowFocusColor，用来显示Focus状态
+:fa-asterisk: UIPage：修复OnLoad在加载时重复加载两次的问题，增加Final函数，每次页面切换，退出页面都会执行
+:fa-asterisk: UIStyle: 多彩颜色增加随机颜色Demo
+:fa-asterisk: UIScrollingText: 增加属性控制开启滚动
+:fa-asterisk: UIPage：恢复删除的Initialize事件
+:fa-asterisk: ISytle：调整主题切换执行流程
+:fa-asterisk: IStyle：支持自定义主题
+:fa-asterisk: ISymbol：增加SymbolOffset接口
+:fa-asterisk: UITabControl：支持Tab在下方显示
+
#### 2021-07-11 V3.0.5
:fa-plus: 字体图标：增加FontAwesome V5.15版本字体图标
:fa-plus: UISignal: 增加信号强度显示控件