trunk shadow changes: com.unity.netcode.gameobjects

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

@@ -10,17 +10,17 @@
 package_pack_-_netcode_gameobjects:
   name: Package Pack - netcode.gameobjects
   agent:
-    image: package-ci/ubuntu-22.04:v4
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
   - command: upm-ci package pack --package-path com.unity.netcode.gameobjects
-  - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.netcode.gameobjects_packages.json
+  - command: copy upm-ci~\packages\packages.json upm-ci~\packages\com.unity.netcode.gameobjects_packages.json
   after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
     packages:
       paths:

.yamato/wrench/promotion-jobs.yml

@@ -41,16 +41,6 @@ publish_dry_run_netcode_gameobjects:
       UTR:
         location: results/UTR/validate-netcode.gameobjects-6000.7-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_7_-_ubuntu2204
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-netcode.gameobjects-6000.7-ubuntu2204
-        unzip: true
-      UTR:
-        location: results/UTR/validate-netcode.gameobjects-6000.7-ubuntu2204
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_7_-_win10
     specific_options:
       packages:
@@ -71,16 +61,6 @@ publish_dry_run_netcode_gameobjects:
       UTR:
         location: results/UTR/validate-netcode.gameobjects-7000.0-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_7000_0_-_ubuntu2204
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-netcode.gameobjects-7000.0-ubuntu2204
-        unzip: true
-      UTR:
-        location: results/UTR/validate-netcode.gameobjects-7000.0-ubuntu2204
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_7000_0_-_win10
     specific_options:
       packages:
@@ -134,16 +114,6 @@ publish_netcode_gameobjects:
       UTR:
         location: results/UTR/validate-netcode.gameobjects-6000.7-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_7_-_ubuntu2204
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-netcode.gameobjects-6000.7-ubuntu2204
-        unzip: true
-      UTR:
-        location: results/UTR/validate-netcode.gameobjects-6000.7-ubuntu2204
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_7_-_win10
     specific_options:
       packages:
@@ -164,16 +134,6 @@ publish_netcode_gameobjects:
       UTR:
         location: results/UTR/validate-netcode.gameobjects-7000.0-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_7000_0_-_ubuntu2204
-    specific_options:
-      packages:
-        ignore_artifact: true
-      pvp-results:
-        location: results/pvp/validate-netcode.gameobjects-7000.0-ubuntu2204
-        unzip: true
-      UTR:
-        location: results/UTR/validate-netcode.gameobjects-7000.0-ubuntu2204
-        unzip: true
   - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_7000_0_-_win10
     specific_options:
       packages:

.yamato/wrench/validation-jobs.yml

@@ -84,83 +84,6 @@ validate_-_netcode_gameobjects_-_6000_7_-_macos13arm:
   labels:
   - Packages:netcode.gameobjects
 
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.7 - ubuntu2204 (6000.7 - Ubuntu).
-validate_-_netcode_gameobjects_-_6000_7_-_ubuntu2204:
-  name: Validate - netcode.gameobjects - 6000.7 - ubuntu2204
-  agent:
-    image: package-ci/ubuntu-22.04:v4
-    type: Unity::VM
-    flavor: b1.large
-  commands:
-  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
-  - command: 7z x -aoa wrench-localapv.zip
-  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
-  - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u 6000.7/staging -c editor --path .Editor --fast
-    timeout: 20
-    retries: 3
-  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor
-    timeout: 10
-    retries: 1
-  - command: echo No internal packages to add.
-  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
-    retries: 0
-  - command: python PythonScripts/ignore_clean_console_failures.py
-    timeout: 5
-    retries: 0
-  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 5
-    retries: 0
-  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 10
-    retries: 0
-  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
-    retries: 1
-  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
-    retries: 1
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
-  artifacts:
-    Crash Dumps:
-      paths:
-      - CrashDumps/**
-    packages:
-      paths:
-      - upm-ci~/packages/**/*
-    pvp-results:
-      paths:
-      - upm-ci~/pvp/**/*
-      browsable: onDemand
-    UTR:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      browsable: onDemand
-  dependencies:
-  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
-  variables:
-    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
-    UNITY_LICENSING_SERVER_DELETE_NUL: 0
-    UNITY_LICENSING_SERVER_DELETE_ULF: 0
-    UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
-    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
-  metadata:
-    Job Maintainers: '#rm-packageworks'
-    Wrench: 3.11.5.0
-  labels:
-  - Packages:netcode.gameobjects
-
 # PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.7 - win10 (6000.7 - Windows).
 validate_-_netcode_gameobjects_-_6000_7_-_win10:
   name: Validate - netcode.gameobjects - 6000.7 - win10
@@ -316,83 +239,6 @@ validate_-_netcode_gameobjects_-_7000_0_-_macos13arm:
   labels:
   - Packages:netcode.gameobjects
 
-# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 7000.0 - ubuntu2204 (7000.0 - Ubuntu).
-validate_-_netcode_gameobjects_-_7000_0_-_ubuntu2204:
-  name: Validate - netcode.gameobjects - 7000.0 - ubuntu2204
-  agent:
-    image: package-ci/ubuntu-22.04:v4
-    type: Unity::VM
-    flavor: b1.large
-  commands:
-  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
-  - command: 7z x -aoa wrench-localapv.zip
-  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
-  - command: python PythonScripts/print_machine_info.py
-  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
-    timeout: 20
-    retries: 3
-  - command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor
-    timeout: 10
-    retries: 1
-  - command: echo No internal packages to add.
-  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
-    timeout: 40
-    retries: 0
-  - command: python PythonScripts/ignore_clean_console_failures.py
-    timeout: 5
-    retries: 0
-  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 5
-    retries: 0
-  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
-    timeout: 10
-    retries: 0
-  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
-    retries: 1
-  - command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" '
-    timeout: 40
-    retries: 1
-  after:
-  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
-  artifacts:
-    Crash Dumps:
-      paths:
-      - CrashDumps/**
-    packages:
-      paths:
-      - upm-ci~/packages/**/*
-    pvp-results:
-      paths:
-      - upm-ci~/pvp/**/*
-      browsable: onDemand
-    UTR:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      browsable: onDemand
-  dependencies:
-  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
-  variables:
-    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
-    UNITY_LICENSING_SERVER_DELETE_NUL: 0
-    UNITY_LICENSING_SERVER_DELETE_ULF: 0
-    UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
-    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
-  metadata:
-    Job Maintainers: '#rm-packageworks'
-    Wrench: 3.11.5.0
-  labels:
-  - Packages:netcode.gameobjects
-
 # PVP Editor and Playmode tests for Validate - netcode.gameobjects - 7000.0 - win10 (7000.0 - Windows).
 validate_-_netcode_gameobjects_-_7000_0_-_win10:
   name: Validate - netcode.gameobjects - 7000.0 - win10

.yamato/wrench/wrench_config.json

@@ -23,7 +23,14 @@
       "coverageCommands": [
         "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;"
       ],
-      "dependantsToIgnoreInPreviewApv": {},
+      "dependantsToIgnoreInPreviewApv": {
+        "6000.7": [
+          "com.unity.services.multiplayer"
+        ],
+        "7000.0": [
+          "com.unity.services.multiplayer"
+        ]
+      },
       "postPackCommands": []
     }
   },

Tools/CI/Settings/NGOSettings.cs

@@ -1,7 +1,9 @@
 using RecipeEngine.Api.Settings;
+using RecipeEngine.Modules.Wrench.Helpers;
 using RecipeEngine.Modules.Wrench.Models;
 using RecipeEngine.Modules.Wrench.Platforms;
 using RecipeEngine.Modules.Wrench.Settings;
+using RecipeEngine.Unity.Abstractions.Editors;
 
 namespace NGO.Cookbook.Settings;
 
@@ -24,7 +26,7 @@ public class NGOSettings : AnnotatedSettingsBase
             new PackageOptions()
             {
                 ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
-                ValidationOptions = validationOptions
+                ValidationOptions = validationOptions,
             }
         }
     };
@@ -33,7 +35,26 @@ public NGOSettings()
     {
         Wrench = new WrenchSettings(packagesRootPaths, PackageOptions);
         Wrench.PvpProfilesToCheck = new HashSet<string>() { "supported" };
-        Wrench.Packages["com.unity.netcode.gameobjects"].PackAndPromotePlatformType = EditorPlatformType.Ubuntu2204;
+
+        var package = Wrench.Packages["com.unity.netcode.gameobjects"];
+        // Ubuntu is removed from validation below, so pack and promote on Windows instead.
+        package.PackAndPromotePlatformType = EditorPlatformType.Win10;
+
+        // The Netcode for Entities source generator fails player builds on Linux, so Ubuntu is excluded from validation.
+        foreach (var editor in package.UnityEditors)
+        {
+            var keptPlatforms = editor.EditorPlatforms
+                .Where(platform => platform.PlatformType != EditorPlatformType.Ubuntu2204)
+                .ToDictionary(platform => platform.PlatformType, platform => platform);
+            editor.EditorPlatforms = new EditorPlatformSet(keptPlatforms);
+        }
+
+        // com.unity.services.multiplayer's Entities integration doesn't yet compile against the N4E 7.0.0 that NGO now depends on, so skip it in Preview APV until a compatible version ships.
+        package.DependantsToIgnoreInPreviewApv = new Dictionary<Editor, ISet<string>>
+        {
+            [new EditorVersion("6000.7")] = new HashSet<string> { "com.unity.services.multiplayer" },
+            [new EditorVersion("7000.0")] = new HashSet<string> { "com.unity.services.multiplayer" }
+        };
     }
 
     public WrenchSettings Wrench { get; private set; }

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -6,22 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).
 
-## [Unreleased]
-
-### Added
-
-### Changed
-
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
-
-### Obsolete
-
 ## [3.0.0] - 2026-09-14
 
 ### Added