Skip to content

Commit 981113a

Browse files
authored
Merge pull request #181 from immutable/test/sample-unit-test-framework
[DX-2768] test: update sample project unit test framework version
2 parents b380935 + e8224c1 commit 981113a

File tree

3 files changed

+47
-22
lines changed

3 files changed

+47
-22
lines changed

sample/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"com.unity.ai.navigation": "1.1.4",
66
"com.unity.ide.visualstudio": "2.0.21",
77
"com.unity.ide.vscode": "1.2.5",
8-
"com.unity.test-framework": "2.0.1-exp.1",
8+
"com.unity.test-framework": "1.3.0",
99
"com.unity.testtools.codecoverage": "1.2.5",
1010
"com.unity.visualscripting": "1.9.1",
1111
"com.unity.modules.ai": "1.0.0",
@@ -49,4 +49,4 @@
4949
]
5050
}
5151
]
52-
}
52+
}

sample/Packages/packages-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"url": "https://packages.unity.com"
2727
},
2828
"com.unity.ext.nunit": {
29-
"version": "2.0.2",
29+
"version": "2.0.3",
3030
"depth": 1,
3131
"source": "registry",
3232
"dependencies": {},
@@ -63,11 +63,11 @@
6363
"url": "https://packages.unity.com"
6464
},
6565
"com.unity.test-framework": {
66-
"version": "2.0.1-exp.1",
66+
"version": "1.3.0",
6767
"depth": 0,
6868
"source": "registry",
6969
"dependencies": {
70-
"com.unity.ext.nunit": "2.0.2",
70+
"com.unity.ext.nunit": "2.0.3",
7171
"com.unity.modules.imgui": "1.0.0",
7272
"com.unity.modules.jsonserialize": "1.0.0"
7373
},

sample/ProjectSettings/ProjectSettings.asset

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 24
6+
serializedVersion: 26
77
productGUID: 23782f6f9e1e0cd4fab77e7d94090ba2
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -48,14 +48,16 @@ PlayerSettings:
4848
defaultScreenHeightWeb: 600
4949
m_StereoRenderingPath: 0
5050
m_ActiveColorSpace: 0
51+
unsupportedMSAAFallback: 0
52+
m_SpriteBatchVertexThreshold: 300
5153
m_MTRendering: 1
5254
mipStripping: 0
5355
numberOfMipsStripped: 0
56+
numberOfMipsStrippedPerMipmapLimitGroup: {}
5457
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5558
iosShowActivityIndicatorOnLoading: -1
5659
androidShowActivityIndicatorOnLoading: -1
5760
iosUseCustomAppBackgroundBehavior: 0
58-
iosAllowHTTPDownload: 1
5961
allowedAutorotateToPortrait: 1
6062
allowedAutorotateToPortraitUpsideDown: 1
6163
allowedAutorotateToLandscapeRight: 1
@@ -74,6 +76,7 @@ PlayerSettings:
7476
androidMinimumWindowWidth: 400
7577
androidMinimumWindowHeight: 300
7678
androidFullscreenMode: 1
79+
androidAutoRotationBehavior: 1
7780
defaultIsNativeResolution: 1
7881
macRetinaSupport: 0
7982
runInBackground: 0
@@ -85,6 +88,7 @@ PlayerSettings:
8588
hideHomeButton: 0
8689
submitAnalytics: 1
8790
usePlayerLog: 1
91+
dedicatedServerOptimizations: 0
8892
bakeCollisionMeshes: 0
8993
forceSingleInstance: 0
9094
useFlipModelSwapchain: 1
@@ -119,21 +123,20 @@ PlayerSettings:
119123
switchNVNShaderPoolsGranularity: 33554432
120124
switchNVNDefaultPoolsGranularity: 16777216
121125
switchNVNOtherPoolsGranularity: 16777216
126+
switchGpuScratchPoolGranularity: 2097152
127+
switchAllowGpuScratchShrinking: 0
122128
switchNVNMaxPublicTextureIDCount: 0
123129
switchNVNMaxPublicSamplerIDCount: 0
130+
switchNVNGraphicsFirmwareMemory: 32
131+
switchMaxWorkerMultiple: 8
124132
stadiaPresentMode: 0
125133
stadiaTargetFramerate: 0
126134
vulkanNumSwapchainBuffers: 3
127135
vulkanEnableSetSRGBWrite: 0
128136
vulkanEnablePreTransform: 0
129137
vulkanEnableLateAcquireNextImage: 0
130138
vulkanEnableCommandBufferRecycling: 1
131-
m_SupportedAspectRatios:
132-
4:3: 1
133-
5:4: 1
134-
16:10: 1
135-
16:9: 1
136-
Others: 1
139+
loadStoreDebugModeEnabled: 0
137140
bundleVersion: 1.0
138141
preloadedAssets: []
139142
metroInputSource: 0
@@ -146,8 +149,9 @@ PlayerSettings:
146149
isWsaHolographicRemotingEnabled: 0
147150
enableFrameTimingStats: 0
148151
enableOpenGLProfilerGPURecorders: 1
152+
allowHDRDisplaySupport: 0
149153
useHDRDisplay: 0
150-
D3DHDRBitDepth: 0
154+
hdrBitDepth: 0
151155
m_ColorGamuts: 00000000
152156
targetPixelDensity: 30
153157
resolutionScalingMode: 0
@@ -158,6 +162,7 @@ PlayerSettings:
158162
Standalone: com.immutable.unitysample
159163
buildNumber:
160164
Standalone: 0
165+
VisionOS: 0
161166
iPhone: 0
162167
tvOS: 0
163168
overrideDefaultApplicationIdentifier: 1
@@ -175,12 +180,15 @@ PlayerSettings:
175180
APKExpansionFiles: 0
176181
keepLoadedShadersAlive: 0
177182
StripUnusedMeshComponents: 0
183+
strictShaderVariantMatching: 0
178184
VertexChannelCompressionMask: 4054
179185
iPhoneSdkVersion: 988
180186
iOSTargetOSVersionString: 13.0
181187
tvOSSdkVersion: 0
182188
tvOSRequireExtendedGameController: 0
183189
tvOSTargetOSVersionString: 12.0
190+
VisionOSSdkVersion: 0
191+
VisionOSTargetOSVersionString: 1.0
184192
uIPrerenderedIcon: 0
185193
uIRequiresPersistentWiFi: 0
186194
uIRequiresFullScreen: 1
@@ -229,8 +237,10 @@ PlayerSettings:
229237
appleDeveloperTeamID:
230238
iOSManualSigningProvisioningProfileID:
231239
tvOSManualSigningProvisioningProfileID:
240+
VisionOSManualSigningProvisioningProfileID:
232241
iOSManualSigningProvisioningProfileType: 0
233242
tvOSManualSigningProvisioningProfileType: 0
243+
VisionOSManualSigningProvisioningProfileType: 0
234244
appleEnableAutomaticSigning: 0
235245
iOSRequireARKit: 0
236246
iOSAutomaticallyDetectAndAddCapabilities: 1
@@ -245,13 +255,15 @@ PlayerSettings:
245255
useCustomLauncherGradleManifest: 0
246256
useCustomBaseGradleTemplate: 0
247257
useCustomGradlePropertiesTemplate: 0
258+
useCustomGradleSettingsTemplate: 0
248259
useCustomProguardFile: 1
249260
AndroidTargetArchitectures: 2
250261
AndroidTargetDevices: 0
251262
AndroidSplashScreenScale: 0
252263
androidSplashScreen: {fileID: 0}
253264
AndroidKeystoreName:
254265
AndroidKeyaliasName:
266+
AndroidEnableArmv9SecurityFeatures: 0
255267
AndroidBuildApkPerCpuArchitecture: 0
256268
AndroidTVCompatibility: 0
257269
AndroidIsGame: 1
@@ -265,7 +277,6 @@ PlayerSettings:
265277
banner: {fileID: 0}
266278
androidGamepadSupportLevel: 0
267279
chromeosInputEmulation: 1
268-
AndroidMinifyWithR8: 0
269280
AndroidMinifyRelease: 0
270281
AndroidMinifyDebug: 0
271282
AndroidValidateAppBundleSize: 1
@@ -510,7 +521,9 @@ PlayerSettings:
510521
iPhone: 1
511522
tvOS: 1
512523
m_BuildTargetGroupLightmapEncodingQuality: []
524+
m_BuildTargetGroupHDRCubemapEncodingQuality: []
513525
m_BuildTargetGroupLightmapSettings: []
526+
m_BuildTargetGroupLoadStoreDebugModeSettings: []
514527
m_BuildTargetNormalMapEncoding: []
515528
m_BuildTargetDefaultTextureCompressionFormat:
516529
- m_BuildTarget: Android
@@ -525,17 +538,19 @@ PlayerSettings:
525538
locationUsageDescription:
526539
microphoneUsageDescription:
527540
bluetoothUsageDescription:
541+
macOSTargetOSVersion: 10.13.0
528542
switchNMETAOverride:
529543
switchNetLibKey:
530544
switchSocketMemoryPoolSize: 6144
531545
switchSocketAllocatorPoolSize: 128
532546
switchSocketConcurrencyLimit: 14
533547
switchScreenResolutionBehavior: 2
534548
switchUseCPUProfiler: 0
535-
switchUseGOLDLinker: 0
549+
switchEnableFileSystemTrace: 0
536550
switchLTOSetting: 0
537551
switchApplicationID: 0x01004b9000490000
538552
switchNSODependencies:
553+
switchCompilerFlags:
539554
switchTitleNames_0:
540555
switchTitleNames_1:
541556
switchTitleNames_2:
@@ -661,7 +676,6 @@ PlayerSettings:
661676
switchSocketBufferEfficiency: 4
662677
switchSocketInitializeEnabled: 1
663678
switchNetworkInterfaceManagerInitializeEnabled: 1
664-
switchPlayerConnectionEnabled: 1
665679
switchUseNewStyleFilepaths: 0
666680
switchUseLegacyFmodPriorities: 1
667681
switchUseMicroSleepForYield: 1
@@ -751,6 +765,7 @@ PlayerSettings:
751765
webGLMemorySize: 32
752766
webGLExceptionSupport: 1
753767
webGLNameFilesAsHashes: 0
768+
webGLShowDiagnostics: 0
754769
webGLDataCaching: 1
755770
webGLDebugSymbols: 0
756771
webGLEmscriptenArgs:
@@ -763,6 +778,12 @@ PlayerSettings:
763778
webGLLinkerTarget: 1
764779
webGLThreadsSupport: 0
765780
webGLDecompressionFallback: 0
781+
webGLInitialMemorySize: 32
782+
webGLMaximumMemorySize: 2048
783+
webGLMemoryGrowthMode: 2
784+
webGLMemoryLinearGrowthStep: 16
785+
webGLMemoryGeometricGrowthStep: 0.2
786+
webGLMemoryGeometricGrowthCap: 96
766787
webGLPowerPreference: 2
767788
scriptingDefineSymbols: {}
768789
additionalCompilerArguments:
@@ -773,6 +794,7 @@ PlayerSettings:
773794
Android: 1
774795
Standalone: 0
775796
il2cppCompilerConfiguration: {}
797+
il2cppCodeGeneration: {}
776798
managedStrippingLevel:
777799
EmbeddedLinux: 1
778800
GameCoreScarlett: 1
@@ -791,12 +813,9 @@ PlayerSettings:
791813
suppressCommonWarnings: 1
792814
allowUnsafeCode: 0
793815
useDeterministicCompilation: 1
794-
enableRoslynAnalyzers: 1
795-
selectedPlatform: 2
796816
additionalIl2CppArgs:
797817
scriptingRuntimeVersion: 1
798818
gcIncremental: 1
799-
assemblyVersionValidation: 1
800819
gcWBarrierValidation: 0
801820
apiCompatibilityLevelPerPlatform: {}
802821
m_RenderingPath: 1
@@ -868,6 +887,11 @@ PlayerSettings:
868887
luminVersion:
869888
m_VersionCode: 1
870889
m_VersionName:
890+
hmiPlayerDataPath:
891+
hmiForceSRGBBlit: 1
892+
embeddedLinuxEnableGamepadInput: 1
893+
hmiLogStartupTiming: 0
894+
hmiCpuConfiguration:
871895
apiCompatibilityLevel: 6
872896
activeInputHandler: 0
873897
windowsGamepadBackendHint: 0
@@ -878,6 +902,7 @@ PlayerSettings:
878902
organizationId:
879903
cloudEnabled: 0
880904
legacyClampBlendShapeWeights: 0
881-
playerDataPath:
882-
forceSRGBBlit: 1
905+
hmiLoadingImage: {fileID: 0}
906+
platformRequiresReadableAssets: 0
883907
virtualTexturingSupportEnabled: 0
908+
insecureHttpOption: 0

0 commit comments

Comments
 (0)