From bc9416d7c712b306beb0edf9711bc3823feff2c2 Mon Sep 17 00:00:00 2001
From: "SIC1016\\caipeilun" <123456>
Date: Tue, 2 Jul 2024 15:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mfc=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Modules/Mainframe/gitversion.json | 42 +++++++++----------
SicRT/Config/System.sccfg | 8 ++++
SicRT/gitversion.json | 42 +++++++++----------
SicSimulator/gitversion.json | 42 +++++++++----------
SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs | 2 +-
SicUI/gitversion.json | 42 +++++++++----------
6 files changed, 93 insertions(+), 85 deletions(-)
diff --git a/Modules/Mainframe/gitversion.json b/Modules/Mainframe/gitversion.json
index 158f883b..9aa844a0 100644
--- a/Modules/Mainframe/gitversion.json
+++ b/Modules/Mainframe/gitversion.json
@@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
- "PreReleaseTag": "----multiplate-develop.597",
- "PreReleaseTagWithDash": "-----multiplate-develop.597",
+ "PreReleaseTag": "----multiplate-develop.598",
+ "PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
- "PreReleaseNumber": 597,
- "WeightedPreReleaseNumber": 597,
+ "PreReleaseNumber": 598,
+ "WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
- "FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
- "SemVer": "23.9.2-----multiplate-develop.597",
- "LegacySemVer": "23.9.2-----multiplate-de597",
- "LegacySemVerPadded": "23.9.2-----multiplate-d0597",
- "AssemblySemVer": "23.9.2.597",
- "AssemblySemFileVer": "23.9.2.597",
- "FullSemVer": "23.9.2-----multiplate-develop.597",
- "InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "SemVer": "23.9.2-----multiplate-develop.598",
+ "LegacySemVer": "23.9.2-----multiplate-de598",
+ "LegacySemVerPadded": "23.9.2-----multiplate-d0598",
+ "AssemblySemVer": "23.9.2.598",
+ "AssemblySemFileVer": "23.9.2.598",
+ "FullSemVer": "23.9.2-----multiplate-develop.598",
+ "InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
- "Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
- "ShortSha": "e0bf983",
- "NuGetVersionV2": "23.9.2-----multiplate-d0597",
- "NuGetVersion": "23.9.2-----multiplate-d0597",
- "NuGetPreReleaseTagV2": "----multiplate-d0597",
- "NuGetPreReleaseTag": "----multiplate-d0597",
+ "Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
+ "ShortSha": "74e06c9",
+ "NuGetVersionV2": "23.9.2-----multiplate-d0598",
+ "NuGetVersion": "23.9.2-----multiplate-d0598",
+ "NuGetPreReleaseTagV2": "----multiplate-d0598",
+ "NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
- "CommitsSinceVersionSource": 597,
- "CommitsSinceVersionSourcePadded": "0597",
- "UncommittedChanges": 1,
+ "CommitsSinceVersionSource": 598,
+ "CommitsSinceVersionSourcePadded": "0598",
+ "UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}
\ No newline at end of file
diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg
index b99d2f48..910f114a 100644
--- a/SicRT/Config/System.sccfg
+++ b/SicRT/Config/System.sccfg
@@ -521,6 +521,10 @@
+
+
+
+
@@ -1119,6 +1123,10 @@
+
+
+
+
diff --git a/SicRT/gitversion.json b/SicRT/gitversion.json
index 158f883b..9aa844a0 100644
--- a/SicRT/gitversion.json
+++ b/SicRT/gitversion.json
@@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
- "PreReleaseTag": "----multiplate-develop.597",
- "PreReleaseTagWithDash": "-----multiplate-develop.597",
+ "PreReleaseTag": "----multiplate-develop.598",
+ "PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
- "PreReleaseNumber": 597,
- "WeightedPreReleaseNumber": 597,
+ "PreReleaseNumber": 598,
+ "WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
- "FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
- "SemVer": "23.9.2-----multiplate-develop.597",
- "LegacySemVer": "23.9.2-----multiplate-de597",
- "LegacySemVerPadded": "23.9.2-----multiplate-d0597",
- "AssemblySemVer": "23.9.2.597",
- "AssemblySemFileVer": "23.9.2.597",
- "FullSemVer": "23.9.2-----multiplate-develop.597",
- "InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "SemVer": "23.9.2-----multiplate-develop.598",
+ "LegacySemVer": "23.9.2-----multiplate-de598",
+ "LegacySemVerPadded": "23.9.2-----multiplate-d0598",
+ "AssemblySemVer": "23.9.2.598",
+ "AssemblySemFileVer": "23.9.2.598",
+ "FullSemVer": "23.9.2-----multiplate-develop.598",
+ "InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
- "Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
- "ShortSha": "e0bf983",
- "NuGetVersionV2": "23.9.2-----multiplate-d0597",
- "NuGetVersion": "23.9.2-----multiplate-d0597",
- "NuGetPreReleaseTagV2": "----multiplate-d0597",
- "NuGetPreReleaseTag": "----multiplate-d0597",
+ "Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
+ "ShortSha": "74e06c9",
+ "NuGetVersionV2": "23.9.2-----multiplate-d0598",
+ "NuGetVersion": "23.9.2-----multiplate-d0598",
+ "NuGetPreReleaseTagV2": "----multiplate-d0598",
+ "NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
- "CommitsSinceVersionSource": 597,
- "CommitsSinceVersionSourcePadded": "0597",
- "UncommittedChanges": 1,
+ "CommitsSinceVersionSource": 598,
+ "CommitsSinceVersionSourcePadded": "0598",
+ "UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}
\ No newline at end of file
diff --git a/SicSimulator/gitversion.json b/SicSimulator/gitversion.json
index 158f883b..9aa844a0 100644
--- a/SicSimulator/gitversion.json
+++ b/SicSimulator/gitversion.json
@@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
- "PreReleaseTag": "----multiplate-develop.597",
- "PreReleaseTagWithDash": "-----multiplate-develop.597",
+ "PreReleaseTag": "----multiplate-develop.598",
+ "PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
- "PreReleaseNumber": 597,
- "WeightedPreReleaseNumber": 597,
+ "PreReleaseNumber": 598,
+ "WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
- "FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
- "SemVer": "23.9.2-----multiplate-develop.597",
- "LegacySemVer": "23.9.2-----multiplate-de597",
- "LegacySemVerPadded": "23.9.2-----multiplate-d0597",
- "AssemblySemVer": "23.9.2.597",
- "AssemblySemFileVer": "23.9.2.597",
- "FullSemVer": "23.9.2-----multiplate-develop.597",
- "InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "SemVer": "23.9.2-----multiplate-develop.598",
+ "LegacySemVer": "23.9.2-----multiplate-de598",
+ "LegacySemVerPadded": "23.9.2-----multiplate-d0598",
+ "AssemblySemVer": "23.9.2.598",
+ "AssemblySemFileVer": "23.9.2.598",
+ "FullSemVer": "23.9.2-----multiplate-develop.598",
+ "InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
- "Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
- "ShortSha": "e0bf983",
- "NuGetVersionV2": "23.9.2-----multiplate-d0597",
- "NuGetVersion": "23.9.2-----multiplate-d0597",
- "NuGetPreReleaseTagV2": "----multiplate-d0597",
- "NuGetPreReleaseTag": "----multiplate-d0597",
+ "Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
+ "ShortSha": "74e06c9",
+ "NuGetVersionV2": "23.9.2-----multiplate-d0598",
+ "NuGetVersion": "23.9.2-----multiplate-d0598",
+ "NuGetPreReleaseTagV2": "----multiplate-d0598",
+ "NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
- "CommitsSinceVersionSource": 597,
- "CommitsSinceVersionSourcePadded": "0597",
- "UncommittedChanges": 1,
+ "CommitsSinceVersionSource": 598,
+ "CommitsSinceVersionSourcePadded": "0598",
+ "UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}
\ No newline at end of file
diff --git a/SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs b/SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs
index 51f4185b..6cdbc306 100644
--- a/SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs
+++ b/SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs
@@ -116,7 +116,7 @@ namespace SicUI.Models.PMs
}
- private List _MFCGroup = new List() { "MFC28", "MFC29", "MFC31","MFC40" };
+ private List _MFCGroup = new List() { "MFC27", "MFC28", "MFC29", "MFC31", "MFC35", "MFC40", "MFC41", "MFC42" };
public List MFCGroup
{
get { return _MFCGroup; }
diff --git a/SicUI/gitversion.json b/SicUI/gitversion.json
index 158f883b..9aa844a0 100644
--- a/SicUI/gitversion.json
+++ b/SicUI/gitversion.json
@@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
- "PreReleaseTag": "----multiplate-develop.597",
- "PreReleaseTagWithDash": "-----multiplate-develop.597",
+ "PreReleaseTag": "----multiplate-develop.598",
+ "PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
- "PreReleaseNumber": 597,
- "WeightedPreReleaseNumber": 597,
+ "PreReleaseNumber": 598,
+ "WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
- "FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
- "SemVer": "23.9.2-----multiplate-develop.597",
- "LegacySemVer": "23.9.2-----multiplate-de597",
- "LegacySemVerPadded": "23.9.2-----multiplate-d0597",
- "AssemblySemVer": "23.9.2.597",
- "AssemblySemFileVer": "23.9.2.597",
- "FullSemVer": "23.9.2-----multiplate-develop.597",
- "InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
+ "SemVer": "23.9.2-----multiplate-develop.598",
+ "LegacySemVer": "23.9.2-----multiplate-de598",
+ "LegacySemVerPadded": "23.9.2-----multiplate-d0598",
+ "AssemblySemVer": "23.9.2.598",
+ "AssemblySemFileVer": "23.9.2.598",
+ "FullSemVer": "23.9.2-----multiplate-develop.598",
+ "InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
- "Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
- "ShortSha": "e0bf983",
- "NuGetVersionV2": "23.9.2-----multiplate-d0597",
- "NuGetVersion": "23.9.2-----multiplate-d0597",
- "NuGetPreReleaseTagV2": "----multiplate-d0597",
- "NuGetPreReleaseTag": "----multiplate-d0597",
+ "Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
+ "ShortSha": "74e06c9",
+ "NuGetVersionV2": "23.9.2-----multiplate-d0598",
+ "NuGetVersion": "23.9.2-----multiplate-d0598",
+ "NuGetPreReleaseTagV2": "----multiplate-d0598",
+ "NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
- "CommitsSinceVersionSource": 597,
- "CommitsSinceVersionSourcePadded": "0597",
- "UncommittedChanges": 1,
+ "CommitsSinceVersionSource": 598,
+ "CommitsSinceVersionSourcePadded": "0598",
+ "UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}
\ No newline at end of file