Skip to content

[PPV2] Fixed obsolete ProjectWindow usage and test project dependencies #8244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenGraterUnity wants to merge 7 commits into
base: master
Choose a base branch
from
+28 −9
Open

[PPV2] Fixed obsolete ProjectWindow usage and test project dependencies #8244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb2a15c
Fix obsolete ProjectWindow usage
BenGraterUnity Dec 9, 2025
da82831
Update CHANGELOG
BenGraterUnity Dec 9, 2025
2b687c8
Update test project dependencies
BenGraterUnity Dec 9, 2025
4d1c726
Update bokken images
theo-at-unity Dec 9, 2025
cd5c00f
Fix OSX pipelines
theo-at-unity Dec 9, 2025
179ee35
Fix brew command
theo-at-unity Dec 9, 2025
93e7675
Merge branch 'master' into ppv2/fix-projectwindow
BenGraterUnity Dec 9, 2025
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
6 changes: 3 additions & 3 deletions .yamato/postprocessing-linux-vulkan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
10 changes: 6 additions & 4 deletions .yamato/postprocessing-osx-metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions TestProjects/PostProcessing_Tests/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions com.unity.postprocessing/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions com.unity.postprocessing/PostProcessing/Editor/Tools/ProfileFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<DoCreatePostProcessProfile>(), "New Post-processing Profile.asset", null, null);
#else
ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreatePostProcessProfile>(), "New Post-processing Profile.asset", null, null);
#endif

}

/// <summary>
Expand Down Expand Up @@ -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)
Expand All @@ -79,4 +94,5 @@ public override void Action(int instanceId, string pathName, string resourceFile
ProjectWindowUtil.ShowCreatedAsset(profile);
}
}
#endif
}