upgrade to support new disposable version

Mobject-Dev-Team-Archive · Mar 21, 2023 · c638db5 · c638db5
1 parent e919148
commit c638db5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.1
+
+- Updated to support mobject-disposable v0.3.1-alpha
+
 ## 0.4.0
 
 - Updated to support mobject-disposable v0.3.0-alpha
diff --git a/src/mobject-events-library/mobject-events-test-project/Main/Main.plcproj b/src/mobject-events-library/mobject-events-test-project/Main/Main.plcproj
@@ -65,11 +65,16 @@
       <SubType>Content</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <PlaceholderResolution Include="mobject-events">
+      <Resolution>mobject-events, 0.4.1 (mobject)</Resolution>
+    </PlaceholderResolution>
+  </ItemGroup>
   <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>{40450F57-0AA3-4216-96F3-5444ECB29763}</v>
@@ -90,13 +95,13 @@
       </d>
       <d n="Values" t="Hashtable" />
     </o>
-  </Data>
-  <TypeList>
-    <Type n="Hashtable">System.Collections.Hashtable</Type>
-    <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
-    <Type n="String">System.String</Type>
-  </TypeList>
-</XmlArchive>
+        </Data>
+        <TypeList>
+          <Type n="Hashtable">System.Collections.Hashtable</Type>
+          <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
+          <Type n="String">System.String</Type>
+        </TypeList>
+      </XmlArchive>
     </PlcProjectOptions>
   </ProjectExtensions>
 </Project>
diff --git a/src/mobject-events-library/mobject-events-test-project/mobject-events-test-project.tsproj b/src/mobject-events-library/mobject-events-test-project/mobject-events-test-project.tsproj
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.35">
+<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4025.12">
 	<Project ProjectGUID="{EE80D651-C063-4DDB-A2E6-0E65F76477EB}" Target64Bit="true" ShowHideConfigurations="#x3c7">
 		<System>
 			<Tasks>
@@ -10,7 +10,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{99410A04-EDBC-4BE9-8215-58B13429C019}" Name="Main" PrjFilePath="Main\Main.plcproj" TmcFilePath="Main\Main.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Main\Main.tmc" TmcHash="{49AA5B7A-0FD2-CE95-6574-1524AEFDFC26}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Main\Main.tmc" TmcHash="{81028C81-40E9-82AE-4419-0F2A8E9A8565}">
 					<Name>Main Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Contexts>
@@ -24,9 +24,7 @@
 							<CycleTime>10000000</CycleTime>
 						</Context>
 					</Contexts>
-					<TaskPouOids>
-						<TaskPouOid Prio="20" OTCID="#x08502001"/>
-					</TaskPouOids>
+					<TaskPouOids/>
 				</Instance>
 			</Project>
 		</Plc>

diff --git a/src/mobject-events-library/mobject-events.sln b/src/mobject-events-library/mobject-events.sln
@@ -21,32 +21,28 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
-		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
-		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMV7-M)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
-		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
-		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMV7-M)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
 		{EE80D651-C063-4DDB-A2E6-0E65F76477EB}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
-		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
-		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
+		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMV7-M)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
-		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
-		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
+		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMV7-M)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
 		{B7906F04-D3DC-44F4-B636-5DD4F429376F}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)

diff --git a/src/mobject-events-library/mobject-events/mobject-events/mobject-events.plcproj b/src/mobject-events-library/mobject-events/mobject-events/mobject-events.plcproj
@@ -18,7 +18,7 @@
     <Company>mobject</Company>
     <Released>false</Released>
     <Title>mobject-events</Title>
-    <ProjectVersion>0.4.0</ProjectVersion>
+    <ProjectVersion>0.4.1</ProjectVersion>
     <DefaultNamespace>mobject-events</DefaultNamespace>
     <Author>mobject dev team</Author>
     <CombineIds>true</CombineIds>
@@ -82,7 +82,7 @@
   </ItemGroup>
   <ItemGroup>
     <PlaceholderResolution Include="mobject-disposable">
-      <Resolution>mobject-disposable, 0.3.0 (mobject)</Resolution>
+      <Resolution>mobject-disposable, 0.3.1 (mobject)</Resolution>
     </PlaceholderResolution>
   </ItemGroup>
   <ProjectExtensions>