Sic-Software
/
Sic01
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

版本号升级至2.4.15.27 

修正打安装包时未清理SicRT\Logs文件夹的问题。
ReleaseNote更改为Markdown格式。
This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-02-15 12:29:38 +08:00
parent a5c4816336
commit 3cdfe8cf70
6 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("2.4.14.26")]
[assembly: AssemblyFileVersion("2.4.14.26")]
[assembly: AssemblyVersion("2.4.15.27")]
//[assembly: AssemblyFileVersion("2.4.14.26")]

29
SicRT/ReleaseNotes.txt → SicRT/ReleaseNotes.md
View File

@ -1,20 +1,33 @@

待修复问题：
# Sic 系统更新历史记录
## Version 2.4.15.27
**2023-02-15**
- Bug修复
- 无
- 新特性
- 新增PC设定值和反馈值误差监测功能
- 新增PM旋转电机转速设定值和误差值监测功能
---------------------------------------------------------------------------------
## Version 2.4.14.26
**2023-02-03**
Sic 系统更新历史记录
- Bug修复
- 无
- 新特性
- 重新整理PM MO Change TMA/TCS Routine
---------------------------------------------------------------------------------
Sic01 2023-02-03 Version 2.4.14.26
1.重新整理PM MO Change TMA/TCS Routine
## Version 2.4.14.25
**2023-02-03**
Sic01 2023-02-03 Version 2.4.14.25
1.修改PM的Interlock
- Bug修复
- 修改PM的Interlock
- 新特性
- 无
## 其它
Sic01 2023-02-08 Version 2.4.13.24
1.解决V65阀在Process中偶尔打开失败的问题
2.解决Process过程中打印Step信息的错误问题

21
SicRT/SicRT.csproj
View File

@ -208,9 +208,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="ReleaseNotes.txt">
<Content Include="ReleaseNotes.md">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</Content>
</ItemGroup>
<ItemGroup>
<None Include="Config\SequenceFormat.xml">
@ -229,21 +229,4 @@
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>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\Objects" del "$(ProjectDir)..\SicSetup\Packages\SicRT\Objects\*.obj"
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\Logs" rd "$(ProjectDir)..\SicSetup\Packages\SicRT\Logs" /s /q
if exist "$(ProjectDir)..\SicSetup\Packages\SicRT\Recipes" rd "$(ProjectDir)..\SicSetup\Packages\SicRT\Recipes" /s /q</PostBuildEvent>
</PropertyGroup>
</Project>

33
SicSetup/Sic_Setup/Sic_Setup.csproj
View File

@ -519,8 +519,37 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PreBuildEvent>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 SicRT .....
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</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>echo 清理旧的打包文件。。。

4
SicUI/Properties/AssemblyInfo.cs
View File

@ -54,5 +54,5 @@ 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("2.4.14.26")]
[assembly: AssemblyFileVersion("2.4.14.26")]
[assembly: AssemblyVersion("2.4.15.27")]
//[assembly: AssemblyFileVersion("2.4.14.26")]

15
SicUI/SicUI.csproj
View File

@ -895,21 +895,6 @@
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>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\CDIO.dll"
if exist "$(ProjectDir)..\SicSetup\Packages\SicUI\Data\Config" rd "$(ProjectDir)..\SicSetup\Packages\SicUI\Data\Config" /s /q</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">