Skip to content

Commit 6252101

Browse files
H3idi-XH3idi-X
committed
Merge branch 'feature/reconsider-test-process' into development/v1
# Conflicts: # TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/011_Sample(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/005_LightAndShadows(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/017_ToonShader_Emissive(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/018_ToonShader_Firefly(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/001_AngelRing(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/001_AngelRing(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/002_BoxProjection(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/002_BoxProjection(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/003_Cube_HardEdge(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/003_Cube_HardEdge(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/005_LightAndShadows(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/005_LightAndShadows(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/006_LightAndShadows_BakedLight(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/006_LightAndShadows_BakedLight(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/007_MatCapMask(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/007_MatCapMask(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/009_NormalMap(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/009_NormalMap(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/010_PointLightTest(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/010_PointLightTest(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/011_Sample(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/011_Sample(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/012_SceneLights Hi-Cut_Filter Test(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/012_SceneLights Hi-Cut_Filter Test(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/013_ShaderBall(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/013_ShaderBall(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_ToonShader(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_ToonShader(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/016_ToonShader_CelLook(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/016_ToonShader_CelLook(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/017_ToonShader_Emissive(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/017_ToonShader_Emissive(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/018_ToonShader_Firefly(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/018_ToonShader_Firefly(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/019_ToonShader_LightCulling(HDRP).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/019_ToonShader_LightCulling(HDRP).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/031_ToonShader_CelLook(HDRP-Tessellation).png # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/031_ToonShader_CelLook(HDRP-Tessellation).png.meta # TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/Runtime/LightAndShadows/005_LightAndShadows(HDRP).unity # TestProjects/HDRPUTS_GraphicsTest-2021.2/ProjectSettings/ProjectSettings.asset
2 parents 0ff8e3c + 055e42a commit 6252101

File tree

38 files changed

+1321
-291
lines changed

38 files changed

+1321
-291
lines changed

‎TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/ActualImages.meta~feature_reconsider-test-process‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
fileFormatVersion: 2
2+
guid: ad0f2e294fb88164680544cbb4a6be94
3+
folderAsset: yes
4+
DefaultImporter:
5+
externalObjects: {}
6+
userData:
7+
assetBundleName:
8+
assetBundleVariant:

‎TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/005_LightAndShadows_HDRP_.png‎

318 KB
Loading

‎TestProjects/HDRPUTS_GraphicsTest-2020.3/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/005_LightAndShadows_HDRP_.png.meta‎

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

‎TestProjects/HDRPUTS_GraphicsTest-2020.3/Packages/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"com.unity.ide.rider": "2.0.7",
44
"com.unity.ide.visualstudio": "2.0.9",
55
"com.unity.ide.vscode": "1.2.3",
6-
"com.unity.package-validation-suite": "0.10.0-preview",
6+
"com.unity.package-validation-suite": "0.21.0-preview",
77
"com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git",
88
"com.unity.render-pipelines.high-definition": "10.5.0",
99
"com.unity.test-framework": "1.1.27",
1010
"com.unity.test-framework.build": "0.0.1-preview.12",
11-
"com.unity.test-framework.utp-reporter": "1.0.2-preview",
12-
"com.unity.testframework.graphics": "7.8.8-preview",
11+
"com.unity.test-framework.utp-reporter": "1.1.0-preview",
12+
"com.unity.testframework.graphics": "7.8.15-preview",
1313
"com.unity.textmeshpro": "3.0.6",
1414
"com.unity.toonshader": "file:../../../com.unity.toonshader",
1515
"com.unity.ugui": "1.0.0",

‎TestProjects/HDRPUTS_GraphicsTest-2020.3/Packages/packages-lock.json‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@
5555
"dependencies": {},
5656
"url": "https://packages.unity.com"
5757
},
58+
"com.unity.nuget.mono-cecil": {
59+
"version": "0.1.6-preview.2",
60+
"depth": 1,
61+
"source": "registry",
62+
"dependencies": {
63+
"nuget.mono-cecil": "0.1.6-preview"
64+
},
65+
"url": "https://packages.unity.com"
66+
},
5867
"com.unity.nuget.newtonsoft-json": {
5968
"version": "2.0.0-preview",
6069
"depth": 1,
@@ -63,11 +72,11 @@
6372
"url": "https://packages.unity.com"
6473
},
6574
"com.unity.package-validation-suite": {
66-
"version": "0.10.0-preview",
75+
"version": "0.21.0-preview",
6776
"depth": 0,
6877
"source": "registry",
6978
"dependencies": {
70-
"nuget.mono-cecil": "0.1.6-preview"
79+
"com.unity.nuget.mono-cecil": "0.1.6-preview.2"
7180
},
7281
"url": "https://packages.unity.com"
7382
},
@@ -160,7 +169,7 @@
160169
"url": "https://packages.unity.com"
161170
},
162171
"com.unity.test-framework.utp-reporter": {
163-
"version": "1.0.2-preview",
172+
"version": "1.1.0-preview",
164173
"depth": 0,
165174
"source": "registry",
166175
"dependencies": {
@@ -170,11 +179,11 @@
170179
"url": "https://packages.unity.com"
171180
},
172181
"com.unity.testframework.graphics": {
173-
"version": "7.8.8-preview",
182+
"version": "7.8.15-preview",
174183
"depth": 0,
175184
"source": "registry",
176185
"dependencies": {
177-
"com.unity.xr.management": "3.2.15",
186+
"com.unity.xr.management": "4.0.5",
178187
"com.unity.external.test-protocol": "1.0.0-preview",
179188
"com.unity.nuget.newtonsoft-json": "2.0.0-preview",
180189
"com.unity.subsystemregistration": "1.0.6",
@@ -231,8 +240,8 @@
231240
"url": "https://packages.unity.com"
232241
},
233242
"com.unity.xr.management": {
234-
"version": "4.0.1",
235-
"depth": 0,
243+
"version": "4.0.5",
244+
"depth": 1,
236245
"source": "registry",
237246
"dependencies": {
238247
"com.unity.modules.subsystems": "1.0.0",
@@ -245,7 +254,7 @@
245254
},
246255
"nuget.mono-cecil": {
247256
"version": "0.1.6-preview",
248-
"depth": 1,
257+
"depth": 2,
249258
"source": "registry",
250259
"dependencies": {},
251260
"url": "https://packages.unity.com"

‎TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ActualImages.meta~feature_reconsider-test-process‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
fileFormatVersion: 2
2+
guid: 768f6845b44e6ae44858e13c3026009f
3+
folderAsset: yes
4+
DefaultImporter:
5+
externalObjects: {}
6+
userData:
7+
assetBundleName:
8+
assetBundleVariant:

‎TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/005_LightAndShadows(HDRP).png.meta‎

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

‎TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/011_Sample(HDRP).png.meta‎

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

‎TestProjects/HDRPUTS_GraphicsTest-2021.2/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/017_ToonShader_Emissive(HDRP).png.meta‎

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

0 commit comments

Comments
 (0)