diff --git a/XRTK.Examples/ProjectSettings/EditorBuildSettings.asset b/XRTK.Examples/ProjectSettings/EditorBuildSettings.asset index e4b136f1..7f67ea73 100644 --- a/XRTK.Examples/ProjectSettings/EditorBuildSettings.asset +++ b/XRTK.Examples/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/XRTK.Examples/BaseScene.unity guid: 092b39bb8f12afa498a539bd456a71d6 m_configObjects: {} diff --git a/XRTK.Examples/ProjectSettings/GraphicsSettings.asset b/XRTK.Examples/ProjectSettings/GraphicsSettings.asset index 1a6b7d1d..166d4fe3 100644 --- a/XRTK.Examples/ProjectSettings/GraphicsSettings.asset +++ b/XRTK.Examples/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} @@ -62,3 +63,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_LogWhenShaderIsCompiled: 0 + m_AllowEnlightenSupportForUpgradedProject: 1 diff --git a/XRTK.Examples/ProjectSettings/ProjectSettings.asset b/XRTK.Examples/ProjectSettings/ProjectSettings.asset index f6d71315..ba05bca5 100644 --- a/XRTK.Examples/ProjectSettings/ProjectSettings.asset +++ b/XRTK.Examples/ProjectSettings/ProjectSettings.asset @@ -566,6 +566,29 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 + ps5ParamFilePath: + ps5VideoOutPixelFormat: 0 + ps5VideoOutInitialWidth: 1920 + ps5VideoOutOutputMode: 1 + ps5BackgroundImagePath: + ps5StartupImagePath: + ps5Pic2Path: + ps5StartupImagesFolder: + ps5IconImagesFolder: + ps5SaveDataImagePath: + ps5SdkOverride: + ps5BGMPath: + ps5ShareOverlayImagePath: + ps5NPConfigZipPath: + ps5Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ + ps5UseResolutionFallback: 0 + ps5UseAudio3dBackend: 0 + ps5ScriptOptimizationLevel: 2 + ps5Audio3dVirtualSpeakerCount: 14 + ps5UpdateReferencePackage: + ps5disableAutoHideSplash: 0 + ps5OperatingSystemCanDisableSplashScreen: 0 + ps5IncludedModules: [] monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -597,6 +620,7 @@ PlayerSettings: additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -691,6 +715,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -711,7 +736,7 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_SignPackage: 1 + m_SignPackage: 0 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 diff --git a/XRTK.Examples/ProjectSettings/UnityConnectSettings.asset b/XRTK.Examples/ProjectSettings/UnityConnectSettings.asset index c3ae9a02..fa0b1465 100644 --- a/XRTK.Examples/ProjectSettings/UnityConnectSettings.asset +++ b/XRTK.Examples/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 1 + m_Enabled: 0 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000..1430ac36 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,65 @@ +# XRTK Azure Pipelines build configuration + +resources: + repositories: + - repository: pipeline_repo + type: github + name: XRTK/AzurePipelines + endpoint: XRTK + +variables: + project.name: 'XRTK.Examples' + package.name: '' + package.version: '' + EditorPath: '' + LogDirectory: '' + ${{ if eq( variables['build.reason'], 'PullRequest' ) }}: + date: '' + ${{ if ne( variables['build.reason'], 'PullRequest' ) }}: + date: ${{ '$(Date:yyyyMMdd)' }} + isReleaseBuild: $[ and( eq(variables['Build.SourceBranchName'], 'main'), or( eq(variables['build.reason'], 'BatchedCI'), eq(variables['build.reason'], 'Manual') ) ) ] + isPreviewBuild: $[ and( eq(variables['System.PullRequest.TargetBranch'], 'main'), eq(variables['build.reason'], 'PullRequest') ) ] + +name: $(package.name) ${{ coalesce( variables['date'], '$(System.PullRequest.PullRequestNumber)', '$(Date:yyyyMMdd)' ) }}$(Rev:.r) + +pr: + autoCancel: true + branches: + include: + - main + - development + - feature/* + paths: + include: + - azure-pipelines.yml + - XRTK.Examples/* + exclude: + - '*' + +trigger: + batch: true + branches: + include: + - main + paths: + include: + - azure-pipelines.yml + - XRTK.Examples/* + exclude: + - '*' + +extends: + template: common.yml@pipeline_repo + parameters: + # Unity -buildTarget command line args https://docs.unity3d.com/Manual/CommandLineArguments.html + # StandaloneWindows64, WSAPlayer, StandaloneOSX, iOS, StandaloneLinux64, Android, WebGL, Lumin + # TODO: Only use XRTK defined platform targets for build + targets: + - StandaloneWindows64 + - WSAPlayer + - StandaloneOSX + - iOS + - StandaloneLinux64 + - Android + - Lumin + #- WebGL