Skip to content

Commit fa0ac9c

Browse files
sophiaaarSophia
sophiaaar
authored and
Sophia
committed
backport #647 and #664 
1 parent 159dfa8 commit fa0ac9c

File tree

17 files changed

+94
-39
lines changed

17 files changed

+94
-39
lines changed

‎TestProjects/HDRP_DXR_Tests/Packages/manifest.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
"com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
1414
"com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config",
1515
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
16-
"com.unity.test-framework": "1.1.9",
17-
"com.unity.testframework.graphics": "7.1.12-preview",
16+
"com.unity.test-framework": "1.1.14",
17+
"com.unity.test-framework.build": "0.0.1-preview.12",
18+
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
19+
"com.unity.testframework.graphics": "7.2.1-preview",
1820
"com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
1921
"com.unity.textmeshpro": "3.0.0-preview.1",
2022
"com.unity.timeline": "1.2.6",

‎TestProjects/HDRP_RuntimeTests/Assets/XR.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
13+
m_Name: XRGeneralSettings
14+
m_EditorClassIdentifier:
15+
Keys:
16+
Values: []

‎TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/HDRP_RuntimeTests/Packages/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
88
"com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
99
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
10-
"com.unity.test-framework": "1.1.5",
11-
"com.unity.test-framework.build": "0.0.1-preview.3",
12-
"com.unity.test-framework.utp-reporter": "0.1.3-preview.17",
13-
"com.unity.testframework.graphics": "7.1.12-preview",
10+
"com.unity.test-framework": "1.1.14",
11+
"com.unity.test-framework.build": "0.0.1-preview.12",
12+
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
13+
"com.unity.testframework.graphics": "7.2.1-preview",
1414
"com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
1515
"com.unity.ugui": "1.0.0",
1616
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",

‎TestProjects/HDRP_RuntimeTests/ProjectSettings/PackageManagerSettings.asset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_EnablePreviewPackages: 1
16+
oneTimeWarningShown: 1

‎TestProjects/HDRP_RuntimeTests/ProjectSettings/XRPackageSettings.asset

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"m_Settings": [
3+
"RemoveLegacyInputHelpersForReload"
4+
]
5+
}

‎TestProjects/HDRP_Tests/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
88
"com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
99
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
10-
"com.unity.test-framework": "1.1.5",
11-
"com.unity.testframework.graphics": "7.1.12-preview",
10+
"com.unity.test-framework": "1.1.14",
11+
"com.unity.testframework.graphics": "7.2.1-preview",
1212
"com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
1313
"com.unity.ugui": "1.0.0",
1414
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",

‎TestProjects/SRP_SmokeTest/Packages/manifest.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
"com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
66
"com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal",
77
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
8-
"com.unity.test-framework": "1.1.5",
9-
"com.unity.testframework.graphics": "7.1.12-preview",
8+
"com.unity.test-framework": "1.1.14",
9+
"com.unity.test-framework.build": "0.0.1-preview.12",
10+
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
11+
"com.unity.testframework.graphics": "7.2.1-preview",
1012
"com.unity.ugui": "1.0.0",
1113
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
1214
"com.unity.xr.legacyinputhelpers": "2.1.2",
@@ -40,9 +42,7 @@
4042
"com.unity.modules.video": "1.0.0",
4143
"com.unity.modules.vr": "1.0.0",
4244
"com.unity.modules.wind": "1.0.0",
43-
"com.unity.modules.xr": "1.0.0",
44-
"com.unity.test-framework.utp-reporter": "0.1.3-preview.17",
45-
"com.unity.test-framework.build": "0.0.1-preview.3"
45+
"com.unity.modules.xr": "1.0.0"
4646
},
4747
"testables": [
4848
"com.unity.render-pipelines.core",

‎TestProjects/ShaderGraph/Packages/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core",
66
"com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal",
77
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
8-
"com.unity.test-framework": "1.1.11",
9-
"com.unity.test-framework.build": "0.0.1-preview.12",
10-
"com.unity.test-framework.utp-reporter": "0.1.3-preview.18",
11-
"com.unity.testframework.graphics": "7.1.12-preview",
8+
"com.unity.test-framework": "1.1.14",
9+
"com.unity.test-framework.build": "0.0.1-preview.3",
10+
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
11+
"com.unity.testframework.graphics": "7.2.1-preview",
1212
"com.unity.testtools.codecoverage": "0.2.2-preview",
1313
"com.unity.ugui": "1.0.0",
1414
"com.unity.xr.interactionsubsystems": "1.0.1",

0 commit comments

Comments
 (0)