Merge branch 'develop-2.0.0' into conditional-ci-2.x

Author: michalChrobot

.github/pull_request_template.md

@@ -4,14 +4,14 @@ Replace this block with what this PR does and why. Describe what you'd like revi
 )
 
 ### Jira ticket
-_Link to related jira ticket ([Use the smart commits](https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/))_
+_Link to related jira ticket ([Use the smart commits](https://support.atlassian.com/bitbucket-cloud/docs/use-smart-commits/)). Short version (e.g. MTT-123) also works and gets auto-linked_
 
 ### Changelog
 [//]: # (updated with all public facing changes  - API changes, UI/UX changes, behaviour changes, bug fixes. Remove if not relevant.)
 
 - Added: The package whose Changelog should be added to should be in the header. Delete the changelog section entirely if it's not needed.
 - Fixed: If you update multiple packages, create a new section with a new header for the other package.
-- Removed/Deprecated/Changed: Each bullet should be prefixed with Added, Fixed, Removed, Deprecated, or Changed to indicate where the entry should go
+- Removed/Deprecated/Changed: Each bullet should be prefixed with Added, Fixed, Removed, Deprecated, or Changed to indicate where the entry should go.
 
 <!--  Uncomment and mark items off with a * if this PR deprecates any API:
 ### Deprecated API
@@ -31,12 +31,14 @@ We should always evaluate if the changes in this PR require any documentation ch
 - Includes documentation for previously-undocumented public API entry points.
 - Includes edits to existing public API documentation.
 
-## Testing & QA
+## Testing & QA (How your changes can be verified during release Playtest)
 [//]: #  (
 This section is REQUIRED and should describe how the changes were tested and how should they be tested when Playtesting for the release.
 It can range from "edge case covered by unit tests" to "manual testing required and new sample was added".
 Expectation is that PR creator does some manual testing and provides a summary of it here.)
 
+<!-- Add any performance testing results here if relevant. -->
+
 ### Functional Testing
 [//]: # (If checked, List manual tests that have been performed.)
 _Manual testing :_
@@ -50,12 +52,13 @@ _Does the change require QA team to:_
 
 - [ ] `Review automated tests`?
 - [ ] `Execute manual tests`?
+- [ ] `Provide feedback about the PR`?
 
-If any boxes above are checked, please add QA as a PR reviewer.
+If any boxes above are checked the QA team will be automatically added as a PR reviewer.
 
-## Backport
+## Backports
 [//]: # (
 This section is REQUIRED and should link to the PR that targets other NGO version which is either develop or develop-2.0.0 branch
 Add the following to the PR title: "\[Backport\] ..."
 If this is not needed, for example feature specific to NGOv2.X, then just mention this fact.
-)
+)

.github/renovate.json5

@@ -16,8 +16,7 @@
     "com.unity.netcode.gameobjects/**/*",
     "Examples/**/*",
     "testproject/**/*",
-    "minimalproject/**/*",
-    "testproject-tools-integration/**/*"
+    "minimalproject/**/*"
   ],
   "packageRules": [
     // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise

.github/workflows/conventional-pr.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: semantic-pull-request
         # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below
-        uses: amannn/action-semantic-pull-request@v5
+        uses: amannn/action-semantic-pull-request@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/pr-verification.yml renamed to .github/workflows/pr-description-validation.yml

@@ -1,12 +1,12 @@
-# This workflow is designed to verify that the pull request description contains a required sections that are important from quality perspective.
+# This workflow is designed to verify that the pull request description contains a required sections that are important from quality perspective.
 # ## Backport section is important as a reminder to account for backports for anyone that works with NGO repository (to 1.X or 2.X branches respectively).
 # ## Testing & QA section is important to ensure that the PR has appropriate testing coverage and is important when QA will evaluate PRs before Playtesting for the release.
 # ## Documentation section is important to ensure that the documentation is updated with the changes made in the PR.
 
 # If any of the sections is missing, the workflow will fail and block the PR from merging, prompting the developer to add those sections to the PR description.
 # The workflow is configured to run when PR is created as well as when it is edited which also counts simple description edits.
 
-name: "NGO - PR Verification"
+name: "NGO - PR description validation"
 
 on:
   pull_request:
@@ -17,11 +17,11 @@ on:
       - release/*
 
 jobs:
-  pr-verification:
+  pr-description-validation:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Check PR description
         uses: actions/github-script@v7
@@ -33,8 +33,8 @@ jobs:
             // List of mandatory PR sections
             const requiredSections = [
               {
-                header: '## Backport',
-                description: 'PR description must include a "## Backport" section. Please add this section and provide information about this PR backport to develop or develop-2.0.0 branch respectively or explain why backport is not needed.'
+                header: '## Backports',
+                description: 'PR description must include a "## Backports" section. Please add this section and provide information about this PR backport to develop or develop-2.0.0 branch respectively or explain why backport is not needed.'
               },
               {
                 header: '## Testing & QA',
@@ -43,6 +43,10 @@ jobs:
               {
                 header: '## Documentation',
                 description: 'PR description must include a "## Documentation" section. Please add this section and provide information about the documentation changes made in this PR. It is important to keep the documentation up to date with the code changes.'
+              },
+              {
+                header: '## Jira ticket',
+                description: 'PR description must include a "## Jira ticket" section. Please add this section and provide a link to the Jira ticket that corresponds to this PR. General rule should be that if the PR takes you more then a day of work it should have Jira ticket. Otherwise you can always write "N/A" in this section.'
               }
             ];
 
@@ -59,4 +63,4 @@ jobs:
               message += '\n\nPlease add them to your PR description.';
 
               core.setFailed(message);
-            }
+            }

.github/workflows/qa-reviewer-assignment.yml

@@ -0,0 +1,36 @@
+# This workflow depend on the content of .github/pull_request_template.md file, which should contain the required sections that the script checks for
+# This also works in parallel with .github/workflows/pr-description-validation.yml which validates PR format
+# In contrast to .github/workflows/pr-description-validation.yml, this workflow is conditional and aims to ease the process of requesting QA review by automatically assigning the QA team  whenever a checkbox is marked
+
+# In case that the given checkboxes are marked the script will automatically add netcode-qa team as a reviewer.
+
+name: 'Assign QA Reviewer'
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+
+jobs:
+  assign-qa:
+    # This job only runs if the checkbox in the PR description exist and is checked.
+    if: >
+      contains(github.event.pull_request.body, '- [x] `Review automated tests`') ||
+      contains(github.event.pull_request.body, '- [x] `Execute manual tests`') ||
+      contains(github.event.pull_request.body, '- [x] `Provide feedback about the PR`')
+    runs-on: ubuntu-latest
+
+
+    steps:
+
+      - name: 'Assign QA Team'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            github.rest.pulls.requestReviewers({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+              team_reviewers: ['netcode-qa']
+            });
+            console.log('Assigned netcode-qa for review.');

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

@@ -1,6 +1,7 @@
 @echo on
 rem This is an auto-generated script. Do not edit manually!
 
+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...
 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
 IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
 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"

.yamato/mobile-standalone-test.yml

@@ -48,6 +48,11 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
 {% if platform.model %}
       model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
+  # Automatic UI interruption handling is available for iPhones running iOS 15 and above (models SE-Gen3 and 13). 
+  # It is enabled by default when using those devices. Otherwise, system alerts (e.g. “Local Network Access” permission alert, introduced in iOS 14) might cause disruptions during test execution.
+  # If building of the test app is done on a separate (“Build”) job, please make sure that that job has environment variable UNITY_HANDLEUIINTERRUPTIONS set to 1.
+  variables:
+    UNITY_HANDLEUIINTERRUPTIONS: 1
   commands:
     - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
     - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --testproject={{ project.path }} --architecture={{ platform.architecture }} --scripting-backend=il2cpp --editor-location=.Editor --artifacts-path=artifacts --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
@@ -96,7 +101,7 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
 {% else %}
 
     # Run tests for non-Android devices
-    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=3600
+    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=3600 --device-id=%BOKKEN_DEVICE_ID%
 {% endif %}
   artifacts:
     logs:

.yamato/project-builders/project-builders.yml

@@ -32,22 +32,22 @@ build_{{ netcodeProject[0] }}_project:
     PLATFORM_WIN64_MAC_ANDROID: win64
   commands:
     # Validate inputs passed via Yamato variables
-    - python Tools/CI/scripts/BuildAutomation/validate_params.py
+    - python Tools/scripts/BuildAutomation/validate_params.py
     - echo Building {{ netcodeProject[0] }} project with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
 
     # Clone the external project repository into a specific directory. Notice that branch is also specified.
     - git clone --single-branch --branch {{ netcodeProject[1].branch }} {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
 
     # Modify the external project's manifest to use the local N4E package from current branch on which this Yamato job is running. (requires python that should be preinstalled in the image)
-    - python Tools/CI/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects
+    - python Tools/scripts/BuildAutomation/manifest_update.py --manifest-path C:/ClonedProject/{{ netcodeProject[1].manifestPath }} --local-package-path %YAMATO_SOURCE_DIR%/com.unity.netcode.gameobjects
 
     # Run python script to update ProjectSettings.asset in order to connect the project to Unity Services/set proper values.
     # Notice that if a project has this already set up then in theory we don't need to run this script.
-    - python Tools/CI/scripts/BuildAutomation/connect_services.py --project-settings-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}/ProjectSettings/ProjectSettings.asset
+    - python Tools/scripts/BuildAutomation/connect_services.py --project-settings-path C:/ClonedProject/{{ netcodeProject[1].projectPath }}/ProjectSettings/ProjectSettings.asset
 
     # Enable or disable Burst compilation. This step is specific to Netcode package (or any package that uses Burst)
-    - IF "%BURST_ON_OFF%"=="on" (python Tools/CI/scripts/BuildAutomation/disable-enable-burst.py --enable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
-      ELSE (python Tools/CI/scripts/BuildAutomation/disable-enable-burst.py --disable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
+    - IF "%BURST_ON_OFF%"=="on" (python Tools/scripts/BuildAutomation/disable-enable-burst.py --enable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
+      ELSE (python Tools/scripts/BuildAutomation/disable-enable-burst.py --disable-burst --project-path C:/ClonedProject/{{ netcodeProject[1].projectPath }})
 
     # Download the Unity Editor version specified in the UNITY_VERSION variable. Il2cpp component is downloaded only if the SCRIPTING_BACKEND_IL2CPP_MONO is set to "il2cpp".
     # TODO: we could download components only if needed
@@ -56,7 +56,7 @@ build_{{ netcodeProject[0] }}_project:
     # Add BuilderScript.cs to the project so we can modify and build the project using Unity Editor.
     # This is a bit tricky step, notice that we also need to include proper assembly definition in order for those scripts to compile properly.
     # TODO: the asmdef file can be simplified
-    - python Tools/CI/scripts/BuildAutomation/FileCopy.py "C:/ClonedProject/{{ netcodeProject[1].projectPath }}"
+    - python Tools/scripts/BuildAutomation/FileCopy.py "C:/ClonedProject/{{ netcodeProject[1].projectPath }}"
 
     # Build the project using Unity Editor. This will call the given static BuilderScripts method.
     # Ideally, it would be nice to parametrize the BuilderScripts (for example to pass scripting backend as parameter) but -executeMethod only calls static methods without parameters so for now we will have multiple configurations

.yamato/project.metafile

@@ -10,7 +10,7 @@
     # image --> Defines the package-ci Bokken image to use for the environment (e.g., package-ci/ubuntu-22.04:v4). This is basically a device configuration
     # flavor --> Determines the VM size/resources (e.g., b1.small, b1.large, m1.mac)
     # standalone --> Specifies the build target platform (e.g., StandaloneLinux64, Android, IOS)
-    # model --> Defines specific hardware model requirements (e.g., rtx2080, SE for iPhone SE)
+    # model --> Defines specific hardware model requirements (e.g., rtx2080, iPhone model 13). Notice that trunk currently (19.08.2025) has 13.0 as minimal iOS version which devices below this are not supporting
     # base --> Indicates the base operating system for build operations (e.g., win, mac)
     # architecture --> Specifies the target CPU architecture (e.g., armv7, arm64)
 
@@ -89,7 +89,7 @@ test_platforms:
           type: Unity::mobile::iPhone
           image: package-ci/macos-13-arm64:v4
           flavor: m1.mac
-          model: SE
+          model: 13
           standalone: IOS
           base: mac
           architecture: arm64
@@ -156,8 +156,8 @@ validation_editors:
         - trunk
     all:
         - 6000.0
-        - 6000.1
         - 6000.2
+        - 6000.3
         - trunk
     minimal:
         - 6000.0

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

@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.12.2.0
+    UPMPVP_CONTEXT_WRENCH: 1.1.0.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.12.2.0
+    Wrench: 1.1.0.0