diff --git a/.gitignore b/.gitignore
index c7c5b3d2..d67ce165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -341,3 +341,4 @@ ASALocalRun/
# BeatPulse healthcheck temp database
healthchecksdb
/SunnyUI.Net5.Demo/bin/net5.0-windows
+/Bin/net472
diff --git a/Bin/net40/SunnyUI.Common.dll b/Bin/net40/SunnyUI.Common.dll
index 81645e64..35a8ecc2 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 dd60f7dc..cbb808ec 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 1bc9dd2a..c602cd94 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/SunnyUI.Demo/Properties/AssemblyInfo.cs b/SunnyUI.Demo/Properties/AssemblyInfo.cs
index 96ba8362..e759a97e 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.7.0")]
-[assembly: AssemblyFileVersion("3.0.7.0")]
+[assembly: AssemblyVersion("3.0.8.0")]
+[assembly: AssemblyFileVersion("3.0.8.0")]
diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj
index f6bdbd82..cbc86a81 100644
--- a/SunnyUI.Demo/SunnyUI.Demo.csproj
+++ b/SunnyUI.Demo/SunnyUI.Demo.csproj
@@ -38,12 +38,12 @@
app.manifest
-
+
False
..\Bin\net40\SunnyUI.dll
-
- ..\packages\SunnyUI.Common.3.0.7\lib\net40\SunnyUI.Common.dll
+
+ ..\packages\SunnyUI.Common.3.0.8\lib\net40\SunnyUI.Common.dll
diff --git a/SunnyUI.Demo/Units/UMapperDemo.cs b/SunnyUI.Demo/Units/UMapperDemo.cs
index 63c1bfb2..1734d5a5 100644
--- a/SunnyUI.Demo/Units/UMapperDemo.cs
+++ b/SunnyUI.Demo/Units/UMapperDemo.cs
@@ -1,5 +1,4 @@
-using Sunny.UI.Static;
-using System;
+using System;
using System.Collections.Generic;
using System.Drawing;
@@ -30,6 +29,7 @@ namespace Sunny.UI.Demo
{
public string A { get; set; }
+ [MapperIgnore]
public int B { get; set; }
public double C { get; set; }
@@ -61,6 +61,9 @@ namespace Sunny.UI.Demo
public MapperT3 F { get; set; }
+ [MapperIgnore]
+ public Size G { get; set; }
+
public List H { get; set; }
public string[] I { get; set; }
diff --git a/SunnyUI.Demo/packages.config b/SunnyUI.Demo/packages.config
index da693c7d..101f8ea7 100644
--- a/SunnyUI.Demo/packages.config
+++ b/SunnyUI.Demo/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
index 2b2e22a3..d1494e45 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.7.0
- 3.0.7.0
- 3.0.7
+ 3.0.8.0
+ 3.0.8.0
+ 3.0.8
SunnyUI
SunnyUI.Net
Copyright ©SunnyUI.Net 2012-2021
@@ -25,7 +25,7 @@
-
+
diff --git a/SunnyUI/Charts/UIDoughnutChart.cs b/SunnyUI/Charts/UIDoughnutChart.cs
index 396101e0..916a5fc6 100644
--- a/SunnyUI/Charts/UIDoughnutChart.cs
+++ b/SunnyUI/Charts/UIDoughnutChart.cs
@@ -20,7 +20,6 @@
* 2021-07-22: V3.0.5 增加更新数据的方法
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
diff --git a/SunnyUI/Charts/UIPieChart.cs b/SunnyUI/Charts/UIPieChart.cs
index 44df279c..2348350a 100644
--- a/SunnyUI/Charts/UIPieChart.cs
+++ b/SunnyUI/Charts/UIPieChart.cs
@@ -20,7 +20,6 @@
* 2021-07-22: V3.0.5 增加更新数据的方法
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
diff --git a/SunnyUI/Common/UGDI.cs b/SunnyUI/Common/UGDI.cs
index f440ee8e..1eb25c55 100644
--- a/SunnyUI/Common/UGDI.cs
+++ b/SunnyUI/Common/UGDI.cs
@@ -334,11 +334,6 @@ namespace Sunny.UI
return color == Color.Empty || color == Color.Transparent;
}
- public static bool IsValid(this Color color)
- {
- return !color.IsNullOrEmpty();
- }
-
public static SolidBrush Brush(this Color color)
{
return new SolidBrush(color);
diff --git a/SunnyUI/Common/UGraphics.cs b/SunnyUI/Common/UGraphics.cs
index 9b4cbe88..60eeab9f 100644
--- a/SunnyUI/Common/UGraphics.cs
+++ b/SunnyUI/Common/UGraphics.cs
@@ -19,7 +19,6 @@
* 2021-08-20: V3.0.6 整理了一些GDI绘图的常用方法扩展
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.Collections.Generic;
using System.Drawing;
diff --git a/SunnyUI/Common/UMapper.cs b/SunnyUI/Common/UMapper.cs
index cee2eeb6..43dd46fd 100644
--- a/SunnyUI/Common/UMapper.cs
+++ b/SunnyUI/Common/UMapper.cs
@@ -27,9 +27,9 @@ using System.Reflection;
namespace Sunny.UI
{
- public static class SunnyMapper
+ public static class Mapper
{
- private static void Mapper(T1 source, T2 dest)
+ private static void Execute(T1 source, T2 dest)
where T1 : class
where T2 : class
{
@@ -161,14 +161,14 @@ namespace Sunny.UI
where T1 : class
where T2 : class
{
- Mapper(source, dest);
+ Execute(source, dest);
}
public static void MapperFrom(this T1 dest, T2 source)
where T1 : class
where T2 : class
{
- Mapper(source, dest);
+ Execute(source, dest);
}
public static Type GetArrayElementType(this Type t)
diff --git a/SunnyUI/Controls/UIRoundProcess.cs b/SunnyUI/Controls/UIRoundProcess.cs
index 20107be7..cb81718d 100644
--- a/SunnyUI/Controls/UIRoundProcess.cs
+++ b/SunnyUI/Controls/UIRoundProcess.cs
@@ -19,7 +19,6 @@
* 2021-04-08: V3.0.2 增加文件说明
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.ComponentModel;
using System.Drawing;
diff --git a/SunnyUI/Controls/UITabControl.cs b/SunnyUI/Controls/UITabControl.cs
index 49024a03..1760123d 100644
--- a/SunnyUI/Controls/UITabControl.cs
+++ b/SunnyUI/Controls/UITabControl.cs
@@ -25,7 +25,6 @@
* 2021-08-14: V3.0.6 增加DisposeTabPageAfterRemove标志，移除TabPage后，是否自动销毁TabPage
******************************************************************************/
-using Sunny.UI.Static;
using Sunny.UI.Win32;
using System;
using System.Collections.Generic;
diff --git a/SunnyUI/Controls/UITitlePanel.cs b/SunnyUI/Controls/UITitlePanel.cs
index ca48b583..b7685424 100644
--- a/SunnyUI/Controls/UITitlePanel.cs
+++ b/SunnyUI/Controls/UITitlePanel.cs
@@ -22,7 +22,6 @@
* 2020-09-03: V3.0.6 增加标题文字颜色
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.ComponentModel;
using System.Drawing;
diff --git a/SunnyUI/Forms/UIForm.cs b/SunnyUI/Forms/UIForm.cs
index 58c05c01..2bf89cb6 100644
--- a/SunnyUI/Forms/UIForm.cs
+++ b/SunnyUI/Forms/UIForm.cs
@@ -28,7 +28,6 @@
* 2021-08-17: V3.0.6 适应主屏幕任务栏在屏幕各个方向均可
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.Collections.Generic;
using System.ComponentModel;
diff --git a/SunnyUI/Frames/UIPage.cs b/SunnyUI/Frames/UIPage.cs
index 1e5d652d..a21bd039 100644
--- a/SunnyUI/Frames/UIPage.cs
+++ b/SunnyUI/Frames/UIPage.cs
@@ -24,7 +24,6 @@
* 2021-08-24: V3.0.6 修复OnLoad在加载时重复加载两次的问题
******************************************************************************/
-using Sunny.UI.Static;
using System;
using System.ComponentModel;
using System.Diagnostics;
diff --git a/SunnyUI/Properties/Resources.Designer.cs b/SunnyUI/Properties/Resources.Designer.cs
index 3dbeeb3e..bbf823a5 100644
--- a/SunnyUI/Properties/Resources.Designer.cs
+++ b/SunnyUI/Properties/Resources.Designer.cs
@@ -200,7 +200,7 @@ namespace Sunny.UI.Properties {
}
///
- /// 查找类似 V3.0.7 的本地化字符串。
+ /// 查找类似 V3.0.8 的本地化字符串。
///
internal static string Version {
get {
diff --git a/SunnyUI/Properties/Resources.resx b/SunnyUI/Properties/Resources.resx
index d38d7927..a49e90c2 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.7
- 2021-09-08
+ V3.0.8
+ 2021-10-01
..\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 2dce46aa..d632da6d 100644
--- a/SunnyUI/SunnyUI.csproj
+++ b/SunnyUI/SunnyUI.csproj
@@ -1,7 +1,7 @@
- net5.0-windows;netcoreapp3.1;net462;net40
+ net5.0-windows;netcoreapp3.1;net472;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.7
+ 3.0.8
ShenYonghua
SunnyUI.Net
SunnyUI
@@ -56,7 +56,7 @@
-
+
@@ -65,7 +65,7 @@
-
+