Skip to content

Commit 3dfcd47

Browse files
FabianStollfluong6fernando-cortez
authored
Upgrade to Unity 6 [MTT-9275] (#890)
* feat: upgrade project version to 6000.0.24f1 and auto-upgrade packages * feat: auto-upgrade project settings and package assets * feat: auto-upgrade assets * feat: upgrade project version to 6000.0.25f1 * feat: replace ParallelSync with Multiplayer Play Mode * fix: failing test * feat: update Netcode for GameObjects to version 2.0.0 * chore: update README * chore: changelog * chore: add MPPM to changelog * test: add yamato test for U6 * fix: only test Unity 6 * fix: update ubuntu version for yamato * fix: update iOS image * Added a release mode configuration for iOS jobs * Update CHANGELOG.md Co-authored-by: Fernando Cortez <[email protected]> * fix: remove unneeded asset * fix: show IET popup on startup * fix: remove warnings about deprecated methods * feat: remove deprecated vscode package * chore: remove ParrelSync references and mentions * changing deprecated android snapshot * updating job * feat: switch android build from mono to il2cpp * feat: switch back to mono and use different image for android build * fix: change flavor * granting utr permissions * changing utr command * Update mobile-build-and-run.yml * Update mobile-build-and-run.yml * Update mobile-build-and-run.yml * testing with il2cpp * ignoring failing test and reverting back CI changes * changing ci commands for android * Revert "ignoring failing test and reverting back CI changes" This reverts commit e161887. * fix * pointing to lower version of Editor * un-ignore test AttemptingToConnectWithSamePlayerId_ClientsDisconnectedWithReason --------- Co-authored-by: Frank Luong <[email protected]> Co-authored-by: Fernando Cortez <[email protected]>
1 parent 59d1080 commit 3dfcd47

File tree

191 files changed

+49148
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+49148
-783
lines changed

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

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
99
name: build {{ project.name }} - {{ editor }} on iOS
1010
agent:
1111
type: Unity::VM::osx
12-
image: package-ci/macos-12:v4
12+
image: package-ci/macos-13:v4
1313
flavor: b1.large
1414

1515
commands:
1616
- pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
1717
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
18+
- echo "CONFIGURATION = Release" >> ~/XcodeBuildConfig.xcconfig
1819
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
1920
- chmod +x ./utr
2021
- ./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
21-
22+
variables:
23+
UNITY_TESTS_XCODEBUILD_TIMEOUT: 60
24+
XCODE_XCCONFIG_FILE: ~/XcodeBuildConfig.xcconfig
2225
artifacts:
2326
players:
2427
paths:
@@ -37,18 +40,19 @@ Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}:
3740
type: Unity::VM
3841
# Any generic image can be used, no need to have Android tools in the image for building
3942
# All Android tools will be downloaded by unity-downloader-cli
40-
image: mobile/android-execution-base:stable
41-
flavor: b1.xlarge
43+
image: mobile/android-execution-base:v2.1774381
44+
flavor: b1.large
4245

4346
commands:
4447
# Download unity-downloader-cli
45-
- pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
46-
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools/utr-standalone/utr.bat --output utr.bat
47-
- python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform Android
48+
- gsudo choco source add -n Unity -s https://artifactory-slo.bf.unity3d.com/artifactory/api/nuget/unity-choco-local --priority=1
49+
- gsudo choco install -y unity-config unity-downloader-cli
50+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output ./utr.bat
51+
- unity-config project set registry candidates --project-path {{ project.path }}
4852
- unity-downloader-cli -c Editor -c Android -u {{ editor }} --fast --wait
53+
- python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform Android
4954
# Build player(s)
50-
- set UTR_VERSION=0.12.0
51-
- ./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
55+
- ./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
5256
artifacts:
5357
players:
5458
paths:
@@ -70,7 +74,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
7074
name: {{ project.name }} mobile project tests - {{ editor }} on iOS
7175
agent:
7276
type: Unity::mobile::iPhone
73-
image: package-ci/macos-12:v4
77+
image: package-ci/macos-13:v4
7478
flavor: b1.medium
7579

7680
# Skip repository cloning
@@ -103,7 +107,7 @@ mobile_test_android_{{ project.name }}_{{ editor }}:
103107
name: {{ project.name }} mobile project tests - {{ editor }} on Android
104108
agent:
105109
type: Unity::mobile::shield
106-
image: mobile/android-execution-base:stable
110+
image: package-ci/ubuntu-22.04:v4
107111
flavor: b1.medium
108112

109113
# Skip repository cloning
@@ -113,13 +117,20 @@ mobile_test_android_{{ project.name }}_{{ editor }}:
113117
- .yamato/mobile-build-and-run.yml#Build_Player_With_Tests_Android_{{ project.name }}_{{ editor }}
114118
commands:
115119
# Download standalone UnityTestRunner
116-
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools/utr-standalone/utr.bat --output utr.bat
117-
- |
118-
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
119-
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
120-
start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
121-
set UTR_VERSION=0.12.0
122-
./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
120+
- unity-downloader-cli --fast --wait -u {{ editor }} -c editor -c Android
121+
- >
122+
ANDROID_DEVICE_CONNECTION=$BOKKEN_DEVICE_IP
123+
ANDROID_SDK_ROOT=$PWD/.Editor/Data/PlaybackEngines/AndroidPlayer/SDK
124+
UnifiedTestRunner
125+
--artifacts-path=build/test-results
126+
--editor-location=.Editor
127+
--suite=playmode
128+
--testproject={{ project.path }}
129+
--platform=Android
130+
--player-load-path=build/players
131+
--testfilter=Unity.BossRoom.Tests.Runtime
132+
--reruncount=2
133+
--player-connection-ip=$BOKKEN_HOST_IP
123134
# Set uploadable artifact paths
124135
artifacts:
125136
logs:

.yamato/project-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ standards_{{ projects.first.name }}:
44
name: Standards Check {{ projects.first.name }}
55
agent:
66
type: Unity::VM
7-
image: package-ci/ubuntu-18.04:v4
7+
image: package-ci/ubuntu-22.04:v4
88
flavor: b1.large
99
commands:
1010
- dotnet --version

.yamato/project.metafile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ projects:
3030
- name: com.unity.multiplayer.samples.coop
3131
path: Packages/com.unity.multiplayer.samples.coop
3232
test_editors:
33-
- 2022.3
33+
- 6000.0.25

Assets/Material/Characters/Character_Shadow.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Material:
2323
disabledShaderPasses:
2424
- SHADOWCASTER
2525
- DepthOnly
26+
- MOTIONVECTORS
2627
m_LockedProperties:
2728
m_SavedProperties:
2829
serializedVersion: 3
@@ -132,6 +133,7 @@ Material:
132133
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
133134
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
134135
m_BuildTextureStacks: []
136+
m_AllowLocking: 1
135137
--- !u!114 &2085413229483183920
136138
MonoBehaviour:
137139
m_ObjectHideFlags: 11
@@ -144,4 +146,4 @@ MonoBehaviour:
144146
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
145147
m_Name:
146148
m_EditorClassIdentifier:
147-
version: 7
149+
version: 9

Assets/Material/Characters/Enemy_Eyes_sheet.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Material:
2323
disabledShaderPasses:
2424
- SHADOWCASTER
2525
- DepthOnly
26+
- MOTIONVECTORS
2627
m_LockedProperties:
2728
m_SavedProperties:
2829
serializedVersion: 3
@@ -127,6 +128,7 @@ Material:
127128
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
128129
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
129130
m_BuildTextureStacks: []
131+
m_AllowLocking: 1
130132
--- !u!114 &2746495770331472876
131133
MonoBehaviour:
132134
m_ObjectHideFlags: 11
@@ -139,4 +141,4 @@ MonoBehaviour:
139141
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
140142
m_Name:
141143
m_EditorClassIdentifier:
142-
version: 7
144+
version: 9

Assets/Material/Characters/Enemy_Mouth_sheet.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
1414
m_EditorClassIdentifier:
15-
version: 7
15+
version: 9
1616
--- !u!21 &2100000
1717
Material:
1818
serializedVersion: 8
@@ -36,6 +36,7 @@ Material:
3636
disabledShaderPasses:
3737
- SHADOWCASTER
3838
- DepthOnly
39+
- MOTIONVECTORS
3940
m_LockedProperties:
4041
m_SavedProperties:
4142
serializedVersion: 3
@@ -145,3 +146,4 @@ Material:
145146
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
146147
- _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
147148
m_BuildTextureStacks: []
149+
m_AllowLocking: 1

Assets/Material/Characters/Hero_Eyes_sheet.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Material:
2323
disabledShaderPasses:
2424
- SHADOWCASTER
2525
- DepthOnly
26+
- MOTIONVECTORS
2627
m_LockedProperties:
2728
m_SavedProperties:
2829
serializedVersion: 3
@@ -127,6 +128,7 @@ Material:
127128
- _MainTextureTilingOffset: {r: 1, g: 1, b: 0, a: 0}
128129
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
129130
m_BuildTextureStacks: []
131+
m_AllowLocking: 1
130132
--- !u!114 &4340826014879142409
131133
MonoBehaviour:
132134
m_ObjectHideFlags: 11
@@ -139,4 +141,4 @@ MonoBehaviour:
139141
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
140142
m_Name:
141143
m_EditorClassIdentifier:
142-
version: 7
144+
version: 9

Assets/Material/Characters/Hero_Mouth_sheet.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Material:
2323
disabledShaderPasses:
2424
- SHADOWCASTER
2525
- DepthOnly
26+
- MOTIONVECTORS
2627
m_LockedProperties:
2728
m_SavedProperties:
2829
serializedVersion: 3
@@ -132,6 +133,7 @@ Material:
132133
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
133134
- _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
134135
m_BuildTextureStacks: []
136+
m_AllowLocking: 1
135137
--- !u!114 &1900546452016667472
136138
MonoBehaviour:
137139
m_ObjectHideFlags: 11
@@ -144,4 +146,4 @@ MonoBehaviour:
144146
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
145147
m_Name:
146148
m_EditorClassIdentifier:
147-
version: 7
149+
version: 9

Assets/Material/Characters/Toon/Hair_Archer_Boy.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ Material:
2020
m_DoubleSidedGI: 0
2121
m_CustomRenderQueue: -1
2222
stringTagMap: {}
23-
disabledShaderPasses: []
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
2425
m_LockedProperties:
2526
m_SavedProperties:
2627
serializedVersion: 3
@@ -102,6 +103,7 @@ Material:
102103
- _RimColor: {r: 1, g: 1, b: 1, a: 1}
103104
- _SpecularColor: {r: 3.6078432, g: 3.6078432, b: 3.6078432, a: 1}
104105
m_BuildTextureStacks: []
106+
m_AllowLocking: 1
105107
--- !u!114 &4864082934053653154
106108
MonoBehaviour:
107109
m_ObjectHideFlags: 11
@@ -114,4 +116,4 @@ MonoBehaviour:
114116
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
115117
m_Name:
116118
m_EditorClassIdentifier:
117-
version: 7
119+
version: 9

Assets/Material/Characters/Toon/Hair_Archer_Girl.mat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ Material:
2020
m_DoubleSidedGI: 0
2121
m_CustomRenderQueue: -1
2222
stringTagMap: {}
23-
disabledShaderPasses: []
23+
disabledShaderPasses:
24+
- MOTIONVECTORS
2425
m_LockedProperties:
2526
m_SavedProperties:
2627
serializedVersion: 3
@@ -102,6 +103,7 @@ Material:
102103
- _RimColor: {r: 4, g: 4, b: 4, a: 1}
103104
- _SpecularColor: {r: 7.2156863, g: 7.2156863, b: 7.2156863, a: 1}
104105
m_BuildTextureStacks: []
106+
m_AllowLocking: 1
105107
--- !u!114 &6413572590179603764
106108
MonoBehaviour:
107109
m_ObjectHideFlags: 11
@@ -114,4 +116,4 @@ MonoBehaviour:
114116
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
115117
m_Name:
116118
m_EditorClassIdentifier:
117-
version: 7
119+
version: 9

0 commit comments

Comments
 (0)