Skip to content

Commit ab880f8

Browse files
noellie-veleznoellie-velez
committed
Merge branch 'develop-2.0.0' into chore/simplify-accessors-misc
# Conflicts: # com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs # com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
2 parents f3e4361 + e22eaa9 commit ab880f8

File tree

139 files changed

+2697
-1536
lines changed

Some content is hidden

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

139 files changed

+2697
-1536
lines changed

‎.yamato/generated-scripts/infrastructure-instability-detection-linux.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
1313
rm -rf "infrastructure_instability_detection_standalone" || true
1414
fi
1515

16-
echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
17-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
16+
echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
1818

1919
if [ -d "infrastructure_instability_detection" ]; then
2020
echo "removing infrastructure_instability_detection folder to avoid name clash"

‎.yamato/generated-scripts/infrastructure-instability-detection-mac.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
1313
rm -rf "infrastructure_instability_detection_standalone" || true
1414
fi
1515

16-
echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
17-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
16+
echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
1818

1919
if [ -d "infrastructure_instability_detection" ]; then
2020
echo "removing infrastructure_instability_detection folder to avoid name clash"

‎.yamato/generated-scripts/infrastructure-instability-detection-win.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
rem This is an auto-generated script. Do not edit manually!
33

44
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
5-
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
5+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
66
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
77
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"
88
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5

‎.yamato/project-standards.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
4747

4848
- unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
4949
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
50-
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
50+
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
51+
- git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
52+
- 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
5153
{% endfor -%}
5254
{% endfor -%}
5355
{% endfor -%}

‎.yamato/project.metafile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
small_agent_platform:
2525
- name: ubuntu
2626
type: Unity::VM
27-
image: package-ci/ubuntu-22.04:v4.77.0
27+
image: package-ci/ubuntu-22.04:v4.82.0
2828
flavor: b1.small
2929

3030

@@ -39,13 +39,13 @@ test_platforms:
3939
default:
4040
- name: ubuntu
4141
type: Unity::VM
42-
image: package-ci/ubuntu-22.04:v4.77.0
42+
image: package-ci/ubuntu-22.04:v4.82.0
4343
flavor: b1.large
4444
standalone: StandaloneLinux64
4545
desktop:
4646
- name: ubuntu
4747
type: Unity::VM
48-
image: package-ci/ubuntu-22.04:v4.77.0
48+
image: package-ci/ubuntu-22.04:v4.82.0
4949
flavor: b1.large
5050
smaller_flavor: b1.medium
5151
larger_flavor: b1.xlarge

‎.yamato/wrench/api-validation-jobs.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
all_api_validation_jobs:
44
name: All API Validation Jobs
55
dependencies:
6-
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows
6+
- path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_win10
77

8-
# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
9-
api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
10-
name: API Validation - netcode.gameobjects - 6000.0 - windows
8+
# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - win10 (6000.0 - Windows).
9+
api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
10+
name: API Validation - netcode.gameobjects - 6000.0 - win10
1111
agent:
12-
image: package-ci/win10:default
12+
image: package-ci/win10:v4
1313
type: Unity::VM
14-
flavor: b1.large
14+
flavor: b1.xlarge
1515
commands:
1616
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
@@ -55,8 +55,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
5555
UNITY_LICENSING_SERVER_DELETE_NUL: 0
5656
UNITY_LICENSING_SERVER_DELETE_ULF: 0
5757
UNITY_LICENSING_SERVER_TOOLSET: pro
58-
UPMPVP_CONTEXT_WRENCH: 1.4.7.0
58+
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
5959
metadata:
6060
Job Maintainers: '#rm-packageworks'
61-
Wrench: 1.4.7.0
61+
Wrench: 2.2.0.0
6262

‎.yamato/wrench/package-pack-jobs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package_pack_-_netcode_gameobjects:
66
name: Package Pack - netcode.gameobjects
77
agent:
8-
image: package-ci/ubuntu-20.04:default
8+
image: package-ci/ubuntu-22.04:v4
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 1.4.7.0
27+
Wrench: 2.2.0.0
2828

‎.yamato/wrench/player-build.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Auto-generated by Recipe Engine, do not modify manually.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
{}
4+

‎.yamato/wrench/player-test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Auto-generated by Recipe Engine, do not modify manually.
2+
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
3+
{}
4+

0 commit comments

Comments
 (0)