diff --git a/.yamato/postprocessing-linux-vulkan.yml b/.yamato/postprocessing-linux-vulkan.yml index ebea0a07d28..1135a37babf 100644 --- a/.yamato/postprocessing-linux-vulkan.yml +++ b/.yamato/postprocessing-linux-vulkan.yml @@ -2,7 +2,7 @@ PostProcessing_Linux_Vulkan_playmode_mono_Linear_trunk: name: PostProcessing on Linux_Vulkan_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU - image: desktop/ubuntu-20.04-desktop:v2.1348791 + image: desktop/ubuntu-22.04-desktop:v2.5184455 flavor: b1.large variables: CUSTOM_REVISION: 'trunk' @@ -37,7 +37,7 @@ PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk: name: PostProcessing on Linux_Vulkan_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU - image: desktop/ubuntu-20.04-desktop:v2.1348791 + image: desktop/ubuntu-22.04-desktop:v2.5184455 flavor: b1.large variables: CUSTOM_REVISION: 'trunk' @@ -66,7 +66,7 @@ Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk: name: Build PostProcessing on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM - image: desktop/ubuntu-20.04-desktop:v2.1348791 + image: desktop/ubuntu-22.04-desktop:v2.5184455 flavor: b1.xlarge variables: CUSTOM_REVISION: 'trunk' diff --git a/.yamato/postprocessing-osx-metal.yml b/.yamato/postprocessing-osx-metal.yml index c9bcdce2ce0..4726dccc533 100644 --- a/.yamato/postprocessing-osx-metal.yml +++ b/.yamato/postprocessing-osx-metal.yml @@ -2,7 +2,7 @@ PostProcessing_OSX_Metal_playmode_mono_Linear_trunk: name: PostProcessing on OSX_Metal_playmode_mono_Linear on version trunk agent: type: Unity::metal::macmini - image: automation-tooling/macos-11:v2.1987114 + image: automation-tooling/macos-13:v2.4694476 flavor: m1.mac model: 2018-i3-macos11 variables: @@ -11,7 +11,8 @@ PostProcessing_OSX_Metal_playmode_mono_Linear_trunk: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates UTR_VERSION: "current" commands: - - pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple + - brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git + - brew install Unity-Technologies/homebrew-unity/unity-downloader-cli - unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 @@ -40,7 +41,7 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk: name: PostProcessing on OSX_Metal_Standalone_mono_Linear on version trunk agent: type: Unity::metal::macmini - image: automation-tooling/macos-11:v2.1987114 + image: automation-tooling/macos-13:v2.4694476 flavor: m1.mac model: 2018-i3-macos11 variables: @@ -49,7 +50,8 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates UTR_VERSION: "current" commands: - - pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple + - brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git + - brew install Unity-Technologies/homebrew-unity/unity-downloader-cli - unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 diff --git a/TestProjects/PostProcessing_Tests/Packages/manifest.json b/TestProjects/PostProcessing_Tests/Packages/manifest.json index ba475e8e57f..d436bc21138 100644 --- a/TestProjects/PostProcessing_Tests/Packages/manifest.json +++ b/TestProjects/PostProcessing_Tests/Packages/manifest.json @@ -1,8 +1,9 @@ { "dependencies": { + "com.unity.ide.visualstudio": "2.0.25", "com.unity.postprocessing": "file:../../../com.unity.postprocessing", "com.unity.test-framework": "1.1.30", - "com.unity.testframework.graphics": "7.11.1-exp.1", + "com.unity.testframework.graphics": "8.13.1-exp.1", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", @@ -15,7 +16,6 @@ "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0" }, "disableProjectUpdate": true, diff --git a/com.unity.postprocessing/CHANGELOG.md b/com.unity.postprocessing/CHANGELOG.md index f7e59af8488..ab173ab96d6 100644 --- a/com.unity.postprocessing/CHANGELOG.md +++ b/com.unity.postprocessing/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] ### Fixed +- Fixed obsolete ProjectWindow usage in Unity 6.4 or newer - Replaced deprecated Mono API with CoreCLR-compatible API ## [3.5.1] - 2025-09-19 diff --git a/com.unity.postprocessing/PostProcessing/Editor/Tools/ProfileFactory.cs b/com.unity.postprocessing/PostProcessing/Editor/Tools/ProfileFactory.cs index 8dfd4af44e3..75040d96580 100644 --- a/com.unity.postprocessing/PostProcessing/Editor/Tools/ProfileFactory.cs +++ b/com.unity.postprocessing/PostProcessing/Editor/Tools/ProfileFactory.cs @@ -15,7 +15,12 @@ public sealed class ProfileFactory static void CreatePostProcessProfile() { //var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon"); +#if UNITY_6000_4_OR_NEWER + ProjectWindowUtil.StartNameEditingIfProjectWindowExists(EntityId.None, ScriptableObject.CreateInstance(), "New Post-processing Profile.asset", null, null); +#else ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance(), "New Post-processing Profile.asset", null, null); +#endif + } /// @@ -71,6 +76,16 @@ public static PostProcessProfile CreatePostProcessProfile(Scene scene, string ta } } +#if UNITY_6000_4_OR_NEWER + class DoCreatePostProcessProfile : AssetCreationEndAction + { + public override void Action(EntityId entityId, string pathName, string resourceFile) + { + var profile = ProfileFactory.CreatePostProcessProfileAtPath(pathName); + ProjectWindowUtil.ShowCreatedAsset(profile); + } + } +#else class DoCreatePostProcessProfile : EndNameEditAction { public override void Action(int instanceId, string pathName, string resourceFile) @@ -79,4 +94,5 @@ public override void Action(int instanceId, string pathName, string resourceFile ProjectWindowUtil.ShowCreatedAsset(profile); } } +#endif }