Skip to content

Commit

Permalink
V3.0.6 更新内容见Updates.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunny committed Aug 12, 2021
1 parent 15d7e82 commit d4cf6f4
Show file tree
Hide file tree
Showing 28 changed files with 165 additions and 38 deletions.
Binary file modified Bin/net40/SunnyUI.Common.dll
Binary file not shown.
Binary file modified Bin/net40/SunnyUI.Demo.exe
Binary file not shown.
Binary file modified Bin/net40/SunnyUI.dll
Binary file not shown.
Binary file removed Bin/net45/SunnyUI.Common.dll
Binary file not shown.
Binary file added Bin/net462/SunnyUI.Common.dll
Binary file not shown.
Binary file renamed Bin/net45/SunnyUI.dll → Bin/net462/SunnyUI.dll
Binary file not shown.
20 changes: 10 additions & 10 deletions Bin/net5.0-windows/SunnyUI.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Binary file modified Bin/net5.0-windows/SunnyUI.dll
Binary file not shown.
Binary file modified Bin/net5.0-windows/ref/SunnyUI.dll
Binary file not shown.
20 changes: 10 additions & 10 deletions Bin/netcoreapp3.1/SunnyUI.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Binary file modified Bin/netcoreapp3.1/SunnyUI.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions SunnyUI.Demo/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [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")]
8 changes: 4 additions & 4 deletions SunnyUI.Demo/SunnyUI.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@
<ApplicationIcon>SunnyUI.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="SunnyUI, Version=3.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="SunnyUI, Version=3.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Bin\net40\SunnyUI.dll</HintPath>
</Reference>
<Reference Include="SunnyUI.Common, Version=3.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Bin\net40\SunnyUI.Common.dll</HintPath>
<Reference Include="SunnyUI.Common, Version=3.0.6.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.Common.3.0.6\lib\net40\SunnyUI.Common.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -522,6 +521,7 @@
<None Include="..\.editorconfig">
<Link>.editorconfig</Link>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
4 changes: 4 additions & 0 deletions SunnyUI.Demo/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SunnyUI.Common" version="3.0.6" targetFramework="net40" />
</packages>
2 changes: 1 addition & 1 deletion SunnyUI.Net5.Demo/Controls/FFlowLayoutPanel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ private void uiButton1_Click(object sender, System.EventArgs e)
{
UIButton btn = new UIButton();
btn.Text = "Button" + index++.ToString("D2");
uiFlowLayoutPanel1.AddControl(btn);
uiFlowLayoutPanel1.Add(btn);
}
}
}
8 changes: 4 additions & 4 deletions SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<UseWindowsForms>true</UseWindowsForms>
<RootNamespace>Sunny.UI.Demo</RootNamespace>
<ApplicationIcon>SunnyUI.ico</ApplicationIcon>
<AssemblyVersion>3.0.5.0</AssemblyVersion>
<FileVersion>3.0.5.0</FileVersion>
<Version>3.0.5</Version>
<AssemblyVersion>3.0.6.0</AssemblyVersion>
<FileVersion>3.0.6.0</FileVersion>
<Version>3.0.6</Version>
<Authors>SunnyUI</Authors>
<Company>SunnyUI.Net</Company>
<Copyright>Copyright ©SunnyUI.Net 2012-2021</Copyright>
Expand All @@ -24,7 +24,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SunnyUI" Version="3.0.5" />
<PackageReference Include="SunnyUI" Version="3.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
Binary file not shown.
59 changes: 59 additions & 0 deletions SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"runtimeOptions": {
"additionalProbingPaths": [
"C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\Sunny\\.nuget\\packages",
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"runtimeOptions": {
"tfm": "net5.0",
"framework": {
"name": "Microsoft.WindowsDesktop.App",
"version": "5.0.0"
}
}
}
Binary file added SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion SunnyUI/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions SunnyUI/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -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.5</value>
<comment>2021-07-11</comment>
<value>V3.0.6</value>
<comment>2021-08-12</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>
Expand Down
8 changes: 4 additions & 4 deletions SunnyUI/SunnyUI.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net40;net45</TargetFrameworks>
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net462;net40</TargetFrameworks>
<LangVersion>9.0</LangVersion>
<ProjectGuid>{AB1CB247-E20B-4CBE-B269-570ADDD96C53}</ProjectGuid>
<UseWindowsForms>true</UseWindowsForms>
<RootNamespace>Sunny.UI</RootNamespace>
<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.5</Version>
<Version>3.0.6</Version>
<Authors>ShenYonghua</Authors>
<Company>SunnyUI.Net</Company>
<PackageId>SunnyUI</PackageId>
Expand Down Expand Up @@ -56,7 +56,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SunnyUI.Common" Version="3.0.5" />
<PackageReference Include="SunnyUI.Common" Version="3.0.6" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
Expand All @@ -65,7 +65,7 @@
<Reference Include="System.Design" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Design" />
Expand Down
46 changes: 46 additions & 0 deletions Updates.md
Original file line number Diff line number Diff line change
@@ -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: 增加信号强度显示控件
Expand Down

0 comments on commit d4cf6f4

Please sign in to comment.