Merge branch 'development' into dev/component-upgrade-downgrade-utility

.github/workflows/build.yml

@@ -13,7 +13,7 @@ on:
 
 concurrency:
   group: ${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   validate-editor-installation:
@@ -23,10 +23,10 @@ jobs:
       matrix:
         include:
           - os: windows
-          - os: macos
+          #- os: macos
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           clean: true
 
@@ -43,8 +43,8 @@ jobs:
             build-target: Android
           - os: windows
             build-target: StandaloneWindows64
-          - os: macos
-            build-target: Android
+          #- os: macos
+          #  build-target: Android
 
     steps:
       - name: clean git
@@ -58,11 +58,14 @@ jobs:
           }
         shell: pwsh
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
-          submodules: recursive
           clean: true
 
+      - name: Checkout submodules
+        run: |
+          git submodule update --init --recursive
+
       - name: Unity Build (${{ matrix.build-target }})
         uses: xrtk/unity-build@main
         with:

XRTK-Core/Packages/manifest.json

@@ -19,7 +19,7 @@
     "com.needle.compilation-visualizer": "1.8.2",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.ide.rider": "3.0.15",
+    "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.mobile.android-logcat": "1.3.2",

XRTK-Core/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.8f1
-m_EditorVersionWithRevision: 2021.3.8f1 (b30333d56e81)
+m_EditorVersion: 2021.3.12f1
+m_EditorVersionWithRevision: 2021.3.12f1 (8af3c3e441b1)