Skip to content

[9.x.x] Update dependencies [skip ci] #665

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

Merged
merged 2 commits into from
May 29, 2020
Merged

[9.x.x] Update dependencies [skip ci] #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bb60d3
backport #647
sophiaaar May 28, 2020
b8b8507
backport #664
sophiaaar May 29, 2020
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
4 changes: 3 additions & 1 deletion TestProjects/HDRP_DXR_Tests/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
"com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config",
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
"com.unity.textmeshpro": "3.0.0-preview.1",
"com.unity.timeline": "1.2.6",
Expand Down
8 changes: 8 additions & 0 deletions TestProjects/HDRP_RuntimeTests/Assets/XR.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
m_Name: XRGeneralSettings
m_EditorClassIdentifier:
Keys:
Values: []
8 changes: 8 additions & 0 deletions TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions TestProjects/HDRP_RuntimeTests/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
"com.unity.ugui": "1.0.0",
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
Expand Down
16 changes: 16 additions & 0 deletions TestProjects/HDRP_RuntimeTests/ProjectSettings/PackageManagerSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 61
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_EnablePreviewPackages: 1
oneTimeWarningShown: 1
5 changes: 5 additions & 0 deletions TestProjects/HDRP_RuntimeTests/ProjectSettings/XRPackageSettings.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"m_Settings": [
"RemoveLegacyInputHelpersForReload"
]
}
2 changes: 1 addition & 1 deletion TestProjects/HDRP_Tests/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
"com.unity.ugui": "1.0.0",
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
Expand Down
8 changes: 4 additions & 4 deletions TestProjects/SRP_SmokeTest/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal",
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.ugui": "1.0.0",
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
"com.unity.xr.legacyinputhelpers": "2.1.2",
Expand Down Expand Up @@ -40,9 +42,7 @@
"com.unity.modules.video": "1.0.0",
"com.unity.modules.vr": "1.0.0",
"com.unity.modules.wind": "1.0.0",
"com.unity.modules.xr": "1.0.0",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.test-framework.build": "0.0.1-preview.12"
"com.unity.modules.xr": "1.0.0"
},
"testables": [
"com.unity.render-pipelines.core",
Expand Down
6 changes: 3 additions & 3 deletions TestProjects/ShaderGraph/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal",
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.build": "0.0.1-preview.3",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.testtools.codecoverage": "0.2.2-preview",
"com.unity.ugui": "1.0.0",
"com.unity.xr.interactionsubsystems": "1.0.1",
Expand Down
4 changes: 2 additions & 2 deletions TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.ugui": "1.0.0",
"com.unity.xr.mock-hmd": "1.0.1-preview.6",
"com.unity.modules.ai": "1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions TestProjects/UniversalGfxTestStereo/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.2",
"com.unity.xr.mock-hmd": "1.0.1-preview.6",
Expand Down
2 changes: 1 addition & 1 deletion TestProjects/UniversalGraphicsTest/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.0-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions TestProjects/VisualEffectGraph/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.testing.visualeffectgraph": "file:../../../com.unity.testing.visualeffectgraph",
"com.unity.timeline": "1.2.9",
"com.unity.ugui": "1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions TestProjects/VisualEffectGraph_LWRP/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"com.unity.shadergraph": "file:../../../com.unity.shadergraph",
"com.unity.test-framework": "1.1.14",
"com.unity.test-framework.build": "0.0.1-preview.12",
"com.unity.test-framework.utp-reporter": "1.0.0-preview",
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.testing.visualeffectgraph": "file:../../../com.unity.testing.visualeffectgraph",
"com.unity.ugui": "1.0.0",
"com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
Expand Down Expand Up @@ -51,4 +51,4 @@
"com.unity.render-pipelines.visualeffectgraph",
"com.unity.testframework.graphics"
]
}
}
2 changes: 1 addition & 1 deletion com.unity.testing.hdrp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"description": "Common assets library for HDRP test projects.",
"keywords": ["qa", "test", "testing", "tests", "graphics", "HDRP"],
"dependencies": {
"com.unity.testframework.graphics": "7.1.13-preview",
"com.unity.testframework.graphics": "7.2.1-preview",
"com.unity.render-pipelines.high-definition": "file:./com.unity.render-pipelines.high-definition"
}
}
2 changes: 1 addition & 1 deletion com.unity.testing.visualeffectgraph/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"description": "This package contains common graphics tests from several scriptable renderpipeline",
"dependencies": {
"com.unity.visualeffectgraph": "8.0.0",
"com.unity.testframework.graphics": "7.1.13-preview"
"com.unity.testframework.graphics": "7.2.1-preview"
}
}