Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
"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
"**/*~/**"
],
"packageRules": [

// Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise
// Also ensure dependencies won't be downgraded when they don't exist in the public repositories
{
Expand All @@ -27,13 +26,9 @@
"schedule": [
"every weekend"
],
"rollbackPrs": false
},

// Enable automerge for Bokken image updates
{
"matchDatasources": ["unity-bokken"],
"automerge": false,
},
"rollbackPrs": false,
"editorCompatibilityCheckEnabled": true,
"minimumUnityVersion": "6000.0"
}
],
}
2 changes: 1 addition & 1 deletion .github/workflows/conventional-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,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@b7a9a97cb10fa6e1ae02647e718798175f6b1f1d
uses: amannn/action-semantic-pull-request@40166f00814508ec3201fc8595b393d451c8cd80
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
28 changes: 14 additions & 14 deletions Examples/CharacterControllerMovingBodies/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "4.4.2",
"com.unity.ai.navigation": "2.0.3",
"com.unity.2d.sprite": "10.0.7",
"com.unity.2d.tilemap": "4.2.1",
"com.unity.ads": "4.12.0",
"com.unity.ai.navigation": "2.0.6",
"com.unity.analytics": "3.8.1",
"com.unity.collab-proxy": "2.4.4",
"com.unity.collab-proxy": "2.6.0",
"com.unity.feature.development": "1.0.2",
"com.unity.ide.rider": "3.0.31",
"com.unity.ide.rider": "3.0.34",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
"com.unity.purchasing": "4.12.2",
"com.unity.services.multiplayer": "1.0.0-pre.1",
"com.unity.test-framework": "1.4.5",
"com.unity.timeline": "1.8.7",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
"com.unity.transport": "2.3.0",
"com.unity.purchasing": "5.0.0-pre.4",
"com.unity.services.multiplayer": "1.2.0-exp.2",
"com.unity.test-framework": "1.4.6",
"com.unity.timeline": "1.8.8",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
"com.unity.transport": "2.4.0",
"com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.4",
"com.unity.xr.legacyinputhelpers": "2.1.10",
"com.unity.visualscripting": "1.9.5",
"com.unity.xr.legacyinputhelpers": "2.1.12",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
28 changes: 14 additions & 14 deletions Examples/OverridingScenesAndPrefabs/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "4.4.2",
"com.unity.ai.navigation": "2.0.4",
"com.unity.2d.sprite": "10.0.7",
"com.unity.2d.tilemap": "4.2.1",
"com.unity.ads": "4.12.0",
"com.unity.ai.navigation": "2.0.6",
"com.unity.analytics": "3.8.1",
"com.unity.collab-proxy": "2.5.2",
"com.unity.collab-proxy": "2.6.0",
"com.unity.feature.development": "1.0.2",
"com.unity.ide.rider": "3.0.31",
"com.unity.ide.rider": "3.0.34",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
"com.unity.purchasing": "4.12.2",
"com.unity.services.multiplayer": "1.0.0",
"com.unity.test-framework": "1.4.5",
"com.unity.timeline": "1.8.7",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
"com.unity.transport": "2.3.0",
"com.unity.purchasing": "5.0.0-pre.4",
"com.unity.services.multiplayer": "1.2.0-exp.2",
"com.unity.test-framework": "1.4.6",
"com.unity.timeline": "1.8.8",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
"com.unity.transport": "2.4.0",
"com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.4",
"com.unity.xr.legacyinputhelpers": "2.1.11",
"com.unity.visualscripting": "1.9.5",
"com.unity.xr.legacyinputhelpers": "2.1.12",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
28 changes: 14 additions & 14 deletions Examples/PingTool/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"dependencies": {
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "4.4.2",
"com.unity.ai.navigation": "2.0.4",
"com.unity.2d.sprite": "10.0.7",
"com.unity.2d.tilemap": "4.2.1",
"com.unity.ads": "4.12.0",
"com.unity.ai.navigation": "2.0.6",
"com.unity.analytics": "3.8.1",
"com.unity.collab-proxy": "2.5.2",
"com.unity.collab-proxy": "2.6.0",
"com.unity.feature.development": "1.0.2",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.multiplayer.playmode": "1.3.0",
"com.unity.multiplayer.tools": "2.2.1",
"com.unity.multiplayer.playmode": "1.4.0",
"com.unity.multiplayer.tools": "2.2.3",
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
"com.unity.services.multiplayer": "1.0.0",
"com.unity.test-framework": "1.4.5",
"com.unity.timeline": "1.8.7",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
"com.unity.transport": "2.3.0",
"com.unity.services.multiplayer": "1.2.0-exp.2",
"com.unity.test-framework": "1.4.6",
"com.unity.timeline": "1.8.8",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
"com.unity.transport": "2.4.0",
"com.unity.ugui": "2.0.0",
"com.unity.visualscripting": "1.9.4",
"com.unity.xr.legacyinputhelpers": "2.1.11",
"com.unity.visualscripting": "1.9.5",
"com.unity.xr.legacyinputhelpers": "2.1.12",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
7 changes: 0 additions & 7 deletions Tools/CI/global.json

This file was deleted.

2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"version": "2.2.0",
"unity": "6000.0",
"dependencies": {
"com.unity.nuget.mono-cecil": "1.11.4",
"com.unity.nuget.mono-cecil": "1.11.5",
"com.unity.transport": "2.4.0"
},
"samples": [
Expand Down
5 changes: 1 addition & 4 deletions minimalproject/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"dependencies": {
"com.unity.ai.navigation": "2.0.5",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.modules.accessibility": "1.0.0"
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects"
},
"testables": [
"com.unity.netcode.gameobjects"
Expand Down
6 changes: 3 additions & 3 deletions testproject-tools-integration/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
"dependencies": {
"com.unity.ai.navigation": "2.0.5",
"com.unity.ide.rider": "3.0.31",
"com.unity.ai.navigation": "2.0.6",
"com.unity.ide.rider": "3.0.34",
"com.unity.multiplayer.center": "1.0.0",
"com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.0",
"com.unity.multiplayer.tools": "2.2.3",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.test-framework": "1.4.6",
"com.unity.test-framework.performance": "3.0.3",
Expand Down
10 changes: 5 additions & 5 deletions testproject/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"dependencies": {
"com.unity.addressables": "2.2.2",
"com.unity.ai.navigation": "2.0.5",
"com.unity.addressables": "2.3.16",
"com.unity.ai.navigation": "2.0.6",
"com.unity.collab-proxy": "2.6.0",
"com.unity.ide.rider": "3.0.31",
"com.unity.ide.rider": "3.0.34",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.mathematics": "1.3.2",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.package-validation-suite": "0.49.0-preview",
"com.unity.package-validation-suite": "0.78.0-preview",
"com.unity.services.authentication": "3.4.0",
"com.unity.services.core": "1.14.0",
"com.unity.test-framework": "1.4.6",
"com.unity.test-framework.performance": "3.0.3",
"com.unity.timeline": "1.8.7",
"com.unity.timeline": "1.8.8",
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
"com.unity.ugui": "2.0.0",
"com.unity.modules.accessibility": "1.0.0",
Expand Down