merge branch 'develop' into feat/ownernetworkvariable

Author: 0xFA11

.yamato/_run-all.yml

@@ -14,7 +14,6 @@ run_all_tests:
     - .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
 {% endfor -%}
     - .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
-    - .yamato/project-tests.yml#multiprocess_test_testproject_{{ editor }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
@@ -45,4 +44,18 @@ all_package_tests:
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
-{% endfor -%}
+{% endfor -%}
+
+all_singlenode_multiprocess_tests:
+  name: Run All Multiprocess Tests - Single Node
+  dependencies:
+    # Pull in package and validate jobs through the badges job
+{% for platform in test_platforms -%}
+{% for project in projects -%}
+{% for editor in project.test_editors -%}
+{% if editor != "trunk" %}
+    - .yamato/multiprocess-project-tests.yml#singlenode_multiprocess_test_testproject_{{ editor }}_{{ platform.name }}
+{% endif %}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}

.yamato/_triggers.yml

@@ -1,8 +1,7 @@
 {% metadata_file .yamato/project.metafile %}
 ---
-# `develop` trigger
-develop_nightly_trigger:
-  name: Develop Branch Nightly Trigger
+develop_nightly:
+  name: "[Nightly] Run All Tests"
   triggers:
     recurring:
     - branch: develop
@@ -13,21 +12,16 @@ develop_nightly_trigger:
 {% for project in projects -%}
     - .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}
 {% endfor -%}
-    
-# Legacy job that matches the name with branch protections as of 8/11
-# Can be removed once branch protections are updated to the new name
-pull_request_trigger_legacy:
-  name: Pull Request Trigger on 2021.1 (master, develop, & release branches)
-  dependencies:
-    - .yamato/_triggers.yml#pull_request_trigger
+
+multiprocess_nightly:
+  name: "[Nightly] Run Multiprocess Tests"
   triggers:
-    cancel_old_ci: true
-    pull_requests:
-    - targets:
-        only:
-          - "master"
-          - "develop"
-          - "/release\/.*/"
+    recurring:
+    - branch: develop
+      frequency: daily
+      rerun: always
+  dependencies:
+    - .yamato/_run-all.yml#all_singlenode_multiprocess_tests
 
 # Run all relevant tasks when a pull request targeting the develop
 # branch is created or updated. Currently only netcode package tests are

.yamato/multiprocess-project-tests.yml

@@ -0,0 +1,42 @@
+{% metadata_file .yamato/project.metafile %}
+---
+
+{% for project in projects -%}
+{% if project.name == "testproject" %}
+{% for editor in project.test_editors -%}
+{% for platform in test_platforms -%}
+singlenode_multiprocess_test_testproject_{{ editor }}_{{ platform.name }}:
+  name : Multiprocess Tests - {{ editor }} on {{ platform.name }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor}}
+  commands:
+    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+{% if editor != "trunk" %}
+    - unity-downloader-cli -u {{ editor }} -c editor -w --fast
+    - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat --output utr.bat{% endif %}{% if platform.name != "win" %} --output utr && chmod +x ./utr{% endif %}
+    - {{ platform.editorpath }} -projectpath testproject -batchmode -nographics -quit -logfile BuildMultiprocessTestPlayer.log -executeMethod Unity.Netcode.MultiprocessRuntimeTests.BuildMultiprocessTestPlayer.BuildRelease
+{% if platform.name == "mac" %}    -  sudo codesign --force --deep --sign - ./testproject/Builds/MultiprocessTests/MultiprocessTestPlayer.app{% endif %}
+    - {{ platform.utr }} --suite=playmode --testproject=testproject --editor-location=.Editor --testfilter=Unity.Netcode.MultiprocessRuntimeTests --extra-editor-arg=-bypassIgnoreUTR
+{% endif %}
+  after:
+    - echo "After block"
+{% if editor != "trunk" %}
+{% if platform.name == "win" %}    - copy %USERPROFILE%\.multiprocess\logfile* .{% endif %}
+{% if platform.name != "win" %}    - cp $HOME/.multiprocess/logfile* .{% endif %}
+{% endif %}
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+        - BuildMultiprocessTestPlayer.log
+        - "logfile*"
+        - "*.log"
+        - "*.txt"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+{% endfor -%}
+{% endfor -%}
+{% endif -%}
+{% endfor -%}

.yamato/project-tests.yml

@@ -55,37 +55,3 @@ test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
 {% endfor -%}
 {% endfor -%}
 
-{% for project in projects -%}
-{% if project.name == "testproject" %}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-multiprocess_test_testproject_{{ editor }}_{{ platform.name }}:
-  name : multiprocess tests - {{ editor }} on {{ platform.name }}
-  agent:
-    type: {{ platform.type }}
-    image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
-  commands:
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - unity-downloader-cli -u {{ editor }} -c editor -w --fast
-    - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat --output utr.bat{% endif %}{% if platform.name != "win" %} --output utr && chmod +x ./utr{% endif %}
-    - {{ platform.editorpath }} -projectpath testproject -batchmode -nographics -quit -logfile BuildMultiprocessTestPlayer.log -executeMethod Unity.Netcode.MultiprocessRuntimeTests.BuildMultiprocessTestPlayer.BuildRelease
-{% if platform.name == "mac" %}    -  sudo codesign --force --deep --sign - ./testproject/Builds/MultiprocessTests/MultiprocessTestPlayer.app{% endif %}
-    - {{ platform.utr }} --suite=playmode --testproject=testproject --editor-location=.Editor --testfilter=Unity.Netcode.MultiprocessRuntimeTests --extra-editor-arg=-bypassIgnoreUTR
-  after:
-{% if platform.name == "win" %}    - copy %USERPROFILE%\.multiprocess\logfile* .{% endif %}
-{% if platform.name != "win" %}    - cp $HOME/.multiprocess/logfile* .{% endif %}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-        - BuildMultiprocessTestPlayer.log
-        - "logfile*"
-        - "*.log"
-        - "*.txt"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endfor -%}
-{% endfor -%}
-{% endif -%}
-{% endfor -%}

.yamato/project.metafile

@@ -41,7 +41,6 @@ projects:
       - name: com.unity.netcode.adapter.utp
         path: com.unity.netcode.adapter.utp
     test_editors:
-      - 2021.1
       - 2021.2
       - 2020.3
       - trunk

com.unity.netcode.adapter.utp/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
-## [Unreleased]
+## [1.0.0-pre.6] - 2022-03-02
 
 ### Added
 
@@ -11,7 +11,8 @@ All notable changes to this package will be documented in this file. The format
 
 ### Changed
 
-- Updated Unity Transport package to 1.0.0-pre.13. (#1696)
+- Updated Unity Transport package to 1.0.0-pre.14. (#1760)
+- Updated Netcode for GameObjects dependency to 1.0.0-pre.6 (#1771)
 - Overflowing the reliable send queue of a connection will now result in the connection being closed, rather than spamming the log with errors about not being able to send a payload. It is deemed better to close the connection than to lose reliable traffic (which could cause all sorts of weird synchronization issues). (#1747)
 
 ### Fixed

com.unity.netcode.adapter.utp/package.json

@@ -2,10 +2,10 @@
   "name": "com.unity.netcode.adapter.utp",
   "displayName": "Unity Transport for Netcode for GameObjects",
   "description": "This package is plugging Unity Transport into Netcode for GameObjects, which is a network transport layer - the low-level interface for sending UDP data",
-  "version": "1.0.0-pre.5",
+  "version": "1.0.0-pre.6",
   "unity": "2020.3",
   "dependencies": {
-    "com.unity.netcode.gameobjects": "1.0.0-pre.5",
-    "com.unity.transport": "1.0.0-pre.13"
+    "com.unity.netcode.gameobjects": "1.0.0-pre.6",
+    "com.unity.transport": "1.0.0-pre.14"
   }
 }

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -7,10 +7,17 @@ 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
+### Fixed
+- Fixed issue when spawning new player if an already existing player exists it does not remove IsPlayer from the previous player (#1779)
+- Fixed lack of notification that NetworkManager and NetworkObject cannot be added to the same GameObject with in-editor notifications (#1777)
 
-- Added first set of tests for NetworkAnimator - parameter syncing, trigger set / reset, override network animator (#7135)
+## [1.0.0-pre.6] - 2022-03-02
+
+### Added
+- NetworkAnimator now properly synchrhonizes all animation layers as well as runtime-adjusted weighting between them (#1765)
+- Added first set of tests for NetworkAnimator - parameter syncing, trigger set / reset, override network animator (#1735)
 
 ### Changed
 
@@ -33,6 +40,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 - Fixed OwnedObjects not being properly modified when using ChangeOwnership (#1731)
 - Improved performance in NetworkAnimator (#1735)
 - Removed the "always sync" network animator (aka "autosend") parameters (#1746)
+- Fixed in-scene placed NetworkObjects not respawning after shutting down the NetworkManager and then starting it back up again (#1769)
 
 ## [1.0.0-pre.5] - 2022-01-26