diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index 575bb48..8aad6eb 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.1.19.49")] +[assembly: AssemblyVersion("23.9.20.1")] [assembly: AssemblyInformationalVersion("手动通用版(无EFEM)")] diff --git a/SicRT/ReleaseNotes.md b/SicRT/ReleaseNotes.md index 63b4e7a..1da19be 100644 --- a/SicRT/ReleaseNotes.md +++ b/SicRT/ReleaseNotes.md @@ -3,14 +3,18 @@ Manual-GE 手动通用版(适用无EFEM设备) ------ +## Version 23.9.20.1 + +**2023-09-20** -## 下次发行备忘 - Bug修复 - - 无 + - 1:修改UPS相关现实内容(SC配置提示+DeviceView界面) + - - 新特性 - - 优化Data History左侧列表中的水温名称 - - 微调TM视图中的按钮位置 - - +- 合并develop分支和Interlock分支 + - 1:删除PM DI0和DI7 (DO2、40、41、54、112-119、111的互锁 (为了开腔维护时间可以吹扫) + -2 优化Data History左侧列表中的水温名称 + - 3微调TM视图中的按钮位置 ## Version 1.1.19.49 diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index 0232e86..a7622d2 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -54,6 +54,6 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.19.49")] +[assembly: AssemblyVersion("23.9.20.1")] [assembly: AssemblyInformationalVersion("手动通用版(无EFEM)")] diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index fb6a5ac..9ddd6e1 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index 10a30dc..7b74ff6 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index f87e6c8..082c772 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index 58b3db2..688a807 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 2f2be35..e5dc2df 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index 0b29e31..2ec3bf7 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ diff --git a/ThirdParty/MECF.Framework/RTOverEthernetDevelopmentKit.dll b/ThirdParty/MECF.Framework/RTOverEthernetDevelopmentKit.dll index c10afb1..355082f 100644 Binary files a/ThirdParty/MECF.Framework/RTOverEthernetDevelopmentKit.dll and b/ThirdParty/MECF.Framework/RTOverEthernetDevelopmentKit.dll differ