From df16813fae7b92a37a60668008f209134377df8d Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:22:28 +0900 Subject: [PATCH 01/15] ci: bump actions/checkout@v3 -> v4 --- .github/workflows/build-debug.yml | 6 +++--- .github/workflows/build-docs.yml | 4 ++-- .github/workflows/build-release.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index f6e4ba7..e9725b6 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: Cysharp/Actions/.github/actions/setup-dotnet@main - run: dotnet build -c Debug - run: dotnet test -c Debug @@ -37,8 +37,8 @@ jobs: UNITY_PASSWORD: "op://GitHubActionsPublic/UNITY_LICENSE/credential" UNITY_SERIAL: "op://GitHubActionsPublic/UNITY_LICENSE/serial" - - uses: actions/checkout@v3 - # Execute scripts: RuntimeUnitTestToolkit + - uses: actions/checkout@v4 + # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64 - name: Build UnitTest(Linux64, mono) uses: Cysharp/Actions/.github/actions/unity-builder@main diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 68b685d..be5c4b9 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -11,8 +11,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 10 steps: - - uses: actions/checkout@v3 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + - uses: actions/checkout@v4 with: repository: Cysharp/DocfxTemplate path: docs/_DocfxTemplate diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 0befd82..38936fd 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -26,7 +26,7 @@ jobs: timeout-minutes: 10 steps: - run: echo ${{ needs.update-packagejson.outputs.sha }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ needs.update-packagejson.outputs.sha }} - uses: Cysharp/Actions/.github/actions/setup-dotnet@main @@ -61,7 +61,7 @@ jobs: UNITY_SERIAL: "op://GitHubActionsPublic/UNITY_LICENSE/serial" - run: echo ${{ needs.update-packagejson.outputs.sha }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ needs.update-packagejson.outputs.sha }} # Execute scripts: Export Package From c3146ec74f66d33b620f7fb12b7b102973b8ab2f Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:24:01 +0900 Subject: [PATCH 02/15] ci: change Unit Test to IL2CPP --- .github/workflows/build-debug.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index e9725b6..f025c1c 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -39,8 +39,9 @@ jobs: - uses: actions/checkout@v4 - # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend mono /BuildTarget StandaloneLinux64 - - name: Build UnitTest(Linux64, mono) + # Execute Unittest + # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod UnitTestBuilder.BuildUnitTest /headless /ScriptBackend IL2CPP /BuildTarget StandaloneLinux64 + - name: Build UnitTest uses: Cysharp/Actions/.github/actions/unity-builder@main env: UNITY_EMAIL: ${{ steps.op-load-secret.outputs.UNITY_EMAIL }} @@ -51,9 +52,11 @@ jobs: unityVersion: ${{ matrix.unity }} targetPlatform: StandaloneLinux64 buildMethod: UnitTestBuilder.BuildUnitTest - customParameters: /headless /ScriptBackend mono + customParameters: "/headless /ScriptBackend IL2CPP" + - name: Check UnitTest file is generated + run: ls -lR ./src/UniTask/bin/UnitTest - name: Execute UnitTest - run: ./src/UniTask/bin/UnitTest/StandaloneLinux64_Mono2x/test + run: ./src/UniTask/bin/UnitTest/StandaloneLinux64_IL2CPP/test # Execute scripts: Export Package # /opt/Unity/Editor/Unity -quit -batchmode -nographics -silent-crashes -logFile -projectPath . -executeMethod PackageExporter.Export From 342a37a074a579c5f120c9dd8e9a0971668f9a7f Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:44:49 +0900 Subject: [PATCH 03/15] ci: add strategy.fail-fast: false --- .github/workflows/build-debug.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index f025c1c..a1f7285 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -21,6 +21,7 @@ jobs: build-unity: if: ${{ (github.event_name == 'push' && github.repository_owner == 'Cysharp') || startsWith(github.event.pull_request.head.label, 'Cysharp:') }} strategy: + fail-fast: false matrix: unity: ["2019.3.9f1", "2019.4.13f1", "2020.1.12f1"] runs-on: ubuntu-latest From cb497c9eb5a2e86869803c1dcb02cf73464a364b Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:59:07 +0900 Subject: [PATCH 04/15] ci: bump Unity version to LTS, Unity Unit Test with LTS. --- .github/workflows/build-debug.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index a1f7285..f8a1988 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - unity: ["2019.3.9f1", "2019.4.13f1", "2020.1.12f1"] + unity: ["2021.3.41f1", "2022.3.38f1", "6000.0.11f1"] # Test with LTS runs-on: ubuntu-latest timeout-minutes: 15 steps: From f8a501290afbabe48be35bda1d5a763e9169d5eb Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:07:48 +0900 Subject: [PATCH 05/15] chore: upload --- .github/workflows/build-debug.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index f8a1988..f69049c 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -83,3 +83,10 @@ jobs: name: UniTask.unitypackage-${{ matrix.unity }}.zip path: ./src/UniTask/*.unitypackage retention-days: 1 + + - uses: Cysharp/Actions/.github/actions/upload-artifact@main + if: always() + with: + name: StandaloneLinux64_IL2CPP.${{ matrix.unity}}.test.zip + path: ./src/UniTask/bin/UnitTest/StandaloneLinux64_IL2CPP/test/ + retention-days: 1 From 7bb6feda5524d4f4d9c3688a65dfef9b808dc9b5 Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:10:17 +0900 Subject: [PATCH 06/15] chore: switch to src/UniTask/*.cproj --- .gitignore | 117 ++--------------------------------------------------- 1 file changed, 3 insertions(+), 114 deletions(-) diff --git a/.gitignore b/.gitignore index 724b27e..810fa71 100644 --- a/.gitignore +++ b/.gitignore @@ -80,7 +80,7 @@ _ReSharper* *.ncrunch* .*crunch*.local.xml -# Installshield output folder +# Installshield output folder [Ee]xpress # DocProject is a documentation generator add-in @@ -148,116 +148,5 @@ UniRx\.Async\.unitypackage UniRx.Async.Tests.Editor.csproj -src/UniTask/UniTask.csproj - -src/UniTask/UniTask.Editor.csproj - -src/UniTask/UniTask.Tests.csproj - -src/UniTask/UniTask.Tests.Editor.csproj - -src/UniTask/UniTask.*.unitypackage - -src/UniTask/UniTask.Linq.csproj - -src/UniTask/DOTween.Modules.csproj - -src/UniTask/Unity.Addressables.csproj - -src/UniTask/Unity.Addressables.Editor.csproj - -src/UniTask/Unity.Analytics.DataPrivacy.csproj - -src/UniTask/Unity.Recorder.csproj - -src/UniTask/Unity.Recorder.Editor.csproj - -src/UniTask/Unity.ResourceManager.csproj - -src/UniTask/Unity.Rider.Editor.csproj - -src/UniTask/Unity.ScriptableBuildPipeline.csproj - -src/UniTask/Unity.ScriptableBuildPipeline.Editor.csproj - -src/UniTask/Unity.TextMeshPro.csproj - -src/UniTask/Unity.TextMeshPro.Editor.csproj - -src/UniTask/Unity.Timeline.csproj - -src/UniTask/Unity.Timeline.Editor.csproj - -src/UniTask/Unity.VisualStudio.Editor.csproj - -src/UniTask/Unity.VSCode.Editor.csproj - -src/UniTask/UnityEditor.CacheServer.csproj - -src/UniTask/UnityEditor.TestRunner.csproj - -src/UniTask/UnityEditor.UI.csproj - -src/UniTask/UnityEngine.Advertisements.csproj - -src/UniTask/UnityEngine.Monetization.csproj - -src/UniTask/UnityEngine.TestRunner.csproj - -src/UniTask/UnityEngine.UI.csproj - -src/UniTask/TempAsm.csproj - -src/UniTask/UniTask.Addressables.csproj - -src/UniTask/UniTask.DOTween.csproj - -src/UniTask/UniTask.TextMeshPro.csproj - -src/UniTask/RuntimeUnitTestToolkit.Player.csproj - -src/UniTask/TempAsm.Player.csproj - -src/UniTask/UniTask.Addressables.Player.csproj - -src/UniTask/UniTask.DOTween.Player.csproj - -src/UniTask/UniTask.Linq.Player.csproj - -src/UniTask/UniTask.Player.csproj - -src/UniTask/UniTask.Tests.Player.csproj - -src/UniTask/UniTask.TextMeshPro.Player.csproj - -src/UniTask/Unity.Addressables.Player.csproj - -src/UniTask/Unity.Analytics.DataPrivacy.Player.csproj - -src/UniTask/Unity.ResourceManager.Player.csproj - -src/UniTask/Unity.ScriptableBuildPipeline.Player.csproj - -src/UniTask/Unity.TextMeshPro.Player.csproj - -src/UniTask/Unity.Timeline.Player.csproj - -src/UniTask/UnityEngine.Advertisements.Player.csproj - -src/UniTask/UnityEngine.Monetization.Player.csproj - -src/UniTask/UnityEngine.TestRunner.Player.csproj - -src/UniTask/UnityEngine.UI.Player.csproj - -src/UniTask/DOTween.Modules.Player.csproj - -src/UniTask/Assembly-CSharp.Player.csproj - -src/UniTask/Unity.EditorCoroutines.Editor.csproj - -src/UniTask/.vsconfig - -src/UniTask/Logs/ApiUpdaterCheck.txt - -src/UniTask/Assembly-CSharp-firstpass.csproj +src/UniTask/*.csproj +.vsconfig From 4c0b1f753a038ed5334292b90bd380b964222986 Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 24 Jul 2024 20:11:26 +0900 Subject: [PATCH 07/15] chore: bump UniTask unity version to 2022.3.39f1 --- .../Tests/Resources/sample_texture.png.meta | 11 +- .../ProjectSettings/MemorySettings.asset | 35 + .../ProjectSettings/ProjectSettings.asset | 87 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../UserSettings/Layouts/default-2022.dwlt | 1159 +++++++++++++++++ src/UniTask/UserSettings/Search.settings | 1 + 6 files changed, 1255 insertions(+), 42 deletions(-) create mode 100644 src/UniTask/ProjectSettings/MemorySettings.asset create mode 100644 src/UniTask/UserSettings/Layouts/default-2022.dwlt create mode 100644 src/UniTask/UserSettings/Search.settings diff --git a/src/UniTask/Assets/Tests/Resources/sample_texture.png.meta b/src/UniTask/Assets/Tests/Resources/sample_texture.png.meta index 15a1de5..85d79c7 100644 --- a/src/UniTask/Assets/Tests/Resources/sample_texture.png.meta +++ b/src/UniTask/Assets/Tests/Resources/sample_texture.png.meta @@ -12,7 +12,7 @@ TextureImporter: 213: 1950921086533113773 second: sample_texture_2 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -86,6 +86,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -98,6 +99,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -110,6 +112,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -122,6 +125,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -200,7 +204,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + sample_texture_0: -2664112245596591751 + sample_texture_1: -4606777057269188692 + sample_texture_2: 1950921086533113773 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/src/UniTask/ProjectSettings/MemorySettings.asset b/src/UniTask/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/src/UniTask/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/src/UniTask/ProjectSettings/ProjectSettings.asset b/src/UniTask/ProjectSettings/ProjectSettings.asset index b2e8c6d..9249c95 100644 --- a/src/UniTask/ProjectSettings/ProjectSettings.asset +++ b/src/UniTask/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: 904cd7a3163037f42a9204c0e2f2b7bd AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -111,10 +113,14 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -129,31 +135,6 @@ PlayerSettings: xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -165,8 +146,12 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.Company.ProductName - buildNumber: {} + Standalone: com.DefaultCompany.UniTask + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 @@ -183,10 +168,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 10.0 + iOSTargetOSVersionString: 11.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 10.0 + tvOSTargetOSVersionString: 11.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -220,8 +205,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -229,6 +214,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -238,9 +224,17 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 5f34be1353de5cf4398729fda238591b templatePackageId: com.unity.template.2d@3.1.0 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -258,6 +252,9 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 100 m_BuildTargetIcons: [] @@ -299,6 +296,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -310,6 +310,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -319,12 +320,14 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -449,6 +452,7 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -475,6 +479,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -517,6 +522,8 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -536,10 +543,12 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: Android: 1 @@ -547,7 +556,11 @@ PlayerSettings: il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 @@ -609,10 +622,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -627,11 +637,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 1 + virtualTexturingSupportEnabled: 0 diff --git a/src/UniTask/ProjectSettings/ProjectVersion.txt b/src/UniTask/ProjectSettings/ProjectVersion.txt index a328ffd..32f4211 100644 --- a/src/UniTask/ProjectSettings/ProjectVersion.txt +++ b/src/UniTask/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.1f1 -m_EditorVersionWithRevision: 2020.2.1f1 (270dd8c3da1c) +m_EditorVersion: 2022.3.39f1 +m_EditorVersionWithRevision: 2022.3.39f1 (4e1b0f82c39a) diff --git a/src/UniTask/UserSettings/Layouts/default-2022.dwlt b/src/UniTask/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 0000000..780a99d --- /dev/null +++ b/src/UniTask/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,1159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 2561 + y: 51 + width: 2558 + height: 2068 + m_ShowMode: 4 + m_Title: Hierarchy + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 0 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 2558 + height: 2018 + m_MinSize: {x: 300, y: 150} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 16 + draggingID: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 2039 + y: 0 + width: 519 + height: 2018 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 504 + height: 1222 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 1222 + width: 2039 + height: 796 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 13} + - {fileID: 18} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2558 + height: 2068 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2558 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 2048 + width: 2558 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2039 + height: 2018 + m_MinSize: {x: 200, y: 150} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 17 + draggingID: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2039 + height: 1222 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 18 + draggingID: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 504 + y: 0 + width: 1535 + height: 1222 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + - {fileID: 17} + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 2048, y: 2048} + m_TitleContent: + m_Text: Asset Store + m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 468 + y: 181 + width: 973 + height: 501 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: -579 + width: 2040 + height: 495 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scripts + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\github\guitarrapc\UnityBuildRunner\sandbox\Sandbox.Unity.IL2CPPDedicatedServer + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 34410000 + m_LastClickedID: 16692 + m_ExpandedIDs: 00000000fc050000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000fc050000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: d2f9ffff + m_LastClickedInstanceID: -1582 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 5} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 115 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 4600 + y: 81 + width: 518 + height: 1997 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2561 + y: 81 + width: 503 + height: 1201 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 3c81ffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 4} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 9cd41dc2b8a57c34ba3edd8954600b03 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 3065 + y: 81 + width: 1533 + height: 1201 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -166, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: AINavigationOverlay + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: edf114ae586a7f9408ceaf204f10ef7f + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 0, y: 0, z: 0} + speed: 2 + m_Value: {x: 0, y: 0, z: 0} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 10 + speed: 2 + m_Value: 10 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.01 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 510 + y: 81 + width: 1524 + height: 760 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1524, y: 739} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -762 + m_HBaseRangeMax: 762 + m_VBaseRangeMin: -369.5 + m_VBaseRangeMax: 369.5 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1524 + height: 739 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 762, y: 369.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -762 + y: -369.5 + width: 1524 + height: 739 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1524, y: 760} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2561 + y: 1303 + width: 2038 + height: 775 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/src/UniTask/UserSettings/Search.settings b/src/UniTask/UserSettings/Search.settings new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/src/UniTask/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file From d248acc7d1a169f58ae91a4821d1c188f480738d Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Tue, 30 Jul 2024 12:34:42 +0900 Subject: [PATCH 08/15] chore: bump RuntimeUnitTestToolkit to 2.6.0 to adapt Unity 2022 Build API change --- .../Assets/RuntimeUnitTestToolkit.meta | 2 +- .../Assets/RuntimeUnitTestToolkit/Editor.meta | 8 - .../Editor/HierarchyTreeBuilder.cs | 133 ---- .../Editor/HierarchyTreeBuilder.cs.meta | 11 - .../Editor/UnitTestBuilder.MenuItems.cs | 345 --------- .../Editor/UnitTestBuilder.MenuItems.cs.meta | 11 - .../Editor/UnitTestBuilder.cs | 546 -------------- .../Editor/UnitTestBuilder.cs.meta | 12 - .../RuntimeUnitTestToolkit.asmdef | 16 - .../RuntimeUnitTestToolkit.asmdef.meta | 7 - .../RuntimeUnitTestToolkit/UnitTestRunner.cs | 684 ------------------ .../UnitTestRunner.cs.meta | 12 - .../RuntimeUnitTestToolkit/package.json | 11 - .../RuntimeUnitTestToolkit/package.json.meta | 7 - .../ProjectSettings/ProjectSettings.asset | 121 +++- .../SceneTemplateSettings.json | 121 ++++ .../UnityConnectSettings.asset | 2 + .../UserSettings/EditorUserSettings.asset | 11 + .../UserSettings/Layouts/default-2022.dwlt | 130 ++-- src/UniTask/UserSettings/Search.index | 13 + src/UniTask/UserSettings/Search.settings | 77 +- 21 files changed, 390 insertions(+), 1890 deletions(-) delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor.meta delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs.meta delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs.meta delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs.meta delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/RuntimeUnitTestToolkit.asmdef delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/RuntimeUnitTestToolkit.asmdef.meta delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/UnitTestRunner.cs delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/UnitTestRunner.cs.meta delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/package.json delete mode 100644 src/UniTask/Assets/RuntimeUnitTestToolkit/package.json.meta create mode 100644 src/UniTask/ProjectSettings/SceneTemplateSettings.json create mode 100644 src/UniTask/UserSettings/Search.index diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit.meta b/src/UniTask/Assets/RuntimeUnitTestToolkit.meta index aa095c6..57a67c2 100644 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit.meta +++ b/src/UniTask/Assets/RuntimeUnitTestToolkit.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 894f21dfce4e82343a91661e1ec1a455 +guid: e4b0aeec701d65e4bbe4f099da74eafc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor.meta b/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor.meta deleted file mode 100644 index 903f676..0000000 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 959c1472a5d812843bedf9341e87af3b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs b/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs deleted file mode 100644 index 9a2adc2..0000000 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs +++ /dev/null @@ -1,133 +0,0 @@ -#if UNITY_EDITOR - -using System; -using UnityEngine; - -namespace RuntimeUnitTestToolkit.Editor -{ - // functional declarative construction like flutter. - - internal interface IBuilder - { - GameObject GameObject { get; } - T GetComponent(); - } - - internal class Builder : IBuilder - where T : Component - { - public T Component1 { get; private set; } - public GameObject GameObject { get; private set; } - - public Transform Transform { get { return GameObject.transform; } } - public RectTransform RectTransform { get { return GameObject.GetComponent(); } } - - public Action SetTarget - { - set - { - value(this.GameObject); - } - } - - - public IBuilder Child - { - set - { - value.GameObject.transform.SetParent(GameObject.transform); - } - } - - public IBuilder[] Children - { - set - { - foreach (var item in value) - { - item.GameObject.transform.SetParent(GameObject.transform); - } - } - } - - public Builder(string name) - { - this.GameObject = new GameObject(name); - this.Component1 = GameObject.AddComponent(); - } - - public Builder(string name, out T referenceSelf) // out primary reference. - { - this.GameObject = new GameObject(name); - this.Component1 = GameObject.AddComponent(); - referenceSelf = this.Component1; - } - - public TComponent GetComponent() - { - return this.GameObject.GetComponent(); - } - } - - internal class Builder : Builder - where T1 : Component - where T2 : Component - { - public T2 Component2 { get; private set; } - - public Builder(string name) - : base(name) - { - this.Component2 = GameObject.AddComponent(); - } - - public Builder(string name, out T1 referenceSelf) - : base(name, out referenceSelf) - { - this.Component2 = GameObject.AddComponent(); - } - } - - internal class Builder : Builder - where T1 : Component - where T2 : Component - where T3 : Component - { - public T3 Component3 { get; private set; } - - public Builder(string name) - : base(name) - { - this.Component3 = GameObject.AddComponent(); - } - - public Builder(string name, out T1 referenceSelf) - : base(name, out referenceSelf) - { - this.Component3 = GameObject.AddComponent(); - } - } - - internal class Builder : Builder - where T1 : Component - where T2 : Component - where T3 : Component - where T4 : Component - { - public T4 Component4 { get; private set; } - - public Builder(string name) - : base(name) - { - this.Component4 = GameObject.AddComponent(); - } - - public Builder(string name, out T1 referenceSelf) - : base(name, out referenceSelf) - { - this.Component4 = GameObject.AddComponent(); - } - } -} - -#endif \ No newline at end of file diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs.meta b/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs.meta deleted file mode 100644 index 82c8e9b..0000000 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/HierarchyTreeBuilder.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8760bbbab905a534eb6fb7b61b736926 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs b/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs deleted file mode 100644 index 94508b5..0000000 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs +++ /dev/null @@ -1,345 +0,0 @@ -#if UNITY_EDITOR -using UnityEditor; - -// Settings MenuItems. - -public static partial class UnitTestBuilder -{ - [MenuItem("Test/Settings/ScriptBackend/Mono", validate = true, priority = 1)] - static bool ValidateScriptBackendMono() - { - Menu.SetChecked("Test/Settings/ScriptBackend/Mono", LoadOrGetDefaultSettings().ScriptBackend == ScriptingImplementation.Mono2x); - return true; - } - - [MenuItem("Test/Settings/ScriptBackend/Mono", validate = false, priority = 1)] - static void ScriptBackendMono() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentScriptBackend = false; - settings.ScriptBackend = ScriptingImplementation.Mono2x; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/ScriptBackend/IL2CPP", validate = true, priority = 2)] - static bool ValidateScriptBackendIL2CPP() - { - Menu.SetChecked("Test/Settings/ScriptBackend/IL2CPP", LoadOrGetDefaultSettings().ScriptBackend == ScriptingImplementation.IL2CPP); - return true; - } - - [MenuItem("Test/Settings/ScriptBackend/IL2CPP", validate = false, priority = 2)] - static void ScriptBackendIL2CPP() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentScriptBackend = false; - settings.ScriptBackend = ScriptingImplementation.IL2CPP; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/AutoRunPlayer", validate = true, priority = 3)] - static bool ValidateAutoRun() - { - Menu.SetChecked("Test/Settings/AutoRunPlayer", LoadOrGetDefaultSettings().AutoRunPlayer); - return true; - } - - [MenuItem("Test/Settings/AutoRunPlayer", validate = false, priority = 3)] - static void AutoRun() - { - var settings = LoadOrGetDefaultSettings(); - settings.AutoRunPlayer = !settings.AutoRunPlayer; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/Headless", validate = true, priority = 4)] - static bool ValidateHeadless() - { - Menu.SetChecked("Test/Settings/Headless", LoadOrGetDefaultSettings().Headless); - return true; - } - - [MenuItem("Test/Settings/Headless", validate = false, priority = 4)] - static void Headless() - { - var settings = LoadOrGetDefaultSettings(); - settings.Headless = !settings.Headless; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/DisableAutoClose", validate = true, priority = 5)] - static bool ValidateDisableAutoClose() - { - Menu.SetChecked("Test/Settings/DisableAutoClose", LoadOrGetDefaultSettings().DisableAutoClose); - return true; - } - - [MenuItem("Test/Settings/DisableAutoClose", validate = false, priority = 5)] - static void DisableAutoClose() - { - var settings = LoadOrGetDefaultSettings(); - settings.DisableAutoClose = !settings.DisableAutoClose; - SaveSettings(settings); - } - - // generated - - /* - * - void Main() -{ -var sb = new StringBuilder(); - -var p = 1; -foreach (var target in Enum.GetNames(typeof(BuildTarget))) -{ - var path = $"Test/Settings/BuildTarget/{target}"; - var priority = p++; - - var template = $@" -[MenuItem(""{path}"", validate = true, priority = {priority})] -static bool ValidateBuildTarget{target}() -{{ -Menu.SetChecked(""{path}"", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.{target}); -return true; -}} - -[MenuItem(""{path}"", validate = false, priority = {priority})] -static void BuildTarget{target}() -{{ -var settings = LoadOrGetDefaultSettings(); -settings.UseCurrentBuildTarget = false; -settings.BuildTarget = BuildTarget.{target}; -SaveSettings(settings); -}}"; - - sb.AppendLine(template); -} - -sb.ToString().Dump(); -} - -public enum BuildTarget -{ -StandaloneWindows, -StandaloneWindows64, -StandaloneLinux, -StandaloneLinux64, -StandaloneOSX, -WebGL, -iOS, -Android, -WSAPlayer, -PS4, -XboxOne, -Switch, -} - */ - - - [MenuItem("Test/Settings/BuildTarget/StandaloneWindows", validate = true, priority = 1)] - static bool ValidateBuildTargetStandaloneWindows() - { - Menu.SetChecked("Test/Settings/BuildTarget/StandaloneWindows", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.StandaloneWindows); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneWindows", validate = false, priority = 1)] - static void BuildTargetStandaloneWindows() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.StandaloneWindows; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneWindows64", validate = true, priority = 2)] - static bool ValidateBuildTargetStandaloneWindows64() - { - Menu.SetChecked("Test/Settings/BuildTarget/StandaloneWindows64", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.StandaloneWindows64); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneWindows64", validate = false, priority = 2)] - static void BuildTargetStandaloneWindows64() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.StandaloneWindows64; - SaveSettings(settings); - } - -#if !UNITY_2019_2_OR_NEWER - - [MenuItem("Test/Settings/BuildTarget/StandaloneLinux", validate = true, priority = 3)] - static bool ValidateBuildTargetStandaloneLinux() - { - Menu.SetChecked("Test/Settings/BuildTarget/StandaloneLinux", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.StandaloneLinux); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneLinux", validate = false, priority = 3)] - static void BuildTargetStandaloneLinux() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.StandaloneLinux; - SaveSettings(settings); - } - -#endif - - [MenuItem("Test/Settings/BuildTarget/StandaloneLinux64", validate = true, priority = 4)] - static bool ValidateBuildTargetStandaloneLinux64() - { - Menu.SetChecked("Test/Settings/BuildTarget/StandaloneLinux64", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.StandaloneLinux64); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneLinux64", validate = false, priority = 4)] - static void BuildTargetStandaloneLinux64() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.StandaloneLinux64; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneOSX", validate = true, priority = 5)] - static bool ValidateBuildTargetStandaloneOSX() - { - Menu.SetChecked("Test/Settings/BuildTarget/StandaloneOSX", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.StandaloneOSX); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/StandaloneOSX", validate = false, priority = 5)] - static void BuildTargetStandaloneOSX() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.StandaloneOSX; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/WebGL", validate = true, priority = 6)] - static bool ValidateBuildTargetWebGL() - { - Menu.SetChecked("Test/Settings/BuildTarget/WebGL", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.WebGL); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/WebGL", validate = false, priority = 6)] - static void BuildTargetWebGL() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.WebGL; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/iOS", validate = true, priority = 7)] - static bool ValidateBuildTargetiOS() - { - Menu.SetChecked("Test/Settings/BuildTarget/iOS", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.iOS); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/iOS", validate = false, priority = 7)] - static void BuildTargetiOS() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.iOS; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/Android", validate = true, priority = 8)] - static bool ValidateBuildTargetAndroid() - { - Menu.SetChecked("Test/Settings/BuildTarget/Android", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.Android); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/Android", validate = false, priority = 8)] - static void BuildTargetAndroid() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.Android; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/WSAPlayer", validate = true, priority = 9)] - static bool ValidateBuildTargetWSAPlayer() - { - Menu.SetChecked("Test/Settings/BuildTarget/WSAPlayer", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.WSAPlayer); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/WSAPlayer", validate = false, priority = 9)] - static void BuildTargetWSAPlayer() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.WSAPlayer; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/PS4", validate = true, priority = 10)] - static bool ValidateBuildTargetPS4() - { - Menu.SetChecked("Test/Settings/BuildTarget/PS4", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.PS4); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/PS4", validate = false, priority = 10)] - static void BuildTargetPS4() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.PS4; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/XboxOne", validate = true, priority = 11)] - static bool ValidateBuildTargetXboxOne() - { - Menu.SetChecked("Test/Settings/BuildTarget/XboxOne", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.XboxOne); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/XboxOne", validate = false, priority = 11)] - static void BuildTargetXboxOne() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.XboxOne; - SaveSettings(settings); - } - - [MenuItem("Test/Settings/BuildTarget/Switch", validate = true, priority = 12)] - static bool ValidateBuildTargetSwitch() - { - Menu.SetChecked("Test/Settings/BuildTarget/Switch", LoadOrGetDefaultSettings().BuildTarget == BuildTarget.Switch); - return true; - } - - [MenuItem("Test/Settings/BuildTarget/Switch", validate = false, priority = 12)] - static void BuildTargetSwitch() - { - var settings = LoadOrGetDefaultSettings(); - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = BuildTarget.Switch; - SaveSettings(settings); - } - - - - - - - - -} - -#endif diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs.meta b/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs.meta deleted file mode 100644 index 7c99172..0000000 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.MenuItems.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 12bdad0556e999f4aa82da29415d361f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs b/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs deleted file mode 100644 index ca45d0b..0000000 --- a/src/UniTask/Assets/RuntimeUnitTestToolkit/Editor/UnitTestBuilder.cs +++ /dev/null @@ -1,546 +0,0 @@ -#if UNITY_EDITOR - -using RuntimeUnitTestToolkit; -using RuntimeUnitTestToolkit.Editor; -using System; -using UnityEditor; -using UnityEditor.Build.Reporting; -using UnityEditor.SceneManagement; -using UnityEngine; -using UnityEngine.EventSystems; -using UnityEngine.SceneManagement; -using UnityEngine.UI; - -internal class RuntimeUnitTestSettings -{ - public ScriptingImplementation ScriptBackend; - public bool UseCurrentScriptBackend; - public BuildTarget BuildTarget; - public bool UseCurrentBuildTarget; - - public bool Headless; - public bool AutoRunPlayer; - public bool DisableAutoClose; - - public RuntimeUnitTestSettings() - { - UseCurrentBuildTarget = true; - UseCurrentScriptBackend = true; - Headless = false; - AutoRunPlayer = true; - DisableAutoClose = false; - } - - public override string ToString() - { - return $"{ScriptBackend} {BuildTarget} Headless:{Headless} AutoRunPlayer:{AutoRunPlayer} DisableAutoClose:{DisableAutoClose}"; - } -} - -// no namespace(because invoke from commandline) -public static partial class UnitTestBuilder -{ - const string SettingsKeyBase = "RuntimeUnitTest.Settings."; - - [MenuItem("Test/BuildUnitTest")] - public static void BuildUnitTest() - { - var settings = new RuntimeUnitTestSettings(); // default - - string buildPath = null; - - if (Application.isBatchMode) // from commandline - { - settings.AutoRunPlayer = false; - settings.DisableAutoClose = false; - - var cmdArgs = Environment.GetCommandLineArgs(); - for (int i = 0; i < cmdArgs.Length; i++) - { - if (string.Equals(cmdArgs[i].Trim('-', '/'), "ScriptBackend", StringComparison.OrdinalIgnoreCase)) - { - settings.UseCurrentScriptBackend = false; - var str = cmdArgs[++i]; - if (str.StartsWith("mono", StringComparison.OrdinalIgnoreCase)) - { - settings.ScriptBackend = ScriptingImplementation.Mono2x; - } - else if (str.StartsWith("IL2CPP", StringComparison.OrdinalIgnoreCase)) - { - settings.ScriptBackend = ScriptingImplementation.IL2CPP; - } - else - { - settings.ScriptBackend = (ScriptingImplementation)Enum.Parse(typeof(ScriptingImplementation), str, true); - } - } - else if (string.Equals(cmdArgs[i].Trim('-', '/'), "BuildTarget", StringComparison.OrdinalIgnoreCase)) - { - settings.UseCurrentBuildTarget = false; - settings.BuildTarget = (BuildTarget)Enum.Parse(typeof(BuildTarget), cmdArgs[++i], true); - } - else if (string.Equals(cmdArgs[i].Trim('-', '/'), "Headless", StringComparison.OrdinalIgnoreCase)) - { - settings.Headless = true; - } - else if (string.Equals(cmdArgs[i].Trim('-', '/'), "buildPath", StringComparison.OrdinalIgnoreCase)) - { - buildPath = cmdArgs[++i]; - } - } - } - else - { - var key = SettingsKeyBase + Application.productName; - var settingsValue = EditorPrefs.GetString(key, null); - try - { - if (!string.IsNullOrWhiteSpace(settingsValue)) - { - settings = JsonUtility.FromJson(settingsValue); - } - } - catch - { - UnityEngine.Debug.LogError("Fail to load RuntimeUnitTest settings"); - EditorPrefs.SetString(key, null); - } - } - - if (settings.UseCurrentBuildTarget) - { - settings.BuildTarget = EditorUserBuildSettings.activeBuildTarget; - } - if (settings.UseCurrentScriptBackend) - { - settings.ScriptBackend = PlayerSettings.GetScriptingBackend(ToBuildTargetGroup(settings.BuildTarget)); - } - - if (buildPath == null) - { - buildPath = $"bin/UnitTest/{settings.BuildTarget}_{settings.ScriptBackend}/test" + GetExtensionForBuildTarget(settings.BuildTarget); - } - - var originalScene = SceneManager.GetActiveScene().path; - - BuildUnitTest(buildPath, settings.ScriptBackend, settings.BuildTarget, settings.Headless, settings.AutoRunPlayer, settings.DisableAutoClose); - - // reopen original scene - if (!string.IsNullOrWhiteSpace(originalScene)) - { - EditorSceneManager.OpenScene(originalScene, OpenSceneMode.Single); - } - else - { - EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects); - } - } - - - [MenuItem("Test/LoadUnitTestScene")] - public static void LoadUnitTestScene() - { - var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single); - BuildUnitTestRunnerScene(); - EditorSceneManager.MarkSceneDirty(scene); - } - - static RuntimeUnitTestSettings LoadOrGetDefaultSettings() - { - var key = SettingsKeyBase + Application.productName; - - var settingsValue = EditorPrefs.GetString(key, null); - RuntimeUnitTestSettings settings = null; - try - { - if (!string.IsNullOrWhiteSpace(settingsValue)) - { - settings = JsonUtility.FromJson(settingsValue); - } - } - catch - { - UnityEngine.Debug.LogError("Fail to load RuntimeUnitTest settings"); - EditorPrefs.SetString(key, null); - settings = null; - } - - if (settings == null) - { - // default - settings = new RuntimeUnitTestSettings - { - UseCurrentBuildTarget = true, - UseCurrentScriptBackend = true, - Headless = false, - AutoRunPlayer = true, - }; - } - - return settings; - } - - static void SaveSettings(RuntimeUnitTestSettings settings) - { - var key = SettingsKeyBase + Application.productName; - EditorPrefs.SetString(key, JsonUtility.ToJson(settings)); - } - - public static void BuildUnitTest(string buildPath, ScriptingImplementation scriptBackend, BuildTarget buildTarget, bool headless, bool autoRunPlayer, bool disableAutoClose) - { - var sceneName = "Assets/TempRuntimeUnitTestScene_" + DateTimeOffset.UtcNow.ToUnixTimeSeconds(); - if (disableAutoClose) - { - sceneName += "_DisableAutoClose"; - } - sceneName += ".unity"; - - var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single); - - BuildUnitTestRunnerScene(); - - EditorSceneManager.MarkSceneDirty(scene); - AssetDatabase.SaveAssets(); - EditorSceneManager.SaveScene(scene, sceneName, false); - try - { - Build(sceneName, buildPath, new RuntimeUnitTestSettings { ScriptBackend = scriptBackend, BuildTarget = buildTarget, Headless = headless, AutoRunPlayer = autoRunPlayer, DisableAutoClose = disableAutoClose }); - } - finally - { - AssetDatabase.DeleteAsset(sceneName); - } - } - - public static UnitTestRunner BuildUnitTestRunnerScene() - { - const string kStandardSpritePath = "UI/Skin/UISprite.psd"; - const string kBackgroundSpritePath = "UI/Skin/Background.psd"; - var uisprite = AssetDatabase.GetBuiltinExtraResource(kStandardSpritePath); - var background = AssetDatabase.GetBuiltinExtraResource(kBackgroundSpritePath); - - ScrollRect buttonList; - VerticalLayoutGroup listLayout; - Scrollbar refListScrollbar; - ScrollRect logList; - Scrollbar refLogScrollbar; - Button clearButton; - Text logText; - - // Flutter like coded build utility - - var rootObject = new Builder("SceneRoot") - { - Children = new IBuilder[] { - new Builder("EventSystem"), - new Builder("Canvas") { - Component1 = { renderMode = RenderMode.ScreenSpaceOverlay }, - Children = new IBuilder[] { - new Builder("HorizontalSplitter") { - RectTransform = { anchorMin = new Vector2(0, 0), anchorMax = new Vector2(1, 1) }, - Component1 = { childControlWidth = true, childControlHeight = true, spacing = 10 }, - Children = new IBuilder[] { - new Builder("ButtonList", out buttonList) { - RectTransform = { pivot = new Vector2(0.5f, 0.5f) }, - Component1 = { horizontal =false, vertical = true, movementType = ScrollRect.MovementType.Clamped }, - Children = new IBuilder[] { - new Builder("ListLayoutToAttach", out listLayout) { - RectTransform = { anchorMin = new Vector2(0, 0), anchorMax = new Vector2(1, 1), pivot = new Vector2(0, 1) }, - Component1 = { childControlWidth = true, childControlHeight = true, childForceExpandWidth = true, childForceExpandHeight = false, spacing = 10, padding = new RectOffset(10,20,10,10) }, - Component2 = { horizontalFit = ContentSizeFitter.FitMode.Unconstrained, verticalFit = ContentSizeFitter.FitMode.PreferredSize }, - SetTarget = self => { buttonList.content = self.GetComponent(); }, - Child = new Builder("ClearButton", out clearButton) { - Component2 = { sprite = uisprite, type = Image.Type.Sliced }, - Component3 = { minHeight = 50 }, - SetTarget = self => { self.GetComponent