diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index 3e877e3..478939a 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.0.6.68")] +[assembly: AssemblyVersion("1.0.7.69")] /*[assembly: AssemblyFileVersion("1.0.0.2")]*/ diff --git a/SicRT/ReleaseNotes.txt b/SicRT/ReleaseNotes.md similarity index 96% rename from SicRT/ReleaseNotes.txt rename to SicRT/ReleaseNotes.md index a279f3a..94014bf 100644 --- a/SicRT/ReleaseNotes.txt +++ b/SicRT/ReleaseNotes.md @@ -1,14 +1,17 @@ +# Sic 系统更新历史记录 -待修复问题: +## Version 1.0.7.69 +**2023-02-23** +- Bug修复 + - 修正PM和LL Online后无法结束Offline超时检测的问题。 + - 修正LoadLock Purge逻辑,当ATM有Tray时,TM不会触发LL Purge。 + - 修正HiwinRobot出错后可能无法重新连接的问题。 +- 新特性 + - TM执行完Purge后,将大气压调节至PM传盘平衡压力 ---------------------------------------------------------------------------------- - - Sic 系统更新历史记录 - ---------------------------------------------------------------------------------- Sic04 2023-01-09 Version 1.0.6.68 diff --git a/SicRT/SicRT.csproj b/SicRT/SicRT.csproj index 1c7e474..8269bde 100644 --- a/SicRT/SicRT.csproj +++ b/SicRT/SicRT.csproj @@ -220,7 +220,7 @@ - + Always @@ -240,20 +240,7 @@ - REM 输出到安装目录,供安装打包使用 - -if exist "$(ProjectDir)..\SicSetup\Packages\SicRT" rd "$(ProjectDir)..\SicSetup\Packages\SicRT" /s /q -md "$(ProjectDir)..\SicSetup\Packages\SicRT\" - -echo 复制文件到安装目录,"$(ProjectDir)..\SicSetup\Packages\SicRT\" -xcopy /e "$(TargetDir)*.*" "$(ProjectDir)..\SicSetup\Packages\SicRT\" /q - -REM 配置文件Copy -del "$(ProjectDir)..\SicSetup\Packages\SicRT\*.pdb" - -if exist "$(ProjectDir)..\SicSetup\Packages\SicRT\Config\Account\_Account.xml" del "$(ProjectDir)..\SicSetup\Packages\SicRT\Config\Account\_Account.xml" -if exist "$(ProjectDir)..\SicSetup\Packages\SicRT\Objects" del "$(ProjectDir)..\SicSetup\Packages\SicRT\Objects\*.obj" -if exist "$(ProjectDir)..\SicSetup\Packages\SicRT\Logs" rd "$(ProjectDir)..\SicSetup\Packages\SicRT\Logs" /s /q -if exist "$(ProjectDir)..\SicSetup\Packages\SicRT\Recipes" rd "$(ProjectDir)..\SicSetup\Packages\SicRT\Recipes" /s /q + + \ No newline at end of file diff --git a/SicSetup/Sic_Setup/Sic_Setup.csproj b/SicSetup/Sic_Setup/Sic_Setup.csproj index a798ff3..0f88240 100644 --- a/SicSetup/Sic_Setup/Sic_Setup.csproj +++ b/SicSetup/Sic_Setup/Sic_Setup.csproj @@ -540,8 +540,37 @@ - - + REM Copying SicUI ..... + +if exist "$(ProjectDir)..\Packages\SicUI" rd "$(ProjectDir)..\Packages\SicUI" /s /q +md "$(ProjectDir)..\Packages\SicUI\" + +echo 拷贝SicUI文件,"$(ProjectDir)..\..\SicUI\bin\Debug\" +xcopy /e "$(ProjectDir)..\..\SicUI\bin\Debug\*.*" "$(ProjectDir)..\Packages\SicUI\" /q + +echo 清理SicUI文件夹 +del "$(ProjectDir)..\Packages\SicUI\*.pdb" +del "$(ProjectDir)..\Packages\SicUI\*.old" + +if exist "$(ProjectDir)..\Packages\SicUI\Logs" rd "$(ProjectDir)..\Packages\SicUI\Logs" /s /q +if exist "$(ProjectDir)..\Packages\SicUI\PresetGroups" rd "$(ProjectDir)..\Packages\SicUI\PresetGroups" /s /q + + +REM Copying SicUI ..... + +if exist "$(ProjectDir)..\Packages\SicRT" rd "$(ProjectDir)..\Packages\SicRT" /s /q +md "$(ProjectDir)..\Packages\SicRT\" + +echo 拷贝SicRT文件,"$(ProjectDir)..\..\SicRT\bin\Debug\" +xcopy /e "$(ProjectDir)..\..\SicRT\bin\Debug\*.*" "$(ProjectDir)..\Packages\SicRT\" /q + +echo 清理SicRT文件夹 +del "$(ProjectDir)..\Packages\SicRT\*.pdb" + +if exist "$(ProjectDir)..\Packages\SicRT\Config\Account\_Account.xml" del "$(ProjectDir)..\Packages\SicRT\Config\Account\_Account.xml" +if exist "$(ProjectDir)..\Packages\SicRT\Objects" del "$(ProjectDir)..\Packages\SicRT\Objects\*.obj" +if exist "$(ProjectDir)..\Packages\SicRT\Logs" rd "$(ProjectDir)..\Packages\SicRT\Logs" /s /q +if exist "$(ProjectDir)..\Packages\SicRT\Recipes" rd "$(ProjectDir)..\Packages\SicRT\Recipes" /s /q echo 清理旧的打包文件。。。 diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index a0bcf9a..2b80e05 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -55,6 +55,6 @@ using System.Windows; // by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.6.68")] +[assembly: AssemblyVersion("1.0.7.69")] /*[assembly: AssemblyFileVersion("1.0.0.2")]*/ diff --git a/SicUI/SicUI.csproj b/SicUI/SicUI.csproj index 969e6e4..ca50aeb 100644 --- a/SicUI/SicUI.csproj +++ b/SicUI/SicUI.csproj @@ -997,20 +997,8 @@ - REM 输出到安装目录,供安装打包使用 - -if exist "$(ProjectDir)..\SicSetup\Packages\SicUI" rd "$(ProjectDir)..\SicSetup\Packages\SicUI" /s /q -md "$(ProjectDir)..\SicSetup\Packages\SicUI\" - -echo 复制文件到安装目录,"$(ProjectDir)..\SicSetup\Packages\SicUI\" -xcopy /e "$(TargetDir)*.*" "$(ProjectDir)..\SicSetup\Packages\SicUI\" /q - -REM 配置文件Copy -del "$(ProjectDir)..\SicSetup\Packages\SicUI\*.pdb" -del "$(ProjectDir)..\SicSetup\Packages\SicUI\*.old" - -if exist "$(ProjectDir)..\SicSetup\Packages\SicUI\Logs" rd "$(ProjectDir)..\SicSetup\Packages\SicUI\Logs" /s /q -if exist "$(ProjectDir)..\SicSetup\Packages\SicUI\PresetGroups" rd "$(ProjectDir)..\SicSetup\Packages\SicUI\PresetGroups" /s /q + +