From cd005e4c421ca59aef922f472cf39c97df61aaff Mon Sep 17 00:00:00 2001 From: David Sungaila Date: Fri, 20 Feb 2026 13:49:48 +0100 Subject: [PATCH] Update NuGet packages --- src/Directory.Packages.props | 26 ++-- .../Unity2D/Assets/Scenes/SampleScene.unity | 78 +---------- .../Unity2D/Packages/manifest.json | 12 +- .../Unity2D/Packages/packages-lock.json | 123 +++++++++--------- .../BurstAotSettings_StandaloneWindows.json | 7 +- .../CommonBurstAotSettings.json | 2 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../ProjectSettings/QualitySettings.asset | 37 +++++- .../SceneTemplateSettings.json | 5 + 9 files changed, 122 insertions(+), 172 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 0b62463f..619320fe 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -3,23 +3,23 @@ true - - - + + + - - + + - - - + + + - - - + + + - - + + diff --git a/src/FrameworkTests/Unity2D/Assets/Scenes/SampleScene.unity b/src/FrameworkTests/Unity2D/Assets/Scenes/SampleScene.unity index 7bd6dd0f..f9927b21 100644 --- a/src/FrameworkTests/Unity2D/Assets/Scenes/SampleScene.unity +++ b/src/FrameworkTests/Unity2D/Assets/Scenes/SampleScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 0 @@ -122,74 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &343025739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 343025742} - - component: {fileID: 343025741} - - component: {fileID: 343025740} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &343025740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 343025739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &343025741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 343025739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &343025742 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 343025739} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -557,4 +486,3 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 519420032} - - {fileID: 343025742} diff --git a/src/FrameworkTests/Unity2D/Packages/manifest.json b/src/FrameworkTests/Unity2D/Packages/manifest.json index 09b3eafa..cd18ab9a 100644 --- a/src/FrameworkTests/Unity2D/Packages/manifest.json +++ b/src/FrameworkTests/Unity2D/Packages/manifest.json @@ -1,16 +1,11 @@ { "dependencies": { - "com.unity.collab-proxy": "2.10.1", - "com.unity.feature.2d": "2.0.1", - "com.unity.ide.rider": "3.0.38", - "com.unity.ide.visualstudio": "2.0.25", - "com.unity.multiplayer.center": "1.0.0", - "com.unity.test-framework": "1.6.0", - "com.unity.timeline": "1.8.9", - "com.unity.ugui": "2.0.0", + "com.unity.feature.2d": "2.0.2", + "com.unity.ide.visualstudio": "2.0.27", "com.unity.visualscripting": "1.9.9", "de.sungaila.pdftoimage": "file:X:/Repos/sungaila/PDFtoImage/etc/UnityPackage", "com.unity.modules.accessibility": "1.0.0", + "com.unity.modules.adaptiveperformance": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -37,6 +32,7 @@ "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vectorgraphics": "1.0.0", "com.unity.modules.vehicles": "1.0.0", "com.unity.modules.video": "1.0.0", "com.unity.modules.vr": "1.0.0", diff --git a/src/FrameworkTests/Unity2D/Packages/packages-lock.json b/src/FrameworkTests/Unity2D/Packages/packages-lock.json index 16aae14e..01cbdb6a 100644 --- a/src/FrameworkTests/Unity2D/Packages/packages-lock.json +++ b/src/FrameworkTests/Unity2D/Packages/packages-lock.json @@ -1,24 +1,24 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "12.0.2", + "version": "13.0.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "11.0.1", + "com.unity.2d.common": "12.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.collections": "1.2.4", + "com.unity.collections": "2.4.3", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "2.0.2", + "version": "3.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "11.0.1", + "com.unity.2d.common": "12.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.mathematics": "1.2.6", @@ -27,20 +27,22 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "11.0.1", + "version": "12.0.2", "depth": 2, "source": "registry", "dependencies": { "com.unity.burst": "1.8.4", "com.unity.2d.sprite": "1.0.0", + "com.unity.collections": "2.4.3", "com.unity.mathematics": "1.1.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { - "version": "5.1.0", + "version": "5.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -49,11 +51,11 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "11.0.1", + "version": "12.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "11.0.1", + "com.unity.2d.common": "12.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0" }, @@ -66,11 +68,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "12.0.1", + "version": "13.0.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "11.0.1", + "com.unity.2d.common": "12.0.0", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -86,7 +88,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "5.0.1", + "version": "6.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -96,8 +98,18 @@ }, "url": "https://packages.unity.com" }, + "com.unity.2d.tooling": { + "version": "1.0.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.2d.common": "12.0.2", + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.8.25", + "version": "1.8.28", "depth": 3, "source": "registry", "dependencies": { @@ -106,13 +118,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.collab-proxy": { - "version": "2.10.1", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.collections": { "version": "2.6.2", "depth": 2, @@ -128,60 +133,44 @@ }, "com.unity.ext.nunit": { "version": "2.0.5", - "depth": 1, + "depth": 2, "source": "builtin", "dependencies": {} }, "com.unity.feature.2d": { - "version": "2.0.1", + "version": "2.0.2", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "12.0.2", - "com.unity.2d.pixel-perfect": "5.1.0", - "com.unity.2d.psdimporter": "11.0.1", + "com.unity.2d.animation": "13.0.4", + "com.unity.2d.pixel-perfect": "5.1.1", + "com.unity.2d.psdimporter": "12.0.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "12.0.1", + "com.unity.2d.spriteshape": "13.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "5.0.1", - "com.unity.2d.aseprite": "2.0.2" + "com.unity.2d.tilemap.extras": "6.0.1", + "com.unity.2d.aseprite": "3.0.1", + "com.unity.2d.tooling": "1.0.2" } }, - "com.unity.ide.rider": { - "version": "3.0.38", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ext.nunit": "1.0.6" - }, - "url": "https://packages.unity.com" - }, "com.unity.ide.visualstudio": { - "version": "2.0.25", + "version": "2.0.27", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31" + "com.unity.test-framework": "1.1.33" }, "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.3.2", + "version": "1.3.3", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.multiplayer.center": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - } - }, "com.unity.nuget.mono-cecil": { - "version": "1.11.5", + "version": "1.11.6", "depth": 3, "source": "registry", "dependencies": {}, @@ -189,7 +178,7 @@ }, "com.unity.test-framework": { "version": "1.6.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": { "com.unity.ext.nunit": "2.0.3", @@ -207,21 +196,9 @@ }, "url": "https://packages.unity.com" }, - "com.unity.timeline": { - "version": "1.8.9", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.ugui": { "version": "2.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", @@ -250,6 +227,14 @@ "source": "builtin", "dependencies": {} }, + "com.unity.modules.adaptiveperformance": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0" + } + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -457,6 +442,16 @@ "com.unity.modules.imageconversion": "1.0.0" } }, + "com.unity.modules.vectorgraphics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, "com.unity.modules.vehicles": { "version": "1.0.0", "depth": 0, diff --git a/src/FrameworkTests/Unity2D/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/src/FrameworkTests/Unity2D/ProjectSettings/BurstAotSettings_StandaloneWindows.json index 58cf25f2..9585af35 100644 --- a/src/FrameworkTests/Unity2D/ProjectSettings/BurstAotSettings_StandaloneWindows.json +++ b/src/FrameworkTests/Unity2D/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 4, + "Version": 5, "EnableBurstCompilation": true, "EnableOptimisations": true, "EnableSafetyChecks": false, @@ -12,7 +12,8 @@ "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, "CpuTargetsX32": 6, - "CpuTargetsX64": 72, - "OptimizeFor": 0 + "CpuTargetsX64": -1, + "OptimizeFor": 1, + "FloatMode": 0 } } diff --git a/src/FrameworkTests/Unity2D/ProjectSettings/CommonBurstAotSettings.json b/src/FrameworkTests/Unity2D/ProjectSettings/CommonBurstAotSettings.json index 0293dafc..a6a62977 100644 --- a/src/FrameworkTests/Unity2D/ProjectSettings/CommonBurstAotSettings.json +++ b/src/FrameworkTests/Unity2D/ProjectSettings/CommonBurstAotSettings.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 4, + "Version": 5, "DisabledWarnings": "" } } diff --git a/src/FrameworkTests/Unity2D/ProjectSettings/ProjectVersion.txt b/src/FrameworkTests/Unity2D/ProjectSettings/ProjectVersion.txt index 1ddb36df..c9e01d3a 100644 --- a/src/FrameworkTests/Unity2D/ProjectSettings/ProjectVersion.txt +++ b/src/FrameworkTests/Unity2D/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.2.10f1 -m_EditorVersionWithRevision: 6000.2.10f1 (d3d30d158480) +m_EditorVersion: 6000.3.9f1 +m_EditorVersionWithRevision: 6000.3.9f1 (7a9955a4f2fa) diff --git a/src/FrameworkTests/Unity2D/ProjectSettings/QualitySettings.asset b/src/FrameworkTests/Unity2D/ProjectSettings/QualitySettings.asset index 3ca0edc1..8626e971 100644 --- a/src/FrameworkTests/Unity2D/ProjectSettings/QualitySettings.asset +++ b/src/FrameworkTests/Unity2D/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 5 m_QualitySettings: - - serializedVersion: 3 + - serializedVersion: 5 name: Very Low pixelLightCount: 0 shadows: 0 @@ -28,9 +28,13 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 useLegacyDetailDistribution: 1 + adaptiveVsync: 0 vSyncCount: 0 realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 lodBias: 0.3 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -55,7 +59,7 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 3 + - serializedVersion: 5 name: Low pixelLightCount: 0 shadows: 0 @@ -77,9 +81,13 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 useLegacyDetailDistribution: 1 + adaptiveVsync: 0 vSyncCount: 0 realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 lodBias: 0.4 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -104,7 +112,7 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 3 + - serializedVersion: 5 name: Medium pixelLightCount: 1 shadows: 1 @@ -126,9 +134,13 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 useLegacyDetailDistribution: 1 + adaptiveVsync: 0 vSyncCount: 1 realtimeGICPUUsage: 25 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 lodBias: 0.7 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -153,7 +165,7 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 3 + - serializedVersion: 5 name: High pixelLightCount: 2 shadows: 2 @@ -175,9 +187,13 @@ QualitySettings: realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 useLegacyDetailDistribution: 1 + adaptiveVsync: 0 vSyncCount: 1 realtimeGICPUUsage: 50 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 lodBias: 1 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -202,7 +218,7 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 3 + - serializedVersion: 5 name: Very High pixelLightCount: 3 shadows: 2 @@ -224,9 +240,13 @@ QualitySettings: realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 useLegacyDetailDistribution: 1 + adaptiveVsync: 0 vSyncCount: 1 realtimeGICPUUsage: 50 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 lodBias: 1.5 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -251,7 +271,7 @@ QualitySettings: terrainFadeLength: 5 terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 3 + - serializedVersion: 5 name: Ultra pixelLightCount: 4 shadows: 2 @@ -273,9 +293,13 @@ QualitySettings: realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 useLegacyDetailDistribution: 1 + adaptiveVsync: 0 vSyncCount: 1 realtimeGICPUUsage: 100 + adaptiveVsyncExtraA: 0 + adaptiveVsyncExtraB: 0 lodBias: 2 + meshLodThreshold: 1 maximumLODLevel: 0 enableLODCrossFade: 1 streamingMipmapsActive: 0 @@ -307,6 +331,7 @@ QualitySettings: GameCoreXboxOne: 5 Lumin: 5 Nintendo Switch: 5 + Nintendo Switch 2: 5 PS4: 5 PS5: 5 Server: 0 diff --git a/src/FrameworkTests/Unity2D/ProjectSettings/SceneTemplateSettings.json b/src/FrameworkTests/Unity2D/ProjectSettings/SceneTemplateSettings.json index 5e97f839..1edced2a 100644 --- a/src/FrameworkTests/Unity2D/ProjectSettings/SceneTemplateSettings.json +++ b/src/FrameworkTests/Unity2D/ProjectSettings/SceneTemplateSettings.json @@ -61,6 +61,11 @@ "type": "UnityEngine.PhysicMaterial", "defaultInstantiationMode": 0 }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 + }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D",