Merge pull request #1279 from WEKIT-ECS/release_2.0

Release 2.0 to Master
WEKIT-ECS · Feb 22, 2023 · ca8e208 · ca8e208
2 parents 3188d8b + 0aafa03
commit ca8e208
Show file tree

Hide file tree

Showing 1,077 changed files with 169,066 additions and 9,445 deletions.
diff --git a/.github/workflows/linux_workflow.yml b/.github/workflows/linux_workflow.yml
@@ -17,28 +17,40 @@ jobs:
           echo "path of the credentials resource $GITHUB_WORKSPACE/ibm-credentials.txt"
           export IBM_CREDENTIALS_FILE="$GITHUB_WORKSPACE/ibm-credentials.env"
 
+      # Fonts
+      - name: Install fonts
+        run: |
+          echo -n "Installing core fonts"
+          echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | sudo debconf-set-selections
+          echo "ttf-mscorefonts-installer msttcorefonts/present-mscorefonts-eula note" | sudo debconf-set-selections
+          sudo apt install ttf-mscorefonts-installer
+          sudo fc-cache -f
+          fc-match Arial
+
       # Cache
       - name: Caching
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: Library
-          key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+          key: Library-linux-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
           restore-keys: |
-            Library-
+            Library-linux
 
       # Test stage
       - name: Unity Test runner (edit and play mode)
-        uses: game-ci/[email protected].0-alpha-7
+        uses: game-ci/[email protected].3
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
-          unityVersion: 2020.3.13f1
-
+          unityVersion: 2021.3.8f1
+      
   build:
     name: Build Unity
     runs-on: ubuntu-latest
     needs: test
+    outputs:
+      buildVersion: ${{ steps.buildStep.outputs.buildVersion }}
     steps:
       # Activation stage
       - name: Checkout repository
@@ -52,35 +64,67 @@ jobs:
           ls -la
           echo "path of the credentials resource $GITHUB_WORKSPACE/ibm-credentials.txt"
           export IBM_CREDENTIALS_FILE="$GITHUB_WORKSPACE/ibm-credentials.env"
+          export TARGET_PLATFORM="Android"
+
+      # Fonts
+      - name: Install fonts
+        run: |
+          echo -n "Installing core fonts"
+          echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | sudo debconf-set-selections
+          echo "ttf-mscorefonts-installer msttcorefonts/present-mscorefonts-eula note" | sudo debconf-set-selections
+          sudo apt install ttf-mscorefonts-installer
+          sudo fc-cache -f
+          fc-match Arial
 
       # Cache
       - name: Caching
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: Library
-          key: Library-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
+          key: Library-linux-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
           restore-keys: |
-            Library-
+            Library-linux
 
       # Build stage
       - name: Unity builder
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v2.1.1
         id: buildStep
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         with:
           targetPlatform: Android
-          unityVersion: 2020.3.13f1
+          unityVersion: 2021.3.8f1
           versioning: Semantic
           # dirty build needed to include generated Watson credentials
           allowDirtyBuild: true
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: Build
+          name: Android
           path: build
-          retention-days: 90
+          retention-days: 3
           if-no-files-found: error
+
+# Deploy stage
+  prerelease-notification:
+    name: Prerelease Slack notification
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.ref == 'refs/heads/develop' && !github.event.pull_request
+    env:
+      SLACK_URL: ${{ secrets.SLACK_URL }}
+      COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+      APP_VERSION: ${{ needs.build.outputs.buildVersion }}
+      TARGET_PLATFORM: ${{ runner.os }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Post notification
+        run: |
+          echo $APP_VERSION
+          sudo apt-get update && sudo apt-get -y install curl
+          chmod +x ./ci/notify-preview.sh && ./ci/notify-preview.sh
diff --git a/.github/workflows/unity_activation_windows.yml b/.github/workflows/unity_activation_windows.yml
@@ -14,11 +14,11 @@ jobs:
       - name: Setup Unity
         uses: kuler90/[email protected]
         with:
-          unity-version: 2020.3.13f1
+          unity-version: 2021.3.8f1
 
       # Request manual activation file
       - name: Request manual activation file
-        run: ci\get_windows_activation_file.bat
+        run: .\ci\get_windows_activation_file.bat
       # Upload artifact (Unity_v20XX.X.XXXX.alf)
       - name: Expose as artifact
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/windows_workflow.yml b/.github/workflows/windows_workflow.yml
@@ -30,6 +30,7 @@ jobs:
           echo -n "$env:ASSISTANTKEYS" > $env:GITHUB_WORKSPACE/ibm-credentials.env
           echo "path of the credentials resource $env:GITHUB_WORKSPACE/Assets/Resources/ibm-credentials.txt"
           $env:IBM_CREDENTIALS_FILE="$env:GITHUB_WORKSPACE/ibm-credentials.env"
+          $env:TARGET_PLATFORM="Hololens"
 
       # Cache
       - name: Caching
@@ -47,7 +48,7 @@ jobs:
 
       # Build stage
       - name: Unity builder
-        uses: game-ci/unity-builder@v2.0.1
+        uses: game-ci/unity-builder@v2.1.1
         id: buildStep
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
@@ -151,6 +152,7 @@ jobs:
       SLACK_URL: ${{ secrets.SLACK_URL }}
       COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
       APP_VERSION: ${{ needs.build_unity.outputs.buildVersion }}
+      TARGET_PLATFORM: ${{ runner.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 /[Bb]uild/
 /[Bb]uilds/
 /[Ll]ogs/
+/[Uu]ser[Ss]ettings/
 /[Mm]emoryCaptures/
 UWP/
 QCAR/
@@ -35,7 +36,6 @@ QCAR/
 .vs/
 .vscode/
 
-Assets/TextMesh Pro*
 
 # Gradle cache directory
 .gradle/

diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -13,18 +13,32 @@ MonoBehaviour:
   m_Name: AddressableAssetSettings
   m_EditorClassIdentifier: 
   m_DefaultGroup: bec1afb347441f242b5ca379ab102994
+  m_CachedHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_BundleLocalCatalog: 0
+  m_CatalogRequestsTimeout: 0
   m_DisableCatalogUpdateOnStart: 0
   m_IgnoreUnsupportedFilesInBuild: 0
   m_UniqueBundleIds: 0
+  m_NonRecursiveBuilding: 1
+  m_CCDEnabled: 0
   m_maxConcurrentWebRequests: 500
   m_ContiguousBundles: 0
+  m_StripUnityVersionFromBundleBuild: 0
+  m_DisableVisibleSubAssetRepresentations: 0
+  m_ShaderBundleNaming: 0
+  m_ShaderBundleCustomNaming: 
+  m_MonoScriptBundleNaming: 0
+  m_MonoScriptBundleCustomNaming: 
   m_RemoteCatalogBuildPath:
     m_Id: 
   m_RemoteCatalogLoadPath:
     m_Id: 
+  m_ContentStateBuildPath: 
+  m_BuildAddressablesWithPlayerBuild: 2
   m_overridePlayerVersion: 
   m_GroupAssets:
   - {fileID: 11400000, guid: a5b5fc9452f7c4f41a0c000b52bdd45e, type: 2}

diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin