V3.0.8 版本升级

.gitignore

@@ -341,3 +341,4 @@ ASALocalRun/
 # BeatPulse healthcheck temp database
 healthchecksdb
 /SunnyUI.Net5.Demo/bin/net5.0-windows
+/Bin/net472

SunnyUI.Demo/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0.7.0")]
+[assembly: AssemblyVersion("3.0.8.0")]
-[assembly: AssemblyFileVersion("3.0.7.0")]
+[assembly: AssemblyFileVersion("3.0.8.0")]

SunnyUI.Demo/SunnyUI.Demo.csproj

@@ -38,12 +38,12 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="SunnyUI, Version=3.0.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI, Version=3.0.8.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Bin\net40\SunnyUI.dll</HintPath>
     </Reference>
-    <Reference Include="SunnyUI.Common, Version=3.0.7.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
+    <Reference Include="SunnyUI.Common, Version=3.0.8.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
-      <HintPath>..\packages\SunnyUI.Common.3.0.7\lib\net40\SunnyUI.Common.dll</HintPath>
+      <HintPath>..\packages\SunnyUI.Common.3.0.8\lib\net40\SunnyUI.Common.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

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<string> H { get; set; }
 
         public string[] I { get; set; }

SunnyUI.Demo/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SunnyUI.Common" version="3.0.7" targetFramework="net40" />
+  <package id="SunnyUI.Common" version="3.0.8" targetFramework="net40" />
 </packages>

SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj

@@ -6,9 +6,9 @@
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>Sunny.UI.Demo</RootNamespace>
     <ApplicationIcon>SunnyUI.ico</ApplicationIcon>
-    <AssemblyVersion>3.0.7.0</AssemblyVersion>
+    <AssemblyVersion>3.0.8.0</AssemblyVersion>
-    <FileVersion>3.0.7.0</FileVersion>
+    <FileVersion>3.0.8.0</FileVersion>
-    <Version>3.0.7</Version>
+    <Version>3.0.8</Version>
     <Authors>SunnyUI</Authors>
     <Company>SunnyUI.Net</Company>
     <Copyright>Copyright ©SunnyUI.Net 2012-2021</Copyright>
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SunnyUI" Version="3.0.7" />
+    <PackageReference Include="SunnyUI" Version="3.0.8" />
   </ItemGroup>
 
   <ItemGroup>

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;

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;

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);

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;

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, T2>(T1 source, T2 dest)
+        private static void Execute<T1, T2>(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<T1, T2>(this T1 dest, T2 source)
             where T1 : class
             where T2 : class
         {
-            Mapper(source, dest);
+            Execute(source, dest);
         }
 
         public static Type GetArrayElementType(this Type t)

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;

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;

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;

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;

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;

SunnyUI/Properties/Resources.Designer.cs

@@ -200,7 +200,7 @@ namespace Sunny.UI.Properties {
         }
         
         /// <summary>
-        ///   查找类似 V3.0.7 的本地化字符串。
+        ///   查找类似 V3.0.8 的本地化字符串。
         /// </summary>
         internal static string Version {
             get {

SunnyUI/Properties/Resources.resx

@@ -162,8 +162,8 @@
     <value>..\Resources\notifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>V3.0.7</value>
+    <value>V3.0.8</value>
-    <comment>2021-09-08</comment>
+    <comment>2021-10-01</comment>
   </data>
   <data name="wind" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

SunnyUI/SunnyUI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 <PropertyGroup>
-    <TargetFrameworks>net5.0-windows;netcoreapp3.1;net462;net40</TargetFrameworks>
+    <TargetFrameworks>net5.0-windows;netcoreapp3.1;net472;net40</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <ProjectGuid>{AB1CB247-E20B-4CBE-B269-570ADDD96C53}</ProjectGuid>
     <UseWindowsForms>true</UseWindowsForms>
@@ -9,7 +9,7 @@
     <Description>SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
     <Copyright>CopyRight © SunnyUI.Net 2012-2021</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>3.0.7</Version>
+    <Version>3.0.8</Version>
     <Authors>ShenYonghua</Authors>
     <Company>SunnyUI.Net</Company>
     <PackageId>SunnyUI</PackageId>
@@ -56,7 +56,7 @@
 </ItemGroup>
  
 <ItemGroup>
-    <PackageReference Include="SunnyUI.Common" Version="3.0.7" />
+    <PackageReference Include="SunnyUI.Common" Version="3.0.8" />
 </ItemGroup>
 
 <ItemGroup Condition="'$(TargetFramework)' == 'net40'">
@@ -65,7 +65,7 @@
     <Reference Include="System.Design" />
 </ItemGroup>
 
-<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Design" />