zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* 修正SunnyUI.Common.dll 版本引用

Browse Source
This commit is contained in:
Sunny 2021-01-28 23:46:45 +08:00
parent 5f29ccdc84
commit afa860948d
19 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

4
Bin/net5.0-windows/SunnyUI.deps.json
View File

@ -6,7 +6,7 @@
"compilationOptions": {}, "compilationOptions": {},
"targets": { "targets": {
".NETCoreApp,Version=v5.0": { ".NETCoreApp,Version=v5.0": {
"SunnyUI/3.0.0": { "SunnyUI/3.0.1": {
"dependencies": { "dependencies": {
"SunnyUI.Common": "3.0.0" "SunnyUI.Common": "3.0.0"
}, },
@ -25,7 +25,7 @@
} }
}, },
"libraries": { "libraries": {
"SunnyUI/3.0.0": { "SunnyUI/3.0.1": {
"type": "project", "type": "project",
"serviceable": false, "serviceable": false,
"sha512": "" "sha512": ""

BIN
Bin/net5.0-windows/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/net5.0-windows/ref/SunnyUI.dll
View File

Binary file not shown.

4
Bin/netcoreapp3.1/SunnyUI.deps.json
View File

@ -6,7 +6,7 @@
"compilationOptions": {}, "compilationOptions": {},
"targets": { "targets": {
".NETCoreApp,Version=v3.1": { ".NETCoreApp,Version=v3.1": {
"SunnyUI/3.0.0": { "SunnyUI/3.0.1": {
"dependencies": { "dependencies": {
"SunnyUI.Common": "3.0.0" "SunnyUI.Common": "3.0.0"
}, },
@ -25,7 +25,7 @@
} }
}, },
"libraries": { "libraries": {
"SunnyUI/3.0.0": { "SunnyUI/3.0.1": {
"type": "project", "type": "project",
"serviceable": false, "serviceable": false,
"sha512": "" "sha512": ""

BIN
Bin/netcoreapp3.1/SunnyUI.dll
View File

Binary file not shown.

4
SunnyUI.Demo/Properties/AssemblyInfo.cs
View File

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

4
SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
View File

@ -8,7 +8,7 @@
<ApplicationIcon>SunnyUI.ico</ApplicationIcon> <ApplicationIcon>SunnyUI.ico</ApplicationIcon>
<AssemblyVersion>3.0.0.0</AssemblyVersion> <AssemblyVersion>3.0.0.0</AssemblyVersion>
<FileVersion>3.0.0.0</FileVersion> <FileVersion>3.0.0.0</FileVersion>
<Version>3.0.0</Version> <Version>3.0.1</Version>
<Authors>SunnyUI</Authors> <Authors>SunnyUI</Authors>
<Company>SunnyUI.Net</Company> <Company>SunnyUI.Net</Company>
<Copyright>Copyright ©SunnyUI.Net 2012-2021</Copyright> <Copyright>Copyright ©SunnyUI.Net 2012-2021</Copyright>
@ -24,7 +24,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SunnyUI" Version="3.0.0" /> <PackageReference Include="SunnyUI" Version="3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
View File

@ -6,7 +6,7 @@
"compilationOptions": {}, "compilationOptions": {},
"targets": { "targets": {
".NETCoreApp,Version=v5.0": { ".NETCoreApp,Version=v5.0": {
"SunnyUI.Net5.Demo/3.0.0": { "SunnyUI.Net5.Demo/3.0.1": {
"dependencies": { "dependencies": {
"SunnyUI": "3.0.0" "SunnyUI": "3.0.0"
}, },
@ -36,7 +36,7 @@
} }
}, },
"libraries": { "libraries": {
"SunnyUI.Net5.Demo/3.0.0": { "SunnyUI.Net5.Demo/3.0.1": {
"type": "project", "type": "project",
"serviceable": false, "serviceable": false,
"sha512": "" "sha512": ""

BIN
SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll
View File

Binary file not shown.

BIN
SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.exe
View File

Binary file not shown.

4
SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json
View File

@ -1,8 +1,8 @@
{ {
"runtimeOptions": { "runtimeOptions": {
"additionalProbingPaths": [ "additionalProbingPaths": [
"C:\\Users\\Administrator\\.dotnet\\store\\|arch|\\|tfm|", "C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\Administrator\\.nuget\\packages", "C:\\Users\\Sunny\\.nuget\\packages",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
] ]
} }

BIN
SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll
View File

Binary file not shown.

1
SunnyUI/Controls/UIButton.cs
View File

@ -150,6 +150,7 @@ namespace Sunny.UI
private Color tipsColor = Color.Red; private Color tipsColor = Color.Red;
[Description("角标文字颜色"), Category("SunnyUI")]
[DefaultValue(typeof(Color), "Red")] [DefaultValue(typeof(Color), "Red")]
public Color TipsColor public Color TipsColor
{ {

2
SunnyUI/Controls/UISwitch.cs
View File

@ -28,7 +28,7 @@ using System.Drawing.Drawing2D;
namespace Sunny.UI namespace Sunny.UI
{ {
[DefaultEvent("ValueChanged")] [DefaultEvent("ValueChanged")]
[DefaultProperty("ActiveValue")] [DefaultProperty("Active")]
[ToolboxItem(true)] [ToolboxItem(true)]
public sealed class UISwitch : UIControl public sealed class UISwitch : UIControl
{ {

2
SunnyUI/Properties/Resources.Designer.cs generated
View File

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

6
SunnyUI/Properties/Resources.resx
View File

@ -156,14 +156,14 @@
</data> </data>
<data name="Name" xml:space="preserve"> <data name="Name" xml:space="preserve">
<value>SunnyUI.Net</value> <value>SunnyUI.Net</value>
<comment>基于 GPL-3.0 的 .Net Framework 4.0+、.Net Core3.1、.Net 5 WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</comment> <comment>基于 .Net Framework 4.0+、.Net Core3.1、.Net 5 WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</comment>
</data> </data>
<data name="notifier" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="notifier" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\notifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\notifier.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Version" xml:space="preserve"> <data name="Version" xml:space="preserve">
<value>V3.0.0</value> <value>V3.0.1</value>
<comment>2021-01-01</comment> <comment>2021-01-28</comment>
</data> </data>
<data name="wind" type="System.Resources.ResXFileRef, System.Windows.Forms"> <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> <value>..\Resources\wind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

8
SunnyUI/SunnyUI.csproj
View File

@ -5,17 +5,17 @@
<ProjectGuid>{AB1CB247-E20B-4CBE-B269-570ADDD96C53}</ProjectGuid> <ProjectGuid>{AB1CB247-E20B-4CBE-B269-570ADDD96C53}</ProjectGuid>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<RootNamespace>Sunny.UI</RootNamespace> <RootNamespace>Sunny.UI</RootNamespace>
<Description>基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description> <Description>SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
<Copyright>CopyRight © SunnyUI.Net 2012-2021</Copyright> <Copyright>CopyRight © SunnyUI.Net 2012-2021</Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<Version>3.0.0</Version> <Version>3.0.1</Version>
<Authors>ShenYonghua</Authors> <Authors>ShenYonghua</Authors>
<Company>SunnyUI.Net</Company> <Company>SunnyUI.Net</Company>
<PackageId>SunnyUI</PackageId> <PackageId>SunnyUI</PackageId>
<PackageProjectUrl>https://gitee.com/yhuse/SunnyUI</PackageProjectUrl> <PackageProjectUrl>https://gitee.com/yhuse/SunnyUI</PackageProjectUrl>
<RepositoryUrl>https://gitee.com/yhuse/SunnyUI</RepositoryUrl> <RepositoryUrl>https://gitee.com/yhuse/SunnyUI</RepositoryUrl>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageIcon>SunnyUI.png</PackageIcon> <PackageIcon>SunnyUI.png</PackageIcon>
</PropertyGroup> </PropertyGroup>
@ -54,7 +54,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SunnyUI.Common" Version="3.0.0" /> <PackageReference Include="SunnyUI.Common" Version="3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net40'"> <ItemGroup Condition="'$(TargetFramework)' == 'net40'">