* build plc slnf

TcOpenGroup · Aug 30, 2023 · 230028f · 230028f
1 parent a9a0100
commit 230028f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/TcOpen.plc.slnf b/TcOpen.plc.slnf
@@ -25,7 +25,7 @@
       "src\\TcoDrivesBeckhoff\\tests\\TcoDrivesBeckhoffTestsConnector\\TcoDrivesBeckhoffTestsConnector.csproj",
       "src\\TcoAbbRobotics\\src\\TcoAbbRoboticsConnector\\TcoAbbRoboticsConnector.csproj",
       "src\\TcoAbbRobotics\\src\\XaeTcoAbbRobotics\\XaeTcoAbbRobotics.tsproj",
-      "src\\TcoAbbRobotics\\tests\\TcoAbbRoboticsTestsConnector\\TcoDrivesBeckhoffTestsConnector.csproj",
+       "src\\TcoAbbRobotics\\tests\\TcoAbbRoboticsTestsConnector\\TcoAbbRoboticsTestsConnector.csproj",
       "src\\TcoElements\\src\\TcoElementsConnector\\TcoElementsConnector.csproj",
       "src\\TcoElements\\src\\XAE\\XAE\\XAETcoElements.tsproj",
       "src\\TcoElements\\tests\\TcoElementsTestsConnector\\TcoElementsTestsConnector.csproj",

diff --git a/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceViewModel.cs b/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceViewModel.cs
@@ -8,12 +8,11 @@
 using System.Windows;
 using Vortex.Connector;
 using Vortex.Presentation.Wpf;
-using RelayCommand = TcOpen.Inxton.Input.RelayCommand;
 
 
 namespace TcoAbbRobotics
 {
-    public class TcoIrc5_v_1_x_xServiceViewModel : TcoAbbRoboticsBaseServiceViewModel<TcoAbbRobotics>
+    public class TcoIrc5_v_1_x_xServiceViewModel : TcoAbbRoboticsBaseServiceViewModel<TcoIrc5_v_1_x_x>
     {
 
         public TcoIrc5_v_1_x_xServiceViewModel():base()

diff --git a/...bbRobotics/src/TcoAbbRobotics.Wpf/Omnicore/Service/TcoOmnicore_v_1_x_xServiceViewModel.cs b/...bbRobotics/src/TcoAbbRobotics.Wpf/Omnicore/Service/TcoOmnicore_v_1_x_xServiceViewModel.cs
@@ -8,7 +8,6 @@
 using System.Windows;
 using Vortex.Connector;
 using Vortex.Presentation.Wpf;
-using RelayCommand = TcOpen.Inxton.Input.RelayCommand;
 
 
 namespace TcoAbbRobotics

diff --git a/src/TcoAbbRobotics/src/TcoAbbRoboticsConnector/Properties/Localizations.resx b/src/TcoAbbRobotics/src/TcoAbbRoboticsConnector/Properties/Localizations.resx
@@ -123,9 +123,6 @@
   <data name="___Program_execution_error_see_robot_panel_for_details__" xml:space="preserve">
     <value>Program execution error see robot panel for details</value>
   </data>
-  <data name="___Safety_circuit_open__" xml:space="preserve">
-    <value>Safety circuit open</value>
-  </data>
   <data name="___Drive_error_no___" xml:space="preserve">
     <value>Drive error no </value>
   </data>
@@ -174,6 +171,9 @@
   <data name="___Restore__" xml:space="preserve">
     <value>Restore</value>
   </data>
+  <data name="___Safety_circuit_open__" xml:space="preserve">
+    <value>Safety circuit open</value>
+  </data>
   <data name="___Invalid_reference____" xml:space="preserve">
     <value>Invalid reference: </value>
   </data>

diff --git a/src/TcoAbbRobotics/src/XaeTcoAbbRobotics/TcoAbbRoboticsTests/TcoAbbRoboticsTests.plcproj b/src/TcoAbbRobotics/src/XaeTcoAbbRobotics/TcoAbbRoboticsTests/TcoAbbRoboticsTests.plcproj
@@ -87,6 +87,7 @@
     </PlaceholderReference>
     <PlaceholderReference Include="TcoAbbRobotics">
       <DefaultResolution>TcoAbbRobotics, 0.6.0.913 (Vortex.Library)</DefaultResolution>
+      <Namespace>TcoAbbRobotics</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoAbstractions">
       <DefaultResolution>TcoAbstractions, 0.6.0.913 (Vortex.Library)</DefaultResolution>
@@ -98,7 +99,6 @@
     </PlaceholderReference>
     <PlaceholderReference Include="TcoIo">
       <DefaultResolution>TcoIo, 0.6.0.913 (Vortex.Library)</DefaultResolution>
-      <Namespace>TcoIo</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoUtilities">
       <DefaultResolution>TcoUtilities, 0.6.0.913 (Vortex.Library)</DefaultResolution>