Merge pull request #1 from 6G-SANDBOX/update

Update
6G-SANDBOX · Jun 26, 2023 · b6a879b · b6a879b
2 parents a399f22 + 7441221
commit b6a879b
Show file tree

Hide file tree

Showing 41 changed files with 58 additions and 37 deletions.
diff --git a/...s.UMA.Android/Tap.Plugins.UMA.Android.sln → OpenTAP.Android/OpenTAP.Android.sln b/...s.UMA.Android/Tap.Plugins.UMA.Android.sln → OpenTAP.Android/OpenTAP.Android.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.645
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tap.Plugins.UMA.Android", "Tap.Plugins.UMA.Android\Tap.Plugins.UMA.Android.csproj", "{3EFF847F-EEFC-4A7A-B4E8-5DB9B7C2DACF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTAP.Android", "OpenTAP.Android\OpenTAP.Android.csproj", "{3EFF847F-EEFC-4A7A-B4E8-5DB9B7C2DACF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/.../Instruments/ActivityManager/AmCommand.cs → .../Instruments/ActivityManager/AmCommand.cs b/.../Instruments/ActivityManager/AmCommand.cs → .../Instruments/ActivityManager/AmCommand.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...ments/ActivityManager/AmCommandBuilder.cs → ...ments/ActivityManager/AmCommandBuilder.cs b/...ments/ActivityManager/AmCommandBuilder.cs → ...ments/ActivityManager/AmCommandBuilder.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...ts/ActivityManager/AmCommandExtensions.cs → ...ts/ActivityManager/AmCommandExtensions.cs b/...ts/ActivityManager/AmCommandExtensions.cs → ...ts/ActivityManager/AmCommandExtensions.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...truments/ActivityManager/Intents/Extra.cs → ...truments/ActivityManager/Intents/Extra.cs b/...truments/ActivityManager/Intents/Extra.cs → ...truments/ActivityManager/Intents/Extra.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...ents/ActivityManager/Intents/ExtraType.cs → ...ents/ActivityManager/Intents/ExtraType.cs b/...ents/ActivityManager/Intents/ExtraType.cs → ...ents/ActivityManager/Intents/ExtraType.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...ityManager/Intents/ExtraTypeExtensions.cs → ...ityManager/Intents/ExtraTypeExtensions.cs b/...ityManager/Intents/ExtraTypeExtensions.cs → ...ityManager/Intents/ExtraTypeExtensions.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...ruments/ActivityManager/Intents/Intent.cs → ...ruments/ActivityManager/Intents/Intent.cs b/...ruments/ActivityManager/Intents/Intent.cs → ...ruments/ActivityManager/Intents/Intent.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...ts/ActivityManager/Intents/IntentFlags.cs → ...ts/ActivityManager/Intents/IntentFlags.cs b/...ts/ActivityManager/Intents/IntentFlags.cs → ...ts/ActivityManager/Intents/IntentFlags.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...yManager/Intents/IntentFlagsExtensions.cs → ...yManager/Intents/IntentFlagsExtensions.cs b/...yManager/Intents/IntentFlagsExtensions.cs → ...yManager/Intents/IntentFlagsExtensions.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/...A.Android/Instruments/AdbCommandResult.cs → ...P.Android/Instruments/AdbCommandResult.cs b/...A.Android/Instruments/AdbCommandResult.cs → ...P.Android/Instruments/AdbCommandResult.cs
diff --git a/...A.Android/Instruments/AdbInstallOption.cs → ...P.Android/Instruments/AdbInstallOption.cs b/...A.Android/Instruments/AdbInstallOption.cs → ...P.Android/Instruments/AdbInstallOption.cs
diff --git a/...Instruments/AdbInstallOptionExtensions.cs → ...Instruments/AdbInstallOptionExtensions.cs b/...Instruments/AdbInstallOptionExtensions.cs → ...Instruments/AdbInstallOptionExtensions.cs
diff --git a/....UMA.Android/Instruments/AdbInstrument.cs → ...nTAP.Android/Instruments/AdbInstrument.cs b/....UMA.Android/Instruments/AdbInstrument.cs → ...nTAP.Android/Instruments/AdbInstrument.cs
@@ -17,7 +17,7 @@
 namespace Tap.Plugins.UMA.Android.Instruments
 {
     [Display("adb Instrument",
-        Group: "UMA",
+        Group: "Android",
         Description: "Instrument for executing commands through Android's adb tool")]
     public class AdbInstrument : Instrument
     {

diff --git a/...ins.UMA.Android/Instruments/AdbProcess.cs → ...OpenTAP.Android/Instruments/AdbProcess.cs b/...ins.UMA.Android/Instruments/AdbProcess.cs → ...OpenTAP.Android/Instruments/AdbProcess.cs
diff --git a/...id/Instruments/Logcat/BackgroundLogcat.cs → ...id/Instruments/Logcat/BackgroundLogcat.cs b/...id/Instruments/Logcat/BackgroundLogcat.cs → ...id/Instruments/Logcat/BackgroundLogcat.cs
diff --git a/...ndroid/Instruments/Logcat/LogcatBuffer.cs → ...ndroid/Instruments/Logcat/LogcatBuffer.cs b/...ndroid/Instruments/Logcat/LogcatBuffer.cs → ...ndroid/Instruments/Logcat/LogcatBuffer.cs
diff --git a/...truments/Logcat/LogcatBufferExtensions.cs → ...truments/Logcat/LogcatBufferExtensions.cs b/...truments/Logcat/LogcatBufferExtensions.cs → ...truments/Logcat/LogcatBufferExtensions.cs
diff --git a/...nstruments/Logcat/LogcatCommandBuilder.cs → ...nstruments/Logcat/LogcatCommandBuilder.cs b/...nstruments/Logcat/LogcatCommandBuilder.cs → ...nstruments/Logcat/LogcatCommandBuilder.cs
diff --git a/...ndroid/Instruments/Logcat/LogcatFilter.cs → ...ndroid/Instruments/Logcat/LogcatFilter.cs b/...ndroid/Instruments/Logcat/LogcatFilter.cs → ...ndroid/Instruments/Logcat/LogcatFilter.cs
diff --git a/...ndroid/Instruments/Logcat/LogcatFormat.cs → ...ndroid/Instruments/Logcat/LogcatFormat.cs b/...ndroid/Instruments/Logcat/LogcatFormat.cs → ...ndroid/Instruments/Logcat/LogcatFormat.cs
diff --git a/...truments/Logcat/LogcatFormatExtensions.cs → ...truments/Logcat/LogcatFormatExtensions.cs b/...truments/Logcat/LogcatFormatExtensions.cs → ...truments/Logcat/LogcatFormatExtensions.cs
diff --git a/...roid/Instruments/Logcat/LogcatPriority.cs → ...roid/Instruments/Logcat/LogcatPriority.cs b/...roid/Instruments/Logcat/LogcatPriority.cs → ...roid/Instruments/Logcat/LogcatPriority.cs
diff --git a/...uments/Logcat/LogcatPriorityExtensions.cs → ...uments/Logcat/LogcatPriorityExtensions.cs b/...uments/Logcat/LogcatPriorityExtensions.cs → ...uments/Logcat/LogcatPriorityExtensions.cs
diff --git a/...ndroid/Instruments/ProcessDataReceiver.cs → ...ndroid/Instruments/ProcessDataReceiver.cs b/...ndroid/Instruments/ProcessDataReceiver.cs → ...ndroid/Instruments/ProcessDataReceiver.cs
diff --git a/...MA.Android/Tap.Plugins.UMA.Android.csproj → ...id/OpenTAP.Android/OpenTAP.Android.csproj b/...MA.Android/Tap.Plugins.UMA.Android.csproj → ...id/OpenTAP.Android/OpenTAP.Android.csproj
@@ -2,9 +2,14 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <UseWindowsForms>true</UseWindowsForms>
+    <UseWindowsForms>false</UseWindowsForms>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
+  <ItemGroup Condition="'$(IsWindows)'=='True'">
+	  <AdditionalOpenTapPackage Include="Developer's System CE" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="OpenTAP" Version="9.*" />
   </ItemGroup>

diff --git a/...ns.UMA.Android/Properties/AssemblyInfo.cs → ...penTAP.Android/Properties/AssemblyInfo.cs b/...ns.UMA.Android/Properties/AssemblyInfo.cs → ...penTAP.Android/Properties/AssemblyInfo.cs
diff --git a/OpenTAP.Android/OpenTAP.Android/Properties/launchSettings.json b/OpenTAP.Android/OpenTAP.Android/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Editor": {
+      "commandName": "Executable",
+      "executablePath": "./editor.exe"
+    }
+  }
+}
diff --git a/....UMA.Android/Steps/ActivityManagerStep.cs → ...nTAP.Android/Steps/ActivityManagerStep.cs b/....UMA.Android/Steps/ActivityManagerStep.cs → ...nTAP.Android/Steps/ActivityManagerStep.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s
@@ -16,7 +16,7 @@
 namespace Tap.Plugins.UMA.Android.Steps
 {
     [Display("Activity Manager",
-             Groups: new string[] { "UMA", "Android" },
+             Groups: new string[] { "Android" },
              Description: "Sends commands to the device's Activity Manager.")]
     public class ActivityManagerStep : AdbCommandStepBase
     {

diff --git a/...p.Plugins.UMA.Android/Steps/AdbCommand.cs → ...droid/OpenTAP.Android/Steps/AdbCommand.cs b/...p.Plugins.UMA.Android/Steps/AdbCommand.cs → ...droid/OpenTAP.Android/Steps/AdbCommand.cs
diff --git a/...ugins.UMA.Android/Steps/AdbCommandStep.cs → ...d/OpenTAP.Android/Steps/AdbCommandStep.cs b/...ugins.UMA.Android/Steps/AdbCommandStep.cs → ...d/OpenTAP.Android/Steps/AdbCommandStep.cs
@@ -11,7 +11,7 @@
 namespace Tap.Plugins.UMA.Android.Steps
 {
     [Display("adb Command",
-        Groups: new string[] { "UMA", "Android" },
+        Groups: new string[] { "Android" },
         Description: "Send a command using Android's adb tool")]
     public class AdbCommandStep : AdbCommandStepBase
     {

diff --git a/...s.UMA.Android/Steps/AdbCommandStepBase.cs → ...enTAP.Android/Steps/AdbCommandStepBase.cs b/...s.UMA.Android/Steps/AdbCommandStepBase.cs → ...enTAP.Android/Steps/AdbCommandStepBase.cs
@@ -1,4 +1,4 @@
-// Author:      Bruno Garcia Garcia <bgarcia@lcc.uma.es>
+// Author:      Bruno Garcia Garcia <bgg@uma.es>
 // Copyright:   Copyright 2016-2021 Universidad de Málaga (University of Málaga), Spain
 //
 // This file is part of the TRIANGLE project. The TRIANGLE project is funded by the European Union’s

diff --git a/....Plugins.UMA.Android/Steps/AdbStepBase.cs → ...roid/OpenTAP.Android/Steps/AdbStepBase.cs b/....Plugins.UMA.Android/Steps/AdbStepBase.cs → ...roid/OpenTAP.Android/Steps/AdbStepBase.cs
diff --git a/...gins.UMA.Android/Steps/ClearLogcatStep.cs → .../OpenTAP.Android/Steps/ClearLogcatStep.cs b/...gins.UMA.Android/Steps/ClearLogcatStep.cs → .../OpenTAP.Android/Steps/ClearLogcatStep.cs
@@ -10,7 +10,7 @@
 namespace Tap.Plugins.UMA.Android.Steps
 {
     [Display("Clear logcat",
-        Groups: new string[] { "UMA", "Android" },
+        Groups: new string[] { "Android" },
         Description: "Clears the logcat from an Android device.")]
     public class ClearLogcatStep : AdbStepBase
     {

diff --git a/....UMA.Android/Steps/LogcatExecutionMode.cs → ...nTAP.Android/Steps/LogcatExecutionMode.cs b/....UMA.Android/Steps/LogcatExecutionMode.cs → ...nTAP.Android/Steps/LogcatExecutionMode.cs
diff --git a/...ins.UMA.Android/Steps/LogcatFilterPair.cs → ...OpenTAP.Android/Steps/LogcatFilterPair.cs b/...ins.UMA.Android/Steps/LogcatFilterPair.cs → ...OpenTAP.Android/Steps/LogcatFilterPair.cs
diff --git a/...ins.UMA.Android/Steps/LogcatOutputMode.cs → ...OpenTAP.Android/Steps/LogcatOutputMode.cs b/...ins.UMA.Android/Steps/LogcatOutputMode.cs → ...OpenTAP.Android/Steps/LogcatOutputMode.cs
diff --git a/...p.Plugins.UMA.Android/Steps/LogcatStep.cs → ...droid/OpenTAP.Android/Steps/LogcatStep.cs b/...p.Plugins.UMA.Android/Steps/LogcatStep.cs → ...droid/OpenTAP.Android/Steps/LogcatStep.cs
@@ -16,7 +16,7 @@
 namespace Tap.Plugins.UMA.Android.Steps
 {
     [Display("Logcat",
-        Groups: new string[] { "UMA", "Android" },
+        Groups: new string[] { "Android" },
         Description: "Gets the logcat from an Android device.")]
     public class LogcatStep : AdbStepBase
     {

diff --git a/...oid/Steps/RetrieveBackgroundLogcatStep.cs → ...oid/Steps/RetrieveBackgroundLogcatStep.cs b/...oid/Steps/RetrieveBackgroundLogcatStep.cs → ...oid/Steps/RetrieveBackgroundLogcatStep.cs
@@ -11,7 +11,7 @@
 namespace Tap.Plugins.UMA.Android.Steps
 {
     [Display("Retrieve Background Logcat",
-        Groups: new string[] { "UMA", "Android" },
+        Groups: new string[] { "Android" },
         Description: "Gets the logcat from background process running in an Android device, and stops it.")]
     public class RetrieveBackgroundLogcatStep : AdbStepBase
     {

diff --git a/OpenTAP.Android/OpenTAP.Android/package.xml b/OpenTAP.Android/OpenTAP.Android/package.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+InfoLink: Specifies a location where additional information about the package can be found.
+Version: The version of the package. This can be automatically updated from GIT.
+Configuration: Can be any kind of information, such as bit version or git branch name.
+
+For Version and Configuration the following macros are available (Only works if the project directory is under Git source control):
+$(GitVersion) - Gets the version from Git.
+-->
+<Package Name="Android Debug Bridge" xmlns="http://opentap.io/schemas/package" InfoLink="https://morse.uma.es/"
+		 OS="Windows,Linux,OSX" Version="1.0.7">
+	<Description>
+		Base plugin for controlling Android devices and applications through Adb.
+		<Organisation>University of Malaga</Organisation>
+	</Description>
+
+	<Owner>ITIS UMA</Owner>
+	<SourceUrl>https://github.com/6G-SANDBOX/OpenTAP.Android</SourceUrl>
+	<SourceLicense>Apache-2.0</SourceLicense>
+
+	<Files>
+		<File Path="OpenTAP.Android.dll">
+			<SetAssemblyInfo Attributes="Version"/>
+		</File>
+	</Files>
+</Package>
diff --git a/Tap.Plugins.UMA.Android/Tap.Plugins.UMA.Android/package.xml b/Tap.Plugins.UMA.Android/Tap.Plugins.UMA.Android/package.xml