Merged in MBP-286-do-not-save-version-in-file (pull request #91)

MBP-286 do not save version in file Approved-by: Kristina Jurisic
2024-07-16 12:19:47 +00:00
parent 441498befe 2eec180723
commit 855dd95c85
11 changed files with 53 additions and 53 deletions
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -6,8 +6,8 @@ pipelines:
     - step:
          script:
            - git submodule update --init
-            - python twincat_version_manager.py
            - python check_fix_white_space.py
            - ./check_no_lineids.sh
            - ./check_code_before_sq_brackets.sh
+            #- python twincat_version_manager.py

--- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL
+++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <GVL Name="GVL_APP" Id="{8fe9690c-7907-432e-bedb-6fc99b5ce255}">
    <Declaration><![CDATA[{attribute 'qualified_only'}
 VAR_GLOBAL
--- a/solution/tc_project_app/GlobalTextList.TcGTLO
+++ b/solution/tc_project_app/GlobalTextList.TcGTLO
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <GlobalTextList Name="GlobalTextList" Id="{c3494959-baa5-4f73-b0cd-9c11912145dd}">
    <XmlArchive>
      <Data>
--- a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
+++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <POU Name="Application_Template" Id="{4bdeebc0-15d8-4790-97d0-e9c4239d121c}" SpecialFunc="None">
    <Declaration><![CDATA[PROGRAM Application_Template
 VAR
--- a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
+++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <POU Name="Axis_Template" Id="{1a43acb4-bd2e-4637-97fb-9976d47292b6}" SpecialFunc="None">
    <Declaration><![CDATA[PROGRAM Axis_Template
 VAR
--- a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU
+++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <POU Name="Pneumatics_Template" Id="{7bf401fb-a600-4741-a67b-36f20e194cfc}" SpecialFunc="None">
    <Declaration><![CDATA[PROGRAM Pneumatics_Template
 VAR
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <POU Name="MAIN" Id="{33eb6f49-7781-4211-a70b-87ada6d80cb7}" SpecialFunc="None">
    <Declaration><![CDATA[PROGRAM MAIN
 VAR
--- a/solution/tc_project_app/PlcTask.TcTTO
+++ b/solution/tc_project_app/PlcTask.TcTTO
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <Task Name="PlcTask" Id="{96ece0eb-a21b-4000-8986-812071c196ce}">
    <!--CycleTime in micro seconds.-->
    <CycleTime>10000</CycleTime>
--- a/solution/tc_project_app/Visualization
+++ b/solution/tc_project_app/Visualization
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
+<TcPlcObject Version="1.1.0.1">
  <VisuManager Name="Visualization Manager" Id="{9ab27b0a-e061-4269-b032-b221661a7379}">
    <XmlArchive>
      <Data>
@@ -43,12 +43,12 @@
          </o>
          <o n="RegisterDesc" t="GenericFbDescription">
            <d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
+              <v>FB_Exit</v>
+              <v>0be1b9ab-e8eb-4b33-b803-109abb46bde4</v>
              <v>FB_Init</v>
              <v>c98701bd-1e9f-450a-a2a8-a2474d536f2e</v>
              <v>FB_Reinit</v>
              <v>5b6e372a-a69d-40e8-aef7-f470b7c53d95</v>
-              <v>FB_Exit</v>
-              <v>0be1b9ab-e8eb-4b33-b803-109abb46bde4</v>
            </d>
            <v n="FbName">"NotImportant"</v>
            <v n="FbGuid">{aa8b7e42-e967-427f-8f2e-f00f9d706470}</v>
@@ -464,42 +464,42 @@
          </o>
          <o n="DefInpHandlerGuids" t="GenericFbDescription">
            <d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
-              <v>ExecuteLooseCapture</v>
-              <v>4e2884cd-dc97-4120-914c-87a83e618f1f</v>
-              <v>ExecuteMouseUp</v>
-              <v>57eea9a5-15d9-4269-bb8d-9fee5420cdb2</v>
-              <v>Init</v>
-              <v>e61a0910-39b6-4bcc-9a64-fcab62230628</v>
-              <v>FB_Exit</v>
-              <v>e6e1ea47-0811-4b03-9888-d0564361e0d6</v>
-              <v>ExecuteMouseDblClick</v>
-              <v>a517a0ac-170b-4df4-b289-55dcb57628ed</v>
-              <v>GetElementInfo</v>
-              <v>f64cb89f-3016-4fba-85f5-02efcd4282c1</v>
-              <v>ExecuteMouseDown</v>
-              <v>94bab392-b395-4c03-9d0e-5738d11bd021</v>
-              <v>FB_Reinit</v>
-              <v>97933c03-0169-4afe-ac83-de892204e120</v>
-              <v>Initialize</v>
-              <v>6946d6e0-129f-4425-b8b0-ef98281a99e9</v>
-              <v>ExecuteMouseMove</v>
-              <v>58fc221c-be14-4e34-871e-a118f8ba9539</v>
-              <v>ExecuteDialogClosed</v>
-              <v>f08d08b6-e70c-4bef-a136-38845bd246d8</v>
-              <v>ExecuteKeyUp</v>
-              <v>7403635b-2725-4f00-93d4-e0dd125959de</v>
-              <v>ExecuteKeyDown</v>
-              <v>9649ecda-3794-4d6b-a8a7-71e528d9d170</v>
              <v>abstrGetDefaultCursor</v>
              <v>25718998-50a9-408d-8b3f-20a55e2cc784</v>
+              <v>ExecuteDialogClosed</v>
+              <v>f08d08b6-e70c-4bef-a136-38845bd246d8</v>
+              <v>ExecuteKeyDown</v>
+              <v>9649ecda-3794-4d6b-a8a7-71e528d9d170</v>
+              <v>ExecuteKeyUp</v>
+              <v>7403635b-2725-4f00-93d4-e0dd125959de</v>
+              <v>ExecuteLooseCapture</v>
+              <v>4e2884cd-dc97-4120-914c-87a83e618f1f</v>
+              <v>ExecuteMouseClick</v>
+              <v>cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c</v>
+              <v>ExecuteMouseDblClick</v>
+              <v>a517a0ac-170b-4df4-b289-55dcb57628ed</v>
+              <v>ExecuteMouseDown</v>
+              <v>94bab392-b395-4c03-9d0e-5738d11bd021</v>
              <v>ExecuteMouseEnter</v>
              <v>569205fa-533b-4fc2-8d51-21ccab693305</v>
              <v>ExecuteMouseLeave</v>
              <v>3bacea68-55b4-4764-928e-e69910299932</v>
+              <v>ExecuteMouseMove</v>
+              <v>58fc221c-be14-4e34-871e-a118f8ba9539</v>
+              <v>ExecuteMouseUp</v>
+              <v>57eea9a5-15d9-4269-bb8d-9fee5420cdb2</v>
+              <v>FB_Exit</v>
+              <v>e6e1ea47-0811-4b03-9888-d0564361e0d6</v>
              <v>FB_Init</v>
              <v>f37e1250-9b48-45ca-810e-c192ea9440ec</v>
-              <v>ExecuteMouseClick</v>
-              <v>cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c</v>
+              <v>FB_Reinit</v>
+              <v>97933c03-0169-4afe-ac83-de892204e120</v>
+              <v>GetElementInfo</v>
+              <v>f64cb89f-3016-4fba-85f5-02efcd4282c1</v>
+              <v>Init</v>
+              <v>e61a0910-39b6-4bcc-9a64-fcab62230628</v>
+              <v>Initialize</v>
+              <v>6946d6e0-129f-4425-b8b0-ef98281a99e9</v>
            </d>
            <v n="FbName">"NotImportant"</v>
            <v n="FbGuid">{073ee466-cf0a-4c8b-ba92-64f671516699}</v>
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -16,7 +16,7 @@
    <Released>false</Released>
    <CompilerVersion>
    </CompilerVersion>
-    <WriteProductVersion>true</WriteProductVersion>
+    <WriteProductVersion>false</WriteProductVersion>
    <GenerateTpy>false</GenerateTpy>
    <CombineIds>true</CombineIds>
  </PropertyGroup>
@@ -448,8 +448,8 @@
  <ProjectExtensions>
    <PlcProjectOptions>
      <XmlArchive>
-  <Data>
-    <o xml:space="preserve" t="OptionKey">
+        <Data>
+          <o xml:space="preserve" t="OptionKey">
      <v n="Name">"&lt;ProjectRoot&gt;"</v>
      <d n="SubKeys" t="Hashtable" ckt="String" cvt="OptionKey">
        <v>{192FAD59-8248-4824-A8DE-9177C94C195A}</v>
@@ -519,16 +519,16 @@
      </d>
      <d n="Values" t="Hashtable" />
    </o>
-  </Data>
-  <TypeList>
-    <Type n="Boolean">System.Boolean</Type>
-    <Type n="Hashtable">System.Collections.Hashtable</Type>
-    <Type n="Int32">System.Int32</Type>
-    <Type n="NewestVersionConstraintToSave">{af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb}</Type>
-    <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
-    <Type n="String">System.String</Type>
-  </TypeList>
-</XmlArchive>
+        </Data>
+        <TypeList>
+          <Type n="Boolean">System.Boolean</Type>
+          <Type n="Hashtable">System.Collections.Hashtable</Type>
+          <Type n="Int32">System.Int32</Type>
+          <Type n="NewestVersionConstraintToSave">{af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb}</Type>
+          <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
+          <Type n="String">System.String</Type>
+        </TypeList>
+      </XmlArchive>
    </PlcProjectOptions>
  </ProjectExtensions>
 </Project>