Upgrade to Unity 6 [MTT-9275]

.yamato/mobile-build-and-run.yml

@@ -9,16 +9,19 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
     name: build {{ project.name }} - {{ editor }} on iOS
     agent:
         type: Unity::VM::osx
-        image: package-ci/macos-12:v4
+        image: package-ci/macos-13:v4
         flavor: b1.large
 
     commands:
         - pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
         - unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
+        - echo "CONFIGURATION = Release" >> ~/XcodeBuildConfig.xcconfig
         - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
         - chmod +x ./utr
         - ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime
-
+    variables:
+      UNITY_TESTS_XCODEBUILD_TIMEOUT: 60
+      XCODE_XCCONFIG_FILE: ~/XcodeBuildConfig.xcconfig
     artifacts:
         players:
             paths:
@@ -37,18 +40,19 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:
         type: Unity::VM
         # Any generic image can be used, no need to have Android tools in the image for building
         # All Android tools will be downloaded by unity-downloader-cli
-        image: mobile/android-execution-base:stable
-        flavor: b1.xlarge
+        image: mobile/android-execution-base:v2.1774381
+        flavor: b1.large
 
     commands:
         # Download unity-downloader-cli
-        - pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-        - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools/utr-standalone/utr.bat --output utr.bat
-        - python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform Android
+        - gsudo choco source add -n Unity -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/unity-choco-local --priority=1
+        - gsudo choco install -y unity-config unity-downloader-cli
+        - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output ./utr.bat
+        - unity-config project set registry candidates --project-path {{ project.path }}
         - unity-downloader-cli -c Editor -c Android -u {{ editor }} --fast --wait
+        - python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform Android
         # Build player(s)
-        - set UTR_VERSION=0.12.0
-        - ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=mono --build-only --testfilter=Unity.BossRoom.Tests.Runtime
+        - ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --scripting-backend=il2cpp --build-only --testfilter=Unity.BossRoom.Tests.Runtime
     artifacts:
         players:
             paths:
@@ -70,7 +74,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
     name: {{ project.name }} mobile project tests - {{ editor }} on iOS
     agent:
         type: Unity::mobile::iPhone
-        image: package-ci/macos-12:v4
+        image: package-ci/macos-13:v4
         flavor: b1.medium
 
     # Skip repository cloning
@@ -103,7 +107,7 @@ mobile_test_android_{{ project.name }}_{{ editor }}:
     name: {{ project.name }} mobile project tests - {{ editor }} on Android
     agent:
         type: Unity::mobile::shield
-        image: mobile/android-execution-base:stable
+        image: package-ci/ubuntu-22.04:v4
         flavor: b1.medium
 
     # Skip repository cloning
@@ -113,13 +117,20 @@ mobile_test_android_{{ project.name }}_{{ editor }}:
         - .yamato/mobile-build-and-run.yml#Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}
     commands:
       # Download standalone UnityTestRunner
-      - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools/utr-standalone/utr.bat --output utr.bat
-      - |
-          set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
-          start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
-          start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
-          set UTR_VERSION=0.12.0
-          ./utr --artifacts_path=build/test-results --testproject={{ project.path }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=android --player-load-path=build/players --testfilter=Unity.BossRoom.Tests.Runtime
+      - unity-downloader-cli --fast --wait -u {{ editor }} -c editor -c Android
+      - >
+        ANDROID_DEVICE_CONNECTION=$BOKKEN_DEVICE_IP
+        ANDROID_SDK_ROOT=$PWD/.Editor/Data/PlaybackEngines/AndroidPlayer/SDK
+        UnifiedTestRunner
+        --artifacts-path=build/test-results
+        --editor-location=.Editor
+        --suite=playmode
+        --testproject={{ project.path }}
+        --platform=Android
+        --player-load-path=build/players
+        --testfilter=Unity.BossRoom.Tests.Runtime
+        --reruncount=2
+        --player-connection-ip=$BOKKEN_HOST_IP    
     # Set uploadable artifact paths
     artifacts:
         logs:

.yamato/project-standards.yml

@@ -4,7 +4,7 @@ standards_{{ projects.first.name }}:
   name: Standards Check {{ projects.first.name }}
   agent:
     type: Unity::VM
-    image: package-ci/ubuntu-18.04:v4
+    image: package-ci/ubuntu-22.04:v4
     flavor: b1.large
   commands:
     - dotnet --version

.yamato/project.metafile

@@ -30,4 +30,4 @@ projects:
       - name: com.unity.multiplayer.samples.coop
         path: Packages/com.unity.multiplayer.samples.coop
     test_editors:
-      - 2022.3
+      - 6000.0.25

Assets/Material/Characters/Character_Shadow.mat

@@ -23,6 +23,7 @@ Material:
   disabledShaderPasses:
   - SHADOWCASTER
   - DepthOnly
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -132,6 +133,7 @@ Material:
     - _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &2085413229483183920
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -144,4 +146,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Enemy_Eyes_sheet.mat

@@ -23,6 +23,7 @@ Material:
   disabledShaderPasses:
   - SHADOWCASTER
   - DepthOnly
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -127,6 +128,7 @@ Material:
     - _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
     - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &2746495770331472876
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -139,4 +141,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Enemy_Mouth_sheet.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -36,6 +36,7 @@ Material:
   disabledShaderPasses:
   - SHADOWCASTER
   - DepthOnly
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -145,3 +146,4 @@ Material:
     - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
     - _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Material/Characters/Hero_Eyes_sheet.mat

@@ -23,6 +23,7 @@ Material:
   disabledShaderPasses:
   - SHADOWCASTER
   - DepthOnly
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -127,6 +128,7 @@ Material:
     - _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
     - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &4340826014879142409
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -139,4 +141,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Hero_Mouth_sheet.mat

@@ -23,6 +23,7 @@ Material:
   disabledShaderPasses:
   - SHADOWCASTER
   - DepthOnly
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -132,6 +133,7 @@ Material:
     - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
     - _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &1900546452016667472
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -144,4 +146,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Toon/Hair_Archer_Boy.mat

@@ -20,7 +20,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -102,6 +103,7 @@ Material:
     - _RimColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecularColor: {r: 3.6078432, g: 3.6078432, b: 3.6078432, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &4864082934053653154
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -114,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Toon/Hair_Archer_Girl.mat

@@ -20,7 +20,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -102,6 +103,7 @@ Material:
     - _RimColor: {r: 4, g: 4, b: 4, a: 1}
     - _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &6413572590179603764
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -114,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Toon/Hair_Mage_Boy.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -33,7 +33,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -115,3 +116,4 @@ Material:
     - _RimColor: {r: 4, g: 4, b: 4, a: 1}
     - _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Material/Characters/Toon/Hair_Mage_Girl.mat

@@ -33,7 +33,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -115,6 +116,7 @@ Material:
     - _RimColor: {r: 4, g: 4, b: 4, a: 1}
     - _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &8325592805791008449
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -127,4 +129,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Toon/Hair_Rogue_Boy.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -33,7 +33,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -115,3 +116,4 @@ Material:
     - _RimColor: {r: 4, g: 4, b: 4, a: 1}
     - _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

Assets/Material/Characters/Toon/Hair_Rogue_Girl.mat

@@ -20,7 +20,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -102,6 +103,7 @@ Material:
     - _RimColor: {r: 4, g: 4, b: 4, a: 1}
     - _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1
 --- !u!114 &8814935330546915290
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -114,4 +116,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9

Assets/Material/Characters/Toon/Hair_Tank_Boy.mat

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 7
+  version: 9
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -33,7 +33,8 @@ Material:
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - MOTIONVECTORS
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -115,3 +116,4 @@ Material:
     - _RimColor: {r: 4, g: 4, b: 4, a: 1}
     - _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1