diff --git a/MECF.Framework.Common/Properties/AssemblyInfo.cs b/MECF.Framework.Common/Properties/AssemblyInfo.cs index 51b88d3..e4903d7 100644 --- a/MECF.Framework.Common/Properties/AssemblyInfo.cs +++ b/MECF.Framework.Common/Properties/AssemblyInfo.cs @@ -14,4 +14,4 @@ using log4net.Config; [assembly: ComVisible(false)] [assembly: Guid("6E6A3BE1-681F-49BE-982E-29C4C1D08D49")] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] -[assembly: AssemblyVersion("2.1.2.7")] +[assembly: AssemblyVersion("2.1.3.8")] diff --git a/MECF.Framework.Common/ReleaseNote.md b/MECF.Framework.Common/ReleaseNote.md index f691756..b1600dd 100644 --- a/MECF.Framework.Common/ReleaseNote.md +++ b/MECF.Framework.Common/ReleaseNote.md @@ -1,6 +1,17 @@ # 同时应用于RT和UI端的对象,以及WCF通讯使用的对象 -## Version 2.1.3.6 +## Version 2.1.4.9 + +***2023-05-12*** + +- Bug + - 修正信号塔未定义任何事件时,Monitor()方法中拉取RT事件数据导致NullReference异常的问题 + - 修正信号塔Buzzer的重响逻辑,仅当Buzzer相关的新事件发生时,重新启用Buzzer +- 新特性 + - 优化日志文本格式,多行日志的消息体左对齐 + + +## Version 2.1.3.8 ***2023-05-11*** - Bug diff --git a/MECF.Framework.UI.Client/Properties/AssemblyInfo.cs b/MECF.Framework.UI.Client/Properties/AssemblyInfo.cs index ca64661..8390c55 100644 --- a/MECF.Framework.UI.Client/Properties/AssemblyInfo.cs +++ b/MECF.Framework.UI.Client/Properties/AssemblyInfo.cs @@ -35,7 +35,7 @@ using System.Windows.Markup; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.4.4")] +[assembly: AssemblyVersion("2.0.5.5")] //[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/MECF.Framework.UI.Client/ReleaseNotes.md b/MECF.Framework.UI.Client/ReleaseNotes.md index e19ea8b..9dd9f1c 100644 --- a/MECF.Framework.UI.Client/ReleaseNotes.md +++ b/MECF.Framework.UI.Client/ReleaseNotes.md @@ -1,5 +1,18 @@ # 用户界面相关的控件、样式等 +## Version 2.0.5.5 + +***2023-05-12*** + +- Bug + - 修正LockPanel加载后,焦点没有自动设置到密码输入框的问题 + +- 新特性 + - 导入5号机最新的用户库代码 + - RecipeData对象构造时输出气体流量计算器对象全名日志以方便问题排查 + + + ## Version 2.0.4.4 ***2023-05-11***