From 22a59aad34ef46a5de05469735426feed758f8f5 Mon Sep 17 00:00:00 2001 From: "Miguel Alonso Jr." <76960110+miguelalonsojr@users.noreply.github.com> Date: Sun, 1 Sep 2024 11:27:18 -0400 Subject: [PATCH] Fix failing ci post upgrade (#6141) * Update PerformancProject and DevProject. * Removed mac perf tests. --- .yamato/com.unity.ml-agents-performance.yml | 59 ++++----- DevProject/Packages/packages-lock.json | 20 ++- .../ProjectSettings/EditorBuildSettings.asset | 3 +- .../ProjectSettings/MemorySettings.asset | 35 +++++ .../ProjectSettings/MultiplayerManager.asset | 7 + .../PackageManagerSettings.asset | 37 ++++++ .../SceneTemplateSettings.json | 121 ++++++++++++++++++ DevProject/ProjectSettings/TimeManager.asset | 6 +- .../VersionControlSettings.asset | 9 ++ PerformanceProject/Packages/manifest.json | 11 +- .../Packages/packages-lock.json | 106 +++++++++++---- .../ProjectSettings/MultiplayerManager.asset | 7 + .../ProjectSettings/ProjectSettings.asset | 46 ++++--- .../ProjectSettings/ProjectVersion.txt | 4 +- 14 files changed, 389 insertions(+), 82 deletions(-) create mode 100644 DevProject/ProjectSettings/MemorySettings.asset create mode 100644 DevProject/ProjectSettings/MultiplayerManager.asset create mode 100644 DevProject/ProjectSettings/PackageManagerSettings.asset create mode 100644 DevProject/ProjectSettings/SceneTemplateSettings.json create mode 100644 DevProject/ProjectSettings/VersionControlSettings.asset create mode 100644 PerformanceProject/ProjectSettings/MultiplayerManager.asset diff --git a/.yamato/com.unity.ml-agents-performance.yml b/.yamato/com.unity.ml-agents-performance.yml index f1a2f6c23..ea88b2713 100644 --- a/.yamato/com.unity.ml-agents-performance.yml +++ b/.yamato/com.unity.ml-agents-performance.yml @@ -1,29 +1,30 @@ -test_editors: - - version: 2023.2 ---- -{% for editor in test_editors %} -Run_Mac_Perfomance_Tests{{ editor.version }}: - name: Run Mac Performance Tests {{ editor.version }} - agent: - type: Unity::VM::osx - image: package-ci/macos-13:v4 - flavor: b1.large - variables: - UNITY_VERSION: {{ editor.version }} - commands: - - python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade - - unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast - - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - - chmod +x ./utr - - ./utr --suite=editor --platform=StandaloneOSX --editor-location=.Editor --testproject=PerformanceProject --artifacts_path=build/test-results --report-performance-data --performance-project-id=com.unity.ml-agents --zero-tests-are-ok=1 - triggers: - cancel_old_ci: true - recurring: - - branch: develop - frequency: daily - artifacts: - logs: - paths: - - "build/test-results/**" - - "*.log" -{% endfor %} +#disabling mac perf tests until utr issue is resolved. +#test_editors: +# - version: 2023.2 +#--- +#{% for editor in test_editors %} +#Run_Mac_Perfomance_Tests{{ editor.version }}: +# name: Run Mac Performance Tests {{ editor.version }} +# agent: +# type: Unity::VM::osx +# image: package-ci/macos-13:v4 +# flavor: b1.large +# variables: +# UNITY_VERSION: {{ editor.version }} +# commands: +# - python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade +# - unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast +# - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr +# - chmod +x ./utr +# - ./utr --suite=editor --platform=StandaloneOSX --editor-location=.Editor --testproject=PerformanceProject --artifacts_path=build/test-results --report-performance-data --performance-project-id=com.unity.ml-agents --zero-tests-are-ok=1 +# triggers: +# cancel_old_ci: true +# recurring: +# - branch: develop +# frequency: daily +# artifacts: +# logs: +# paths: +# - "build/test-results/**" +# - "*.log" +#{% endfor %} diff --git a/DevProject/Packages/packages-lock.json b/DevProject/Packages/packages-lock.json index b727fc78e..65747ed27 100644 --- a/DevProject/Packages/packages-lock.json +++ b/DevProject/Packages/packages-lock.json @@ -28,6 +28,18 @@ }, "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, + "com.unity.collections": { + "version": "2.2.1", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.8", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework.performance": "3.0.2" + }, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 1, @@ -56,7 +68,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.sentis": "1.3.0-pre.3", + "com.unity.sentis": "2.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.physics": "1.0.0" @@ -106,12 +118,12 @@ "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.sentis": { - "version": "1.3.0-pre.3", + "version": "2.0.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.10", - "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.burst": "1.8.12", + "com.unity.collections": "2.2.1", "com.unity.modules.imageconversion": "1.0.0" }, "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" diff --git a/DevProject/ProjectSettings/EditorBuildSettings.asset b/DevProject/ProjectSettings/EditorBuildSettings.asset index 3a360cd78..630ce117a 100644 --- a/DevProject/ProjectSettings/EditorBuildSettings.asset +++ b/DevProject/ProjectSettings/EditorBuildSettings.asset @@ -9,5 +9,6 @@ EditorBuildSettings: path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity guid: 9bafc50b1e55b43b2b1ae9620f1f8311 m_configObjects: - com.unity.ml-agents.settings: {fileID: 11400000, guid: 87b8aebb5aefd4643821361876570855, + com.unity.ml-agents.settings: {fileID: 11400000, guid: 8c1549da419d94fa285f5b29eab859e9, type: 2} + m_UseUCBPForAssetBundles: 0 diff --git a/DevProject/ProjectSettings/MemorySettings.asset b/DevProject/ProjectSettings/MemorySettings.asset new file mode 100644 index 000000000..5b5faceca --- /dev/null +++ b/DevProject/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/DevProject/ProjectSettings/MultiplayerManager.asset b/DevProject/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..8073753a0 --- /dev/null +++ b/DevProject/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/DevProject/ProjectSettings/PackageManagerSettings.asset b/DevProject/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 000000000..d7ed48926 --- /dev/null +++ b/DevProject/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 + oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 0 + m_ConfigSource: 0 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_Modified: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -874 + m_OriginalInstanceId: -876 + m_LoadAssets: 0 diff --git a/DevProject/ProjectSettings/SceneTemplateSettings.json b/DevProject/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 000000000..5e97f8393 --- /dev/null +++ b/DevProject/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/DevProject/ProjectSettings/TimeManager.asset b/DevProject/ProjectSettings/TimeManager.asset index 558a017e1..8f68da289 100644 --- a/DevProject/ProjectSettings/TimeManager.asset +++ b/DevProject/ProjectSettings/TimeManager.asset @@ -3,7 +3,11 @@ --- !u!5 &1 TimeManager: m_ObjectHideFlags: 0 - Fixed Timestep: 0.02 + Fixed Timestep: + m_Count: 2822399 + m_Rate: + m_Denominator: 1 + m_Numerator: 141120000 Maximum Allowed Timestep: 0.33333334 m_TimeScale: 1 Maximum Particle Timestep: 0.03 diff --git a/DevProject/ProjectSettings/VersionControlSettings.asset b/DevProject/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 000000000..246bcd47a --- /dev/null +++ b/DevProject/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,9 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 + m_TrackPackagesOutsideProject: 0 diff --git a/PerformanceProject/Packages/manifest.json b/PerformanceProject/Packages/manifest.json index e6ab26f26..024a5393e 100644 --- a/PerformanceProject/Packages/manifest.json +++ b/PerformanceProject/Packages/manifest.json @@ -1,11 +1,14 @@ { + "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", "dependencies": { - "com.unity.collab-proxy": "2.2.0", - "com.unity.feature.development": "1.0.1", + "com.unity.collab-proxy": "2.3.1", + "com.unity.feature.development": "1.0.2", "com.unity.ml-agents": "file:../../com.unity.ml-agents", + "com.unity.test-framework.build": "0.0.1-preview.15", "com.unity.test-framework.performance": "3.0.3", - "com.unity.timeline": "1.7.6", - "com.unity.ugui": "1.0.0", + "com.unity.test-framework.utp-reporter": "1.1.0-preview", + "com.unity.timeline": "1.8.6", + "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/PerformanceProject/Packages/packages-lock.json b/PerformanceProject/Packages/packages-lock.json index 4706ddf27..ec54f0ec4 100644 --- a/PerformanceProject/Packages/packages-lock.json +++ b/PerformanceProject/Packages/packages-lock.json @@ -1,43 +1,64 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.12", + "version": "1.8.13", "depth": 2, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.collab-proxy": { - "version": "2.2.0", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, + "com.unity.collections": { + "version": "2.2.1", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.8", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework.performance": "3.0.2" + }, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.editorcoroutines": { "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.ext.nunit": { "version": "2.0.5", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, + "com.unity.external.test-protocol": { + "version": "1.0.1-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0-preview" + }, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.feature.development": { - "version": "1.0.1", + "version": "1.0.2", "depth": 0, "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.rider": "3.0.27", + "com.unity.ide.rider": "3.0.28", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", "com.unity.test-framework": "1.3.9", @@ -45,13 +66,13 @@ } }, "com.unity.ide.rider": { - "version": "3.0.27", + "version": "3.0.28", "depth": 1, "source": "registry", "dependencies": { "com.unity.ext.nunit": "1.0.6" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.ide.visualstudio": { "version": "2.0.22", @@ -60,50 +81,64 @@ "dependencies": { "com.unity.test-framework": "1.1.9" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.mathematics": { "version": "1.2.6", "depth": 3, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.ml-agents": { "version": "file:../../com.unity.ml-agents", "depth": 0, "source": "local", "dependencies": { - "com.unity.sentis": "1.3.0-pre.3", + "com.unity.sentis": "2.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.physics": "1.0.0" } }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.4", + "depth": 3, + "source": "registry", + "dependencies": {}, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, "com.unity.performance.profile-analyzer": { "version": "1.2.2", "depth": 1, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.sentis": { - "version": "1.3.0-pre.3", + "version": "2.0.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.10", - "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.burst": "1.8.12", + "com.unity.collections": "2.2.1", "com.unity.modules.imageconversion": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.settings-manager": { "version": "2.0.1", "depth": 2, "source": "registry", "dependencies": {}, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.test-framework": { "version": "1.3.9", @@ -114,7 +149,16 @@ "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, + "com.unity.test-framework.build": { + "version": "0.0.1-preview.15", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.17" + }, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.test-framework.performance": { "version": "3.0.3", @@ -124,7 +168,17 @@ "com.unity.test-framework": "1.1.31", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" + }, + "com.unity.test-framework.utp-reporter": { + "version": "1.1.0-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1", + "com.unity.external.test-protocol": "1.0.1-preview" + }, + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.testtools.codecoverage": { "version": "1.2.5", @@ -134,10 +188,10 @@ "com.unity.test-framework": "1.0.16", "com.unity.settings-manager": "1.0.1" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { @@ -146,10 +200,10 @@ "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -165,7 +219,7 @@ "com.unity.ugui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, - "url": "https://packages.unity.com" + "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.modules.ai": { "version": "1.0.0", diff --git a/PerformanceProject/ProjectSettings/MultiplayerManager.asset b/PerformanceProject/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..8073753a0 --- /dev/null +++ b/PerformanceProject/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/PerformanceProject/ProjectSettings/ProjectSettings.asset b/PerformanceProject/ProjectSettings/ProjectSettings.asset index dd9e48430..8778f5d7d 100644 --- a/PerformanceProject/ProjectSettings/ProjectSettings.asset +++ b/PerformanceProject/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 26 + serializedVersion: 27 productGUID: bf6e31550f6b04b9b8b1948cae2e1acc AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -76,6 +76,8 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidApplicationEntry: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -95,6 +97,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -126,10 +129,8 @@ PlayerSettings: switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - switchNVNGraphicsFirmwareMemory: 32 switchMaxWorkerMultiple: 8 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 1 @@ -157,15 +158,17 @@ PlayerSettings: resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: {} buildNumber: + Bratwurst: 0 Standalone: 0 VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 22 + AndroidMinSdkVersion: 23 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -175,18 +178,18 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 12.0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 12.0 - VisionOSSdkVersion: 0 - VisionOSTargetOSVersionString: 1.0 + tvOSTargetOSVersionString: 13.0 + bratwurstSdkVersion: 0 + bratwurstTargetOSVersionString: 13.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -234,10 +237,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: - VisionOSManualSigningProvisioningProfileID: + bratwurstManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 - VisionOSManualSigningProvisioningProfileType: 0 + bratwurstManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -261,6 +264,7 @@ PlayerSettings: AndroidKeystoreName: AndroidKeyaliasName: AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -278,6 +282,7 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: @@ -382,8 +387,9 @@ PlayerSettings: - m_BuildTarget: tvOS m_Encoding: 1 m_BuildTargetDefaultTextureCompressionFormat: - - m_BuildTarget: Android - m_Format: 3 + - serializedVersion: 2 + m_BuildTarget: Android + m_Formats: 03000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -532,6 +538,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 1 switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 @@ -640,13 +647,18 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: EmbeddedLinux: 1 GameCoreScarlett: 1 @@ -671,6 +683,7 @@ PlayerSettings: gcIncremental: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: PerformanceProject @@ -694,6 +707,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -744,9 +758,11 @@ PlayerSettings: hmiPlayerDataPath: hmiForceSRGBBlit: 1 embeddedLinuxEnableGamepadInput: 1 - hmiLogStartupTiming: 0 hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 0 windowsGamepadBackendHint: 0 cloudProjectId: diff --git a/PerformanceProject/ProjectSettings/ProjectVersion.txt b/PerformanceProject/ProjectSettings/ProjectVersion.txt index 2d4bcb4f1..2ffa4518e 100644 --- a/PerformanceProject/ProjectSettings/ProjectVersion.txt +++ b/PerformanceProject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2023.2.12f1 -m_EditorVersionWithRevision: 2023.2.12f1 (19eeb3b320af) +m_EditorVersion: 2023.2.20f1 +m_EditorVersionWithRevision: 2023.2.20f1 (0e25a174756c)