Merge branch 'develop' into pvp-fixes-develop

Author: NoelStephensUnity

.github/renovate.json5

@@ -7,12 +7,17 @@
     "local>Unity-Technologies/unity-renovate-config"
   ],
   "prConcurrentLimit": 100,
-  // Ignore commits produced by github actions workflows
+  // Ignore commits produced by GitHub actions workflows
   "gitIgnoredAuthors": ["[email protected]"],
   "ignorePaths": [
     "**/node_modules/**",
     // Don't renovate files in special folders using ~ as suffix
-    "**/*~/**"
+    "**/*~/**",
+    "com.unity.netcode.gameobjects/**/*",
+    "testproject/**/*",
+    "minimalproject/**/*",
+    "testproject-tools-integration/**/*",
+    "Examples/**/*"
   ],
   "packageRules": [
 
@@ -27,13 +32,7 @@
       "schedule": [
         "every weekend"
       ],
-      "rollbackPrs": false
-    },
-
-    // Enable automerge for Bokken image updates
-    {
-      "matchDatasources": ["unity-bokken"],
-      "automerge": false,
-    },
+      "rollbackPrs": false,
+    }
   ],
 }

Tools/CI/global.json

@@ -5,8 +5,8 @@
     "version": "1.12.2",
     "unity": "2021.3",
     "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.transport": "1.4.0"
+      "com.unity.nuget.mono-cecil": "1.10.1",
+      "com.unity.transport": "1.4.0"
     },
     "samples": [
     {

com.unity.netcode.gameobjects/package.json

@@ -1,7 +1,6 @@
 {
   "dependencies": {
-    "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
-    "com.unity.transport": "1.5.0"
+    "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects"
   },
     "testables": [
         "com.unity.netcode.gameobjects"