diff --git a/Modules/Mainframe/gitversion.json b/Modules/Mainframe/gitversion.json index e0aef958..ac66e70c 100644 --- a/Modules/Mainframe/gitversion.json +++ b/Modules/Mainframe/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.1011", - "PreReleaseTagWithDash": "-alpha.1011", + "PreReleaseTag": "alpha.1012", + "PreReleaseTagWithDash": "-alpha.1012", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 1011, - "WeightedPreReleaseNumber": 1011, + "PreReleaseNumber": 1012, + "WeightedPreReleaseNumber": 1012, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "FullBuildMetaData": "Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.1011", - "LegacySemVer": "0.1.0-alpha1011", - "LegacySemVerPadded": "0.1.0-alpha1011", - "AssemblySemVer": "0.1.0.1011", - "AssemblySemFileVer": "0.1.0.1011", - "FullSemVer": "0.1.0-alpha.1011", - "InformationalVersion": "0.1.0-alpha.1011+Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "SemVer": "0.1.0-alpha.1012", + "LegacySemVer": "0.1.0-alpha1012", + "LegacySemVerPadded": "0.1.0-alpha1012", + "AssemblySemVer": "0.1.0.1012", + "AssemblySemFileVer": "0.1.0.1012", + "FullSemVer": "0.1.0-alpha.1012", + "InformationalVersion": "0.1.0-alpha.1012+Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "9ad568814d02f728393eed87cad9692fe44fdd93", - "ShortSha": "9ad5688", - "NuGetVersionV2": "0.1.0-alpha1011", - "NuGetVersion": "0.1.0-alpha1011", - "NuGetPreReleaseTagV2": "alpha1011", - "NuGetPreReleaseTag": "alpha1011", + "Sha": "7f8a38a705d091fed92af99317ae7a68ad387501", + "ShortSha": "7f8a38a", + "NuGetVersionV2": "0.1.0-alpha1012", + "NuGetVersion": "0.1.0-alpha1012", + "NuGetPreReleaseTagV2": "alpha1012", + "NuGetPreReleaseTag": "alpha1012", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 1011, - "CommitsSinceVersionSourcePadded": "1011", + "CommitsSinceVersionSource": 1012, + "CommitsSinceVersionSourcePadded": "1012", "UncommittedChanges": 0, - "CommitDate": "2024-08-08" + "CommitDate": "2024-08-12" } \ No newline at end of file diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index 75b7709b..6d862a05 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -615,7 +615,7 @@ - + diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs index 167f61d4..7038da20 100644 --- a/SicRT/Properties/AssemblyInfo.cs +++ b/SicRT/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : -[assembly: AssemblyVersion("1.0.1.40812")] +[assembly: AssemblyVersion("1.0.1.40819")] [assembly: AssemblyInformationalVersion("Sic多片机(无EFEM)")] \ No newline at end of file diff --git a/SicRT/gitversion.json b/SicRT/gitversion.json index e0aef958..ac66e70c 100644 --- a/SicRT/gitversion.json +++ b/SicRT/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.1011", - "PreReleaseTagWithDash": "-alpha.1011", + "PreReleaseTag": "alpha.1012", + "PreReleaseTagWithDash": "-alpha.1012", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 1011, - "WeightedPreReleaseNumber": 1011, + "PreReleaseNumber": 1012, + "WeightedPreReleaseNumber": 1012, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "FullBuildMetaData": "Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.1011", - "LegacySemVer": "0.1.0-alpha1011", - "LegacySemVerPadded": "0.1.0-alpha1011", - "AssemblySemVer": "0.1.0.1011", - "AssemblySemFileVer": "0.1.0.1011", - "FullSemVer": "0.1.0-alpha.1011", - "InformationalVersion": "0.1.0-alpha.1011+Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "SemVer": "0.1.0-alpha.1012", + "LegacySemVer": "0.1.0-alpha1012", + "LegacySemVerPadded": "0.1.0-alpha1012", + "AssemblySemVer": "0.1.0.1012", + "AssemblySemFileVer": "0.1.0.1012", + "FullSemVer": "0.1.0-alpha.1012", + "InformationalVersion": "0.1.0-alpha.1012+Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "9ad568814d02f728393eed87cad9692fe44fdd93", - "ShortSha": "9ad5688", - "NuGetVersionV2": "0.1.0-alpha1011", - "NuGetVersion": "0.1.0-alpha1011", - "NuGetPreReleaseTagV2": "alpha1011", - "NuGetPreReleaseTag": "alpha1011", + "Sha": "7f8a38a705d091fed92af99317ae7a68ad387501", + "ShortSha": "7f8a38a", + "NuGetVersionV2": "0.1.0-alpha1012", + "NuGetVersion": "0.1.0-alpha1012", + "NuGetPreReleaseTagV2": "alpha1012", + "NuGetPreReleaseTag": "alpha1012", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 1011, - "CommitsSinceVersionSourcePadded": "1011", + "CommitsSinceVersionSource": 1012, + "CommitsSinceVersionSourcePadded": "1012", "UncommittedChanges": 0, - "CommitDate": "2024-08-08" + "CommitDate": "2024-08-12" } \ No newline at end of file diff --git a/SicSimulator/gitversion.json b/SicSimulator/gitversion.json index e0aef958..ac66e70c 100644 --- a/SicSimulator/gitversion.json +++ b/SicSimulator/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.1011", - "PreReleaseTagWithDash": "-alpha.1011", + "PreReleaseTag": "alpha.1012", + "PreReleaseTagWithDash": "-alpha.1012", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 1011, - "WeightedPreReleaseNumber": 1011, + "PreReleaseNumber": 1012, + "WeightedPreReleaseNumber": 1012, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "FullBuildMetaData": "Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.1011", - "LegacySemVer": "0.1.0-alpha1011", - "LegacySemVerPadded": "0.1.0-alpha1011", - "AssemblySemVer": "0.1.0.1011", - "AssemblySemFileVer": "0.1.0.1011", - "FullSemVer": "0.1.0-alpha.1011", - "InformationalVersion": "0.1.0-alpha.1011+Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "SemVer": "0.1.0-alpha.1012", + "LegacySemVer": "0.1.0-alpha1012", + "LegacySemVerPadded": "0.1.0-alpha1012", + "AssemblySemVer": "0.1.0.1012", + "AssemblySemFileVer": "0.1.0.1012", + "FullSemVer": "0.1.0-alpha.1012", + "InformationalVersion": "0.1.0-alpha.1012+Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "9ad568814d02f728393eed87cad9692fe44fdd93", - "ShortSha": "9ad5688", - "NuGetVersionV2": "0.1.0-alpha1011", - "NuGetVersion": "0.1.0-alpha1011", - "NuGetPreReleaseTagV2": "alpha1011", - "NuGetPreReleaseTag": "alpha1011", + "Sha": "7f8a38a705d091fed92af99317ae7a68ad387501", + "ShortSha": "7f8a38a", + "NuGetVersionV2": "0.1.0-alpha1012", + "NuGetVersion": "0.1.0-alpha1012", + "NuGetPreReleaseTagV2": "alpha1012", + "NuGetPreReleaseTag": "alpha1012", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 1011, - "CommitsSinceVersionSourcePadded": "1011", + "CommitsSinceVersionSource": 1012, + "CommitsSinceVersionSourcePadded": "1012", "UncommittedChanges": 0, - "CommitDate": "2024-08-08" + "CommitDate": "2024-08-12" } \ No newline at end of file diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs index cdf47b82..57c1c039 100644 --- a/SicUI/Properties/AssemblyInfo.cs +++ b/SicUI/Properties/AssemblyInfo.cs @@ -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("1.0.1.40812")] +[assembly: AssemblyVersion("1.0.1.40819")] [assembly: AssemblyInformationalVersion("Sic多片机(无EFEM)")] diff --git a/SicUI/gitversion.json b/SicUI/gitversion.json index e0aef958..ac66e70c 100644 --- a/SicUI/gitversion.json +++ b/SicUI/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.1011", - "PreReleaseTagWithDash": "-alpha.1011", + "PreReleaseTag": "alpha.1012", + "PreReleaseTagWithDash": "-alpha.1012", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 1011, - "WeightedPreReleaseNumber": 1011, + "PreReleaseNumber": 1012, + "WeightedPreReleaseNumber": 1012, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "FullBuildMetaData": "Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.1011", - "LegacySemVer": "0.1.0-alpha1011", - "LegacySemVerPadded": "0.1.0-alpha1011", - "AssemblySemVer": "0.1.0.1011", - "AssemblySemFileVer": "0.1.0.1011", - "FullSemVer": "0.1.0-alpha.1011", - "InformationalVersion": "0.1.0-alpha.1011+Branch.develop.Sha.9ad568814d02f728393eed87cad9692fe44fdd93", + "SemVer": "0.1.0-alpha.1012", + "LegacySemVer": "0.1.0-alpha1012", + "LegacySemVerPadded": "0.1.0-alpha1012", + "AssemblySemVer": "0.1.0.1012", + "AssemblySemFileVer": "0.1.0.1012", + "FullSemVer": "0.1.0-alpha.1012", + "InformationalVersion": "0.1.0-alpha.1012+Branch.develop.Sha.7f8a38a705d091fed92af99317ae7a68ad387501", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "9ad568814d02f728393eed87cad9692fe44fdd93", - "ShortSha": "9ad5688", - "NuGetVersionV2": "0.1.0-alpha1011", - "NuGetVersion": "0.1.0-alpha1011", - "NuGetPreReleaseTagV2": "alpha1011", - "NuGetPreReleaseTag": "alpha1011", + "Sha": "7f8a38a705d091fed92af99317ae7a68ad387501", + "ShortSha": "7f8a38a", + "NuGetVersionV2": "0.1.0-alpha1012", + "NuGetVersion": "0.1.0-alpha1012", + "NuGetPreReleaseTagV2": "alpha1012", + "NuGetPreReleaseTag": "alpha1012", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 1011, - "CommitsSinceVersionSourcePadded": "1011", + "CommitsSinceVersionSource": 1012, + "CommitsSinceVersionSourcePadded": "1012", "UncommittedChanges": 0, - "CommitDate": "2024-08-08" + "CommitDate": "2024-08-12" } \ No newline at end of file diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index 130ec454..0b58c041 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 65d38007..b951f527 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 6ee87f77..da6d83f3 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 882c630b..f88631a2 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 4eb60a03..6f33302e 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 5d0a6413..bf62991f 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/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll index 740b3bfd..e10f815c 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll index 279f8e60..d0a92766 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Localization.dll and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll index 823e888d..e8dedd8f 100644 Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ