diff --git a/Bin/net40/SunnyUI.Common.dll b/Bin/net40/SunnyUI.Common.dll index 5e2cbee3..f11b8f4d 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 976b2a8e..03d9e9fc 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 b16f01eb..ca3bf89d 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 e5a5446d..66b85bfb 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.2": { + "SunnyUI/3.0.3": { "dependencies": { - "SunnyUI.Common": "3.0.2" + "SunnyUI.Common": "3.0.3" }, "runtime": { "SunnyUI.dll": {} } }, - "SunnyUI.Common/3.0.2": { + "SunnyUI.Common/3.0.3": { "runtime": { "lib/net5.0/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.2.0", - "fileVersion": "3.0.2.0" + "assemblyVersion": "3.0.3.0", + "fileVersion": "3.0.3.0" } } } } }, "libraries": { - "SunnyUI/3.0.2": { + "SunnyUI/3.0.3": { "type": "project", "serviceable": false, "sha512": "" }, - "SunnyUI.Common/3.0.2": { + "SunnyUI.Common/3.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-8BwpLQ/GY+ZdFheNn1UP+mjg6bd9KFswOs+PcZ9yoit1f8isgcUYmE0h+zMDV8rVbhTLYHy+CsuyryJWMUR00g==", - "path": "sunnyui.common/3.0.2", - "hashPath": "sunnyui.common.3.0.2.nupkg.sha512" + "sha512": "sha512-l1LSJK1mnk/GKQzKDFi3mKf9T+l+TEEerKU0zcEjkPfA2i3Y3UfAAcSRYfjxah8+DSsL3UVghKPEXYYFnhfk5Q==", + "path": "sunnyui.common/3.0.3", + "hashPath": "sunnyui.common.3.0.3.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 92f890c0..e21a57b6 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 d6d2d526..313b442f 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 912eefe3..ee216b39 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.2": { + "SunnyUI/3.0.3": { "dependencies": { - "SunnyUI.Common": "3.0.2" + "SunnyUI.Common": "3.0.3" }, "runtime": { "SunnyUI.dll": {} } }, - "SunnyUI.Common/3.0.2": { + "SunnyUI.Common/3.0.3": { "runtime": { "lib/netcoreapp3.1/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.2.0", - "fileVersion": "3.0.2.0" + "assemblyVersion": "3.0.3.0", + "fileVersion": "3.0.3.0" } } } } }, "libraries": { - "SunnyUI/3.0.2": { + "SunnyUI/3.0.3": { "type": "project", "serviceable": false, "sha512": "" }, - "SunnyUI.Common/3.0.2": { + "SunnyUI.Common/3.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-8BwpLQ/GY+ZdFheNn1UP+mjg6bd9KFswOs+PcZ9yoit1f8isgcUYmE0h+zMDV8rVbhTLYHy+CsuyryJWMUR00g==", - "path": "sunnyui.common/3.0.2", - "hashPath": "sunnyui.common.3.0.2.nupkg.sha512" + "sha512": "sha512-l1LSJK1mnk/GKQzKDFi3mKf9T+l+TEEerKU0zcEjkPfA2i3Y3UfAAcSRYfjxah8+DSsL3UVghKPEXYYFnhfk5Q==", + "path": "sunnyui.common/3.0.3", + "hashPath": "sunnyui.common.3.0.3.nupkg.sha512" } } } \ No newline at end of file diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index 4b066c05..9a393f16 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 9980011a..9d643063 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.2.0")] -[assembly: AssemblyFileVersion("3.0.2.0")] +[assembly: AssemblyVersion("3.0.3.0")] +[assembly: AssemblyFileVersion("3.0.3.0")] diff --git a/SunnyUI.Demo/SunnyUI.Demo.csproj b/SunnyUI.Demo/SunnyUI.Demo.csproj index c4f8a53b..f3836e64 100644 --- a/SunnyUI.Demo/SunnyUI.Demo.csproj +++ b/SunnyUI.Demo/SunnyUI.Demo.csproj @@ -35,11 +35,11 @@ SunnyUI.ico - + False ..\Bin\net40\SunnyUI.dll - + False ..\Bin\net40\SunnyUI.Common.dll diff --git a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj index 41db2ae6..a484ab90 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.2.0 - 3.0.2.0 - 3.0.2 + 3.0.3.0 + 3.0.3.0 + 3.0.3 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 index a9527a58..887331b7 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll 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 index 104ae77e..9320b919 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,54 +6,54 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v5.0": { - "SunnyUI.Net5.Demo/3.0.2": { + "SunnyUI.Net5.Demo/3.0.3": { "dependencies": { - "SunnyUI": "3.0.2" + "SunnyUI": "3.0.3" }, "runtime": { "SunnyUI.Net5.Demo.dll": {} } }, - "SunnyUI/3.0.2": { + "SunnyUI/3.0.3": { "dependencies": { - "SunnyUI.Common": "3.0.2" + "SunnyUI.Common": "3.0.3" }, "runtime": { "lib/net5.0-windows7.0/SunnyUI.dll": { - "assemblyVersion": "3.0.2.0", - "fileVersion": "3.0.2.0" + "assemblyVersion": "3.0.3.0", + "fileVersion": "3.0.3.0" } } }, - "SunnyUI.Common/3.0.2": { + "SunnyUI.Common/3.0.3": { "runtime": { "lib/net5.0/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.2.0", - "fileVersion": "3.0.2.0" + "assemblyVersion": "3.0.3.0", + "fileVersion": "3.0.3.0" } } } } }, "libraries": { - "SunnyUI.Net5.Demo/3.0.2": { + "SunnyUI.Net5.Demo/3.0.3": { "type": "project", "serviceable": false, "sha512": "" }, - "SunnyUI/3.0.2": { + "SunnyUI/3.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-5hGszdUhh7YHHNdj2QqO0J3zyt8rxD6bT4Gq7jm0QTdTVyl/64Pn4CGouBuV1Qm1nahKxCAAI+LVCUbHvQScjQ==", - "path": "sunnyui/3.0.2", - "hashPath": "sunnyui.3.0.2.nupkg.sha512" + "sha512": "sha512-LpxAsfV06pLl2+YPdd0irhcD2cVX2mK8uUob3wRlYE1mAVFe6T9S576KGys+gaOwCNyds7DABFWtN4Kue7ipTA==", + "path": "sunnyui/3.0.3", + "hashPath": "sunnyui.3.0.3.nupkg.sha512" }, - "SunnyUI.Common/3.0.2": { + "SunnyUI.Common/3.0.3": { "type": "package", "serviceable": true, - "sha512": "sha512-8BwpLQ/GY+ZdFheNn1UP+mjg6bd9KFswOs+PcZ9yoit1f8isgcUYmE0h+zMDV8rVbhTLYHy+CsuyryJWMUR00g==", - "path": "sunnyui.common/3.0.2", - "hashPath": "sunnyui.common.3.0.2.nupkg.sha512" + "sha512": "sha512-l1LSJK1mnk/GKQzKDFi3mKf9T+l+TEEerKU0zcEjkPfA2i3Y3UfAAcSRYfjxah8+DSsL3UVghKPEXYYFnhfk5Q==", + "path": "sunnyui.common/3.0.3", + "hashPath": "sunnyui.common.3.0.3.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 index 0b115ce0..d4cac338 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 829c578a..14f07565 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.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll index e4a70ed4..e21a57b6 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll 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 index cc40d95c..6513a9f6 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/Properties/Resources.Designer.cs b/SunnyUI/Properties/Resources.Designer.cs index 01b4669d..c5256844 100644 --- a/SunnyUI/Properties/Resources.Designer.cs +++ b/SunnyUI/Properties/Resources.Designer.cs @@ -200,7 +200,7 @@ namespace Sunny.UI.Properties { } /// - /// 查找类似 V3.0.2 的本地化字符串。 + /// 查找类似 V3.0.3 的本地化字符串。 /// internal static string Version { get { diff --git a/SunnyUI/Properties/Resources.resx b/SunnyUI/Properties/Resources.resx index 9b56824d..3b195b57 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.2 - 2021-02-27 + V3.0.3 + 2021-04-11 ..\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 eaafdf56..59cdebd6 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -8,13 +8,13 @@ SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。 CopyRight © SunnyUI.Net 2012-2021 LICENSE - 3.0.2 + 3.0.3 ShenYonghua SunnyUI.Net SunnyUI https://gitee.com/yhuse/SunnyUI https://gitee.com/yhuse/SunnyUI - false + true false SunnyUI.png @@ -56,7 +56,7 @@ - +