From 3f2720108f6a07c6c114b452f032dfae193aaa87 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 13:40:25 +0100 Subject: [PATCH 1/9] Removal of unused global.json file --- Tools/CI/global.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Tools/CI/global.json diff --git a/Tools/CI/global.json b/Tools/CI/global.json deleted file mode 100644 index 3cb4f9622d..0000000000 --- a/Tools/CI/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "7.0.0", - "rollForward": "latestMinor", - "allowPrerelease": false - } -} From e076723e3de8a67f2d62d739d7ee98d990be298b Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 13:40:48 +0100 Subject: [PATCH 2/9] Updated dependencies suggested by Renovate --- .github/workflows/conventional-pr.yml | 2 +- .../Packages/manifest.json | 22 ++++++++--------- .../Packages/manifest.json | 22 ++++++++--------- Examples/PingTool/Packages/manifest.json | 24 +++++++++---------- com.unity.netcode.gameobjects/package.json | 2 +- .../Packages/manifest.json | 2 +- testproject/Packages/manifest.json | 8 +++---- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml index 6090fe2ab2..e5b2504dca 100644 --- a/.github/workflows/conventional-pr.yml +++ b/.github/workflows/conventional-pr.yml @@ -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: diff --git a/Examples/CharacterControllerMovingBodies/Packages/manifest.json b/Examples/CharacterControllerMovingBodies/Packages/manifest.json index de9d632e57..1fb37668b1 100644 --- a/Examples/CharacterControllerMovingBodies/Packages/manifest.json +++ b/Examples/CharacterControllerMovingBodies/Packages/manifest.json @@ -2,23 +2,23 @@ "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.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.services.multiplayer": "1.1.1", + "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", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index 2ffae44925..2f22118009 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -2,24 +2,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.4", + "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.services.multiplayer": "1.1.1", + "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", diff --git a/Examples/PingTool/Packages/manifest.json b/Examples/PingTool/Packages/manifest.json index 45f1b14b65..06b793ad4b 100644 --- a/Examples/PingTool/Packages/manifest.json +++ b/Examples/PingTool/Packages/manifest.json @@ -2,24 +2,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.4", + "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.1.1", + "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", diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index c20e366c3c..41479bf7c5 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -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": [ diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 86bed9f664..eddf0eb215 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -2,7 +2,7 @@ "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.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.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index 50e5a2a32e..e460d4f309 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,9 +1,9 @@ { "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", @@ -12,7 +12,7 @@ "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", From 21b8a774674ad8f2cd5111d8583d2f245bbd559f Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 13:49:41 +0100 Subject: [PATCH 3/9] Added rule to not update major versions --- .github/renovate.json5 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index acab47d6f0..2184b58006 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -15,7 +15,6 @@ "**/*~/**" ], "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 { @@ -29,11 +28,14 @@ ], "rollbackPrs": false }, - // Enable automerge for Bokken image updates { "matchDatasources": ["unity-bokken"], "automerge": false, }, + { + "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "description": "Disallow major version updates" + } ], } From d21945e00ee93b33a46afed2e77b6df08409a269 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Thu, 13 Feb 2025 14:21:19 +0100 Subject: [PATCH 4/9] Modified packages according to minimal supported editor --- .../Packages/manifest.json | 10 +++++----- .../OverridingScenesAndPrefabs/Packages/manifest.json | 10 +++++----- Examples/PingTool/Packages/manifest.json | 8 ++++---- minimalproject/Packages/manifest.json | 5 +---- testproject-tools-integration/Packages/manifest.json | 6 +++--- testproject/Packages/manifest.json | 4 ++-- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Examples/CharacterControllerMovingBodies/Packages/manifest.json b/Examples/CharacterControllerMovingBodies/Packages/manifest.json index 1fb37668b1..7d6ee98c9b 100644 --- a/Examples/CharacterControllerMovingBodies/Packages/manifest.json +++ b/Examples/CharacterControllerMovingBodies/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", + "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", @@ -10,9 +10,9 @@ "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.1.1", - "com.unity.test-framework": "1.4.6", + "com.unity.purchasing": "5.0.0-pre.4", + "com.unity.services.multiplayer": "1.2.0-exp.2", + "com.unity.test-framework": "2.0.1-pre.18", "com.unity.timeline": "1.8.8", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.transport": "2.4.0", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index 2f22118009..6e668b723b 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", + "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", @@ -11,9 +11,9 @@ "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.1.1", - "com.unity.test-framework": "1.4.6", + "com.unity.purchasing": "5.0.0-pre.4", + "com.unity.services.multiplayer": "1.2.0-exp.2", + "com.unity.test-framework": "2.0.1-pre.18", "com.unity.timeline": "1.8.8", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.transport": "2.4.0", diff --git a/Examples/PingTool/Packages/manifest.json b/Examples/PingTool/Packages/manifest.json index 06b793ad4b..915453f4be 100644 --- a/Examples/PingTool/Packages/manifest.json +++ b/Examples/PingTool/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { - "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.tilemap": "1.0.0", + "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", @@ -12,8 +12,8 @@ "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.1.1", - "com.unity.test-framework": "1.4.6", + "com.unity.services.multiplayer": "1.2.0-exp.2", + "com.unity.test-framework": "2.0.1-pre.18", "com.unity.timeline": "1.8.8", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", "com.unity.transport": "2.4.0", diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json index 9c4ac7a7ee..b01ba5d497 100644 --- a/minimalproject/Packages/manifest.json +++ b/minimalproject/Packages/manifest.json @@ -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" diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index eddf0eb215..377b94b03b 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -1,12 +1,12 @@ { "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", "dependencies": { - "com.unity.ai.navigation": "2.0.5", + "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": "2.0.1-pre.18", "com.unity.test-framework.performance": "3.0.3", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index e460d4f309..8bd83993ca 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -7,10 +7,10 @@ "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": "2.0.1-pre.18", "com.unity.test-framework.performance": "3.0.3", "com.unity.timeline": "1.8.8", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", From c659fb23460a19668aed7ff2bb1d92dfc0d0b9af Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Thu, 13 Feb 2025 14:28:12 +0100 Subject: [PATCH 5/9] Corrected Renovate setup to respect editor compatibility --- .github/renovate.json5 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 2184b58006..9bdedf2ebe 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,7 +7,7 @@ "local>Unity-Technologies/unity-renovate-config" ], "prConcurrentLimit": 100, - // Ignore commits produced by github actions workflows + // Ignore commits produced by Github actions workflows "gitIgnoredAuthors": ["githubaction@githubaction.com"], "ignorePaths": [ "**/node_modules/**", @@ -26,16 +26,9 @@ "schedule": [ "every weekend" ], - "rollbackPrs": false - }, - // Enable automerge for Bokken image updates - { - "matchDatasources": ["unity-bokken"], - "automerge": false, - }, - { - "matchUpdateTypes": ["minor", "patch", "pin", "digest"], - "description": "Disallow major version updates" + "rollbackPrs": false, + "editorCompatibilityCheckEnabled": true, + "minimumUnityVersion": "6000.0" } ], } From 63dccfadc59c986ad28c8fd59ef106458430be11 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Thu, 13 Feb 2025 14:47:05 +0100 Subject: [PATCH 6/9] Downgraded com.unity.test-framework version due to CI failures with newer version --- Examples/CharacterControllerMovingBodies/Packages/manifest.json | 2 +- Examples/OverridingScenesAndPrefabs/Packages/manifest.json | 2 +- Examples/PingTool/Packages/manifest.json | 2 +- testproject-tools-integration/Packages/manifest.json | 2 +- testproject/Packages/manifest.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Examples/CharacterControllerMovingBodies/Packages/manifest.json b/Examples/CharacterControllerMovingBodies/Packages/manifest.json index 7d6ee98c9b..a9d9a88170 100644 --- a/Examples/CharacterControllerMovingBodies/Packages/manifest.json +++ b/Examples/CharacterControllerMovingBodies/Packages/manifest.json @@ -12,7 +12,7 @@ "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": "5.0.0-pre.4", "com.unity.services.multiplayer": "1.2.0-exp.2", - "com.unity.test-framework": "2.0.1-pre.18", + "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", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index 6e668b723b..7dc74e6f4d 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -13,7 +13,7 @@ "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": "5.0.0-pre.4", "com.unity.services.multiplayer": "1.2.0-exp.2", - "com.unity.test-framework": "2.0.1-pre.18", + "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", diff --git a/Examples/PingTool/Packages/manifest.json b/Examples/PingTool/Packages/manifest.json index 915453f4be..e2061bb761 100644 --- a/Examples/PingTool/Packages/manifest.json +++ b/Examples/PingTool/Packages/manifest.json @@ -13,7 +13,7 @@ "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.2.0-exp.2", - "com.unity.test-framework": "2.0.1-pre.18", + "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", diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 377b94b03b..b6075ef4af 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.multiplayer.center": "1.0.0", "com.unity.multiplayer.tools": "2.2.3", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.test-framework": "2.0.1-pre.18", + "com.unity.test-framework": "1.4.6", "com.unity.test-framework.performance": "3.0.3", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index 8bd83993ca..fdd212eab1 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -10,7 +10,7 @@ "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": "2.0.1-pre.18", + "com.unity.test-framework": "1.4.6", "com.unity.test-framework.performance": "3.0.3", "com.unity.timeline": "1.8.8", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10", From 35053ec6ad52c3e4d114f5466e6117c3727b77e2 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Fri, 14 Feb 2025 15:43:11 +0100 Subject: [PATCH 7/9] typo correction --- .github/renovate.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 9bdedf2ebe..7f29fa33c8 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,7 +7,7 @@ "local>Unity-Technologies/unity-renovate-config" ], "prConcurrentLimit": 100, - // Ignore commits produced by Github actions workflows + // Ignore commits produced by GitHub actions workflows "gitIgnoredAuthors": ["githubaction@githubaction.com"], "ignorePaths": [ "**/node_modules/**", From 6028b88f9cfed17dc67809b4f44d20fb330c3a0f Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Fri, 14 Feb 2025 19:01:34 +0100 Subject: [PATCH 8/9] Reverting package changes --- .../Packages/manifest.json | 28 +++++++++---------- .../Packages/manifest.json | 28 +++++++++---------- Examples/PingTool/Packages/manifest.json | 28 +++++++++---------- com.unity.netcode.gameobjects/package.json | 2 +- .../Packages/manifest.json | 4 +-- testproject/Packages/manifest.json | 10 +++---- 6 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Examples/CharacterControllerMovingBodies/Packages/manifest.json b/Examples/CharacterControllerMovingBodies/Packages/manifest.json index a9d9a88170..de9d632e57 100644 --- a/Examples/CharacterControllerMovingBodies/Packages/manifest.json +++ b/Examples/CharacterControllerMovingBodies/Packages/manifest.json @@ -1,24 +1,24 @@ { "dependencies": { - "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.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.analytics": "3.8.1", - "com.unity.collab-proxy": "2.6.0", + "com.unity.collab-proxy": "2.4.4", "com.unity.feature.development": "1.0.2", - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.31", "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": "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.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.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.5", - "com.unity.xr.legacyinputhelpers": "2.1.12", + "com.unity.visualscripting": "1.9.4", + "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json index 7dc74e6f4d..2ffae44925 100644 --- a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json +++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json @@ -1,25 +1,25 @@ { "dependencies": { - "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.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.analytics": "3.8.1", - "com.unity.collab-proxy": "2.6.0", + "com.unity.collab-proxy": "2.5.2", "com.unity.feature.development": "1.0.2", - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.31", "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": "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.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.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.5", - "com.unity.xr.legacyinputhelpers": "2.1.12", + "com.unity.visualscripting": "1.9.4", + "com.unity.xr.legacyinputhelpers": "2.1.11", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Examples/PingTool/Packages/manifest.json b/Examples/PingTool/Packages/manifest.json index e2061bb761..45f1b14b65 100644 --- a/Examples/PingTool/Packages/manifest.json +++ b/Examples/PingTool/Packages/manifest.json @@ -1,25 +1,25 @@ { "dependencies": { - "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.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.analytics": "3.8.1", - "com.unity.collab-proxy": "2.6.0", + "com.unity.collab-proxy": "2.5.2", "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.4.0", - "com.unity.multiplayer.tools": "2.2.3", + "com.unity.multiplayer.playmode": "1.3.0", + "com.unity.multiplayer.tools": "2.2.1", "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.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.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.ugui": "2.0.0", - "com.unity.visualscripting": "1.9.5", - "com.unity.xr.legacyinputhelpers": "2.1.12", + "com.unity.visualscripting": "1.9.4", + "com.unity.xr.legacyinputhelpers": "2.1.11", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index 41479bf7c5..c20e366c3c 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -5,7 +5,7 @@ "version": "2.2.0", "unity": "6000.0", "dependencies": { - "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.transport": "2.4.0" }, "samples": [ diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index b6075ef4af..d0841aedff 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -1,8 +1,8 @@ { "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", "dependencies": { - "com.unity.ai.navigation": "2.0.6", - "com.unity.ide.rider": "3.0.34", + "com.unity.ai.navigation": "2.0.5", + "com.unity.ide.rider": "3.0.31", "com.unity.multiplayer.center": "1.0.0", "com.unity.multiplayer.tools": "2.2.3", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index fdd212eab1..50e5a2a32e 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,18 +1,18 @@ { "dependencies": { - "com.unity.addressables": "2.3.16", - "com.unity.ai.navigation": "2.0.6", + "com.unity.addressables": "2.2.2", + "com.unity.ai.navigation": "2.0.5", "com.unity.collab-proxy": "2.6.0", - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.31", "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.78.0-preview", + "com.unity.package-validation-suite": "0.49.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.8", + "com.unity.timeline": "1.8.7", "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", From a540ac8d4bf4cc714fd4347051bc39c2a9d87ea6 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Fri, 14 Feb 2025 19:10:26 +0100 Subject: [PATCH 9/9] Corrected renovate setup to not update the package or test projects --- .github/renovate.json5 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 7f29fa33c8..1b96abd02f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -12,7 +12,12 @@ "ignorePaths": [ "**/node_modules/**", // Don't renovate files in special folders using ~ as suffix - "**/*~/**" + "**/*~/**", + "com.unity.netcode.gameobjects/**/*", + "Examples/**/*", + "testproject/**/*", + "minimalproject/**/*", + "testproject-tools-integration/**/*" ], "packageRules": [ // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise @@ -27,8 +32,6 @@ "every weekend" ], "rollbackPrs": false, - "editorCompatibilityCheckEnabled": true, - "minimumUnityVersion": "6000.0" } ], }