Merge remote-tracking branch 'origin/development'

Author: RobertPoienar

.github/ISSUE_TEMPLATE/bug-report.md

@@ -14,7 +14,7 @@ assignees: ''
 (2019.4.40f1, 2020.3.31f1, 2020.3.40f1, 2021.3.2f1, 2021.3.11f1, etc)
 
 **What version of AltTester® Unity SDK are you using?**
-(1.6.6, 1.7.0, 1.7.1, 1.7.2, 1.8.0, 1.8.1, 1.8.2, 2.0.0, 2.0.1, 2.0.2, 2.0.3, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.2)
+(1.6.6, 1.7.0, 1.7.1, 1.7.2, 1.8.0, 1.8.1, 1.8.2, 2.0.0, 2.0.1, 2.0.2, 2.0.3, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.2, 2.2.4)
 
 **On what device are you trying to run the test?**
 (Android, iOS)

.github/workflows/push.yml

@@ -38,7 +38,7 @@ jobs:
               - 'Bindings~/robot/**'
 
   Roslyn-Analyzer-dotnet:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: paths-filter
     steps:
       - uses: actions/checkout@v2
@@ -51,7 +51,7 @@ jobs:
         run: dotnet build AltTester-Unity-SDK.sln --no-restore -warnaserror -p:EnforceCodeStyleInBuild=true -p:EnforceCodeStyleInIDE=true
 
   build-macOS:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: Roslyn-Analyzer-dotnet
     if: needs.paths-filter.outputs.csharp == 'true' || needs.paths-filter.outputs.scenes == 'true' || needs.paths-filter.outputs.python == 'true' || needs.paths-filter.outputs.java == 'true' || needs.paths-filter.outputs.robot == 'true'
     steps:
@@ -85,7 +85,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   build-android:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: Roslyn-Analyzer-dotnet
 
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development' || needs.paths-filter.outputs.proxy == 'true' || needs.paths-filter.outputs.scenes == 'true' || needs.paths-filter.outputs.python == 'true'
@@ -120,7 +120,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   build-ipa:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: Roslyn-Analyzer-dotnet
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/development' || needs.paths-filter.outputs.proxy == 'true' || needs.paths-filter.outputs.scenes == 'true' || needs.paths-filter.outputs.python == 'true'
     steps:
@@ -155,7 +155,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   test-CSharp-Editor:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: build-macOS
     if: needs.paths-filter.outputs.csharp == 'true' || needs.paths-filter.outputs.scenes == 'true' || needs.paths-filter.outputs.python == 'true' || needs.paths-filter.outputs.java == 'true'
     steps:
@@ -198,7 +198,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   test-DotNet:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: build-macOS
     if: needs.paths-filter.outputs.csharp == 'true' || needs.paths-filter.outputs.scenes == 'true'
     steps:
@@ -239,7 +239,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   test-Python:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: build-macOS
     if: needs.paths-filter.outputs.python == 'true' || needs.paths-filter.outputs.scenes == 'true'
     steps:
@@ -312,7 +312,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   test-Robot:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: build-macOS
     if: needs.paths-filter.outputs.python == 'true' || needs.paths-filter.outputs.scenes == 'true' || needs.paths-filter.outputs.robot == 'true'
     steps:
@@ -336,11 +336,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip setuptools wheel
-          pip install -r "Bindings~/robot/requirements.txt"
-          pip install -e "Bindings~/robot" --root "Bindings~/robot"
-          pip uninstall -y AltTester-Driver
-          pip install -e "Bindings~/python" --root "Bindings~/python"
+          pip install --upgrade pip setuptools wheel  --break-system-packages
+          pip install -r "Bindings~/robot/requirements.txt" --break-system-packages
+          pip install -e "Bindings~/robot" --break-system-packages
+          pip uninstall -y AltTester-Driver --break-system-packages
+          pip install -e "Bindings~/python" --break-system-packages
+
+          pip list
 
       - name: Run Robot tests
         run: |
@@ -359,7 +361,7 @@ jobs:
             **/output.xml
 
   test-Java:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs: build-macOS
     if: needs.paths-filter.outputs.java == 'true' || needs.paths-filter.outputs.scenes == 'true'
     steps:
@@ -406,7 +408,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   copyright:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     steps:
       - run: |
           pwsh copyright.ps1
@@ -425,7 +427,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
 
   test-Python-Browserstack-ios-android:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     needs:
       - build-android
       - build-ipa

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish-python-pip-package:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
           python3 -m twine upload dist/*
 
   publish-robot-pip-package:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v3
@@ -60,21 +60,22 @@ jobs:
         run: |
           cd "Bindings~/dotnet"
           dotnet pack AltDriver/AltDriver.csproj -c release
-          dotnet nuget push AltDriver/bin/release/AltTester-Driver.2.2.2.nupkg --api-key $NUGET_DEPLOY_KEY --source https://api.nuget.org/v3/index.json
+          dotnet nuget push AltDriver/bin/release/AltTester-Driver.2.2.4.nupkg --api-key $NUGET_DEPLOY_KEY --source https://api.nuget.org/v3/index.json
 
   create-unity-package:
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
     steps:
       - uses: actions/checkout@v3
       - name: Create Unity Package
         run: |
           mkdir -p public/AltTester || true
           mkdir -p public/SampleScenes || true
+          VERSION=$(jq -r '.version' Assets/AltTester/package.json | sed 's/\./_/g')
           $UNITY_2021_3_HOME -batchmode -projectPath $CI_PROJECT_DIR -executeMethod AltTester.AltTesterUnitySDK.Editor.AltTesterEditorWindow.CreatePackages -logFile createPackages.log -quit
           ls
           AUT=$(find -E . -regex ".*/AltTester.*\.unitypackage")
-          cp $AUT public/AltTester/AltTester.unitypackage
-          cp $AUT public/AltTester/AltTester_2_0_1.unitypackage
+          cp $AUT public/AltTester/AltTesterUnitySDK.unitypackage
+          cp $AUT public/AltTester/AltTesterUnitySDK_${VERSION}.unitypackage
           cp SampleScenes.unitypackage public/AltTester/SampleScenes.unitypackage
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/runs-at-night.yml

@@ -14,7 +14,7 @@ env:
 jobs:
   build-webgl:
     timeout-minutes: 60
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v4
@@ -54,7 +54,7 @@ jobs:
 
   build-ios:
     timeout-minutes: 60
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v4
@@ -97,7 +97,7 @@ jobs:
 
   build-android:
     timeout-minutes: 60
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v4
@@ -139,7 +139,7 @@ jobs:
     timeout-minutes: 60 # Set job timeout to 1 hour
     needs: build-webgl
 
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v4
@@ -203,7 +203,7 @@ jobs:
     timeout-minutes: 60 # Set job timeout to 1 hour
     needs: build-webgl
 
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v4
@@ -265,12 +265,11 @@ jobs:
           name: webgl-python-logs
           path: "**/*.log"
 
-
   test-webgl-java:
     timeout-minutes: 60 # Set job timeout to 1 hour
     needs: build-webgl
 
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     steps:
       - uses: actions/checkout@v4
@@ -336,7 +335,7 @@ jobs:
   test-ios-browserstack-python:
     needs: build-ios
     timeout-minutes: 60 # Set job timeout to 1 hour
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     env:
       RUN_IN_BROWSERSTACK: true
@@ -356,9 +355,15 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
+      - name: Create and activate virtual environment
+        run: |
+          python3 -m venv venv 
+          source venv/bin/activate  
+          echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV  # Export the virtual environment path
 
       - name: Install dependencies
         run: |
+          source venv/bin/activate  # Activate the virtual environment
           pip install --upgrade pip setuptools wheel
           pip uninstall -y AltTester-Driver
           pip install -r "Bindings~/python/requirements.txt"
@@ -417,7 +422,7 @@ jobs:
   test-android-browserstack-python:
     needs: build-android
     timeout-minutes: 60 # Set job timeout to 1 hour
-    runs-on: [self-hosted, macOS]
+    runs-on: [self-hosted, MAC37]
 
     env:
       RUN_IN_BROWSERSTACK: true
@@ -436,10 +441,17 @@ jobs:
           name: android-build
           path: Bindings~/python/
 
+      - name: Create and activate virtual environment
+        run: |
+          python3 -m venv venv 
+          source venv/bin/activate  
+          echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV  # Export the virtual environment path
+
       - run: ls -l Bindings~/python/
 
       - name: Install dependencies
         run: |
+          source venv/bin/activate  # Activate the virtual environment
           pip install --upgrade pip setuptools wheel
           pip uninstall -y AltTester-Driver
           pip install -r "Bindings~/python/requirements.txt"

.github/workflows/upload-package-to-staging.yml

@@ -0,0 +1,52 @@
+name: upload-package-to-staging
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - development
+
+jobs:
+  create-unity-package:
+    runs-on: [self-hosted, MAC37]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create Unity Package
+        run: |
+          mkdir -p public/AltTester || true
+          mkdir -p public/SampleScenes || true
+          VERSION=$(jq -r '.version' Assets/AltTester/package.json | sed 's/\./_/g')
+          $UNITY_2021_3_HOME -batchmode -projectPath $CI_PROJECT_DIR -executeMethod AltTester.AltTesterUnitySDK.Editor.AltTesterEditorWindow.CreatePackages -logFile createPackages.log -quit
+          ls
+          AUT=$(find -E . -regex ".*/AltTester.*\.unitypackage")
+          cp $AUT public/AltTester/AltTesterUnitySDK.unitypackage
+          cp $AUT public/AltTester/AltTesterUnitySDK_${VERSION}.unitypackage
+          cp SampleScenes.unitypackage public/AltTester/SampleScenes.unitypackage
+      - uses: actions/upload-artifact@v4
+        with:
+          name: AltTester
+          path: public/AltTester
+
+  upload-unity-package:
+    runs-on: ubuntu-latest
+    needs: create-unity-package
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: AltTester
+          path: AltTester/
+
+      - name: Upload AltTesterPackage
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          source: AltTester/*
+          target: ${{ secrets.SDK_PATH }}
+          host: ${{ secrets.HOST_IP_ALTTESTER }}
+          port: ${{ secrets.PORT_DEV_ALTTESTER }}
+          username: ${{ secrets.USERNAME_ALTTESTER }}
+          password: ${{ secrets.PASSWORD_ALTTESTER }}
+          rm: true
+          strip_components: 1

Assets/AltTester/Editor/DefaultTestExample.txt

@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using AltTester.AltTesterUnitySDK.Driver;
+using AltTester.AltTesterSDK.Driver;
 
 public class #SCRIPTNAME#
 {   //Important! If your test file is inside a folder that contains an .asmdef file, please make sure that the assembly definition references NUnit.

Assets/AltTester/Editor/Scripts/AltTesterEditor/AltBuilder.cs

@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 using System.IO;
 using System.Linq;
 using AltTester.AltTesterUnitySDK.Commands;
-using AltTester.AltTesterUnitySDK.Driver;
+using AltTester.AltTesterSDK.Driver;
 using AltTester.AltTesterUnitySDK.Editor.Logging;
 #if UNITY_2021_3_OR_NEWER && ADDRESSABLES
 using UnityEditor.AddressableAssets;

Assets/AltTester/Editor/Scripts/AltTesterEditor/AltEditorConfiguration.cs

@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 using AltTester.AltTesterUnitySDK;
 using UnityEngine;
 using System;
-using AltTester.AltTesterUnitySDK.Driver;
+using AltTester.AltTesterSDK.Driver;
 using AltTester.AltTesterUnitySDK.Editor.Platform;
 
 namespace AltTester.AltTesterUnitySDK.Editor

Assets/AltTester/Editor/Scripts/AltTesterEditor/AltTestRunner.cs

@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 using System.Linq;
 using System.Reflection;
 using System.Xml;
-using AltTester.AltTesterUnitySDK.Driver;
+using AltTester.AltTesterSDK.Driver;
 using AltTester.AltTesterUnitySDK.Editor.Logging;
 using AltTester.AltTesterUnitySDK.Editor.Platform;
 using Newtonsoft.Json;

Assets/AltTester/Editor/Scripts/AltTesterEditor/AltTesterEditorWindow.cs

@@ -20,9 +20,10 @@ You should have received a copy of the GNU General Public License
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading;
 using AltTester.AltTesterUnitySDK.Commands;
-using AltTester.AltTesterUnitySDK.Driver;
+using AltTester.AltTesterSDK.Driver;
 using AltTester.AltTesterUnitySDK.Editor.Logging;
 using AltTester.AltTesterUnitySDK.Editor.Platform;
 using Unity.EditorCoroutines.Editor;
@@ -946,7 +947,7 @@ private void displayBuildSettings()
                 labelAndInputFieldHorizontalLayout("Company Name*", ref companyName);
                 UnityEditor.PlayerSettings.companyName = companyName;
 
-                var productName = UnityEditor.PlayerSettings.productName;
+                var productName = Regex.Replace(UnityEditor.PlayerSettings.productName, "[^a-zA-Z0-9 _-]", "");
                 labelAndInputFieldHorizontalLayout("Product Name*", ref productName);
                 UnityEditor.PlayerSettings.productName = productName;