From f5e43ddfc6bbf7d9eec46a3f49a5676690a97d01 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:06:05 +0900 Subject: [PATCH 1/8] Upgrade Unity to 2021.3.32f1 --- Packages/packages-lock.json | 42 ++++--- ProjectSettings/MemorySettings.asset | 35 ++++++ ProjectSettings/PackageManagerSettings.asset | 35 +++--- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/SceneTemplateSettings.json | 121 +++++++++++++++++++ ProjectSettings/boot.config | 0 6 files changed, 195 insertions(+), 42 deletions(-) create mode 100644 ProjectSettings/MemorySettings.asset create mode 100644 ProjectSettings/SceneTemplateSettings.json create mode 100644 ProjectSettings/boot.config diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d423236..12ba0ae 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -62,11 +62,11 @@ "url": "https://package.openupm.com" }, "com.unity.addressables": { - "version": "1.17.15", + "version": "1.19.19", "depth": 1, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.17.0", + "com.unity.scriptablebuildpipeline": "1.19.6", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -76,7 +76,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.14.18", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -126,33 +126,26 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.17.0", + "version": "1.20.1", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "1.0.1", + "version": "1.0.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.subsystemregistration": { - "version": "1.0.6", - "depth": 2, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { "version": "1.4.5", "depth": 0, @@ -192,7 +185,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "2.1.6", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -201,7 +194,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.2.18", + "version": "1.6.5", "depth": 0, "source": "registry", "dependencies": { @@ -222,7 +215,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.9", + "version": "2.1.10", "depth": 1, "source": "registry", "dependencies": { @@ -232,15 +225,14 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.0.5", + "version": "4.4.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7", - "com.unity.subsystemregistration": "1.0.6" + "com.unity.xr.legacyinputhelpers": "2.1.7" }, "url": "https://packages.unity.com" }, @@ -384,6 +376,18 @@ "depth": 0, "source": "builtin", "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/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/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index abe1834..94055bd 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,7 +12,11 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 oneTimeWarningShown: 0 m_Registries: - m_Id: main @@ -20,7 +24,9 @@ MonoBehaviour: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 - - m_Id: scoped:package.openupm.com + m_Capabilities: 7 + m_ConfigSource: 0 + - m_Id: scoped:project:package.openupm.com m_Name: package.openupm.com m_Url: https://package.openupm.com m_Scopes: @@ -29,26 +35,13 @@ MonoBehaviour: - com.openupm - net.tnrd.nsubstitute m_IsDefault: 0 - m_UserSelectedRegistryName: + m_Capabilities: 0 + m_ConfigSource: 4 + m_UserSelectedRegistryName: package.openupm.com m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: scoped:package.openupm.com - m_Name: package.openupm.com - m_Url: https://package.openupm.com - m_Scopes: - - com.cysharp - - com.nowsprinting - - com.openupm - - net.tnrd.nsubstitute - m_IsDefault: 0 m_Modified: 0 - m_Name: package.openupm.com - m_Url: https://package.openupm.com - m_Scopes: - - com.cysharp - - com.nowsprinting - - com.openupm - - net.tnrd.nsubstitute - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -824 + m_OriginalInstanceId: -828 + m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4c19129..265377b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.40f1 -m_EditorVersionWithRevision: 2019.4.40f1 (ffc62b691db5) +m_EditorVersion: 2021.3.32f1 +m_EditorVersionWithRevision: 2021.3.32f1 (3b9dae9532f5) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..5e97f83 --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29 From c9dbf8d84454dd169245982791d23a6362f23a04 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:13:47 +0900 Subject: [PATCH 2/8] Remove net.tnrd.nsubstitute --- Packages/manifest.json | 5 +---- Packages/packages-lock.json | 7 ------- ProjectSettings/PackageManagerSettings.asset | 5 ++--- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index fe6f177..02b235a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -17,7 +17,6 @@ "com.unity.textmeshpro": "2.1.6", "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", - "net.tnrd.nsubstitute": "4.2.2", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -59,9 +58,7 @@ "url": "https://package.openupm.com", "scopes": [ "com.cysharp", - "com.nowsprinting", - "com.openupm", - "net.tnrd.nsubstitute" + "com.nowsprinting" ] } ] diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 12ba0ae..58d4784 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -236,13 +236,6 @@ }, "url": "https://packages.unity.com" }, - "net.tnrd.nsubstitute": { - "version": "4.2.2", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://package.openupm.com" - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 94055bd..71f76b9 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -33,7 +33,6 @@ MonoBehaviour: - com.cysharp - com.nowsprinting - com.openupm - - net.tnrd.nsubstitute m_IsDefault: 0 m_Capabilities: 0 m_ConfigSource: 4 @@ -42,6 +41,6 @@ MonoBehaviour: m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -824 - m_OriginalInstanceId: -828 + m_UserModificationsInstanceId: -822 + m_OriginalInstanceId: -826 m_LoadAssets: 0 From 947232b9164a6be66814639e463d8743cfa23b79 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:22:01 +0900 Subject: [PATCH 3/8] Add UnityNuGet into scoped registries --- Packages/manifest.json | 7 + ProjectSettings/PackageManagerSettings.asset | 13 +- ProjectSettings/ProjectSettings.asset | 142 ++++++++++--------- 3 files changed, 89 insertions(+), 73 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 02b235a..33d42ab 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -60,6 +60,13 @@ "com.cysharp", "com.nowsprinting" ] + }, + { + "name": "Unity NuGet", + "url": "https://unitynuget-registry.azurewebsites.net", + "scopes": [ + "org.nuget" + ] } ] } diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 71f76b9..627cd87 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_EnablePreReleasePackages: 0 m_EnablePackageDependencies: 0 - m_AdvancedSettingsExpanded: 1 + m_AdvancedSettingsExpanded: 0 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 oneTimeWarningShown: 0 @@ -32,11 +32,18 @@ MonoBehaviour: m_Scopes: - com.cysharp - com.nowsprinting - - com.openupm m_IsDefault: 0 m_Capabilities: 0 m_ConfigSource: 4 - m_UserSelectedRegistryName: package.openupm.com + - m_Id: scoped:project:Unity NuGet + m_Name: Unity NuGet + m_Url: https://unitynuget-registry.azurewebsites.net + m_Scopes: + - org.nuget + m_IsDefault: 0 + m_Capabilities: 0 + m_ConfigSource: 4 + m_UserSelectedRegistryName: Unity NuGet m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 549aad2..00f3ea9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 24 productGUID: eeb1292a9986c499482f6a8edf2437d0 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,7 +48,10 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -119,11 +122,14 @@ PlayerSettings: switchNVNOtherPoolsGranularity: 16777216 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -138,48 +144,27 @@ 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 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.UnityTestExamples buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: nimt-trampolines=1024 @@ -194,10 +179,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -231,10 +216,11 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -250,9 +236,17 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 @@ -272,6 +266,9 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] @@ -292,6 +289,7 @@ PlayerSettings: - m_BuildTarget: WebGL m_StaticBatching: 0 m_DynamicBatching: 0 + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -327,7 +325,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -343,6 +341,8 @@ PlayerSettings: m_Devices: - Oculus - OpenVR + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -353,6 +353,8 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -362,12 +364,16 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -443,7 +449,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -485,6 +490,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -495,7 +501,8 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -575,32 +582,6 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 - ps5ParamFilePath: - ps5VideoOutPixelFormat: 0 - ps5VideoOutInitialWidth: 1920 - ps5VideoOutOutputMode: 1 - ps5BackgroundImagePath: - ps5StartupImagePath: - ps5Pic2Path: - ps5StartupImagesFolder: - ps5IconImagesFolder: - ps5SaveDataImagePath: - ps5SdkOverride: - ps5BGMPath: - ps5ShareOverlayImagePath: - ps5NPConfigZipPath: - ps5Passcode: I5ZuGXbEWRK5RhRXdCdG5nG5azdNMK66 - ps5UseResolutionFallback: 0 - ps5UseAudio3dBackend: 0 - ps5ScriptOptimizationLevel: 2 - ps5Audio3dVirtualSpeakerCount: 14 - ps5VrrSupport: 0 - ps5UpdateReferencePackage: - ps5disableAutoHideSplash: 0 - ps5OperatingSystemCanDisableSplashScreen: 0 - ps5IncludedModules: [] - ps5SharedBinaryContentLabels: [] - ps5SharedBinarySystemFolders: [] monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} @@ -617,21 +598,40 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 - webGLWasmStreaming: 0 + webGLDecompressionFallback: 0 + webGLPowerPreference: 2 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Standalone: 1 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 - assemblyVersionValidation: 1 + assemblyVersionValidation: 0 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -663,6 +663,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -690,10 +691,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -708,11 +706,15 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 2 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 1 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 + virtualTexturingSupportEnabled: 0 From a2586ed4493248ae481a28ddad451eb55c2b0b84 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:28:37 +0900 Subject: [PATCH 4/8] Install NSubstitute v5.1.0 --- .../Runtime/TestDoubleExample.Tests.asmdef | 10 ++-- Packages/manifest.json | 1 + Packages/packages-lock.json | 59 +++++++++++++++++++ 3 files changed, 64 insertions(+), 6 deletions(-) diff --git a/Assets/TestDoubleExample/Tests/Runtime/TestDoubleExample.Tests.asmdef b/Assets/TestDoubleExample/Tests/Runtime/TestDoubleExample.Tests.asmdef index 2ba2425..0b6d004 100644 --- a/Assets/TestDoubleExample/Tests/Runtime/TestDoubleExample.Tests.asmdef +++ b/Assets/TestDoubleExample/Tests/Runtime/TestDoubleExample.Tests.asmdef @@ -11,15 +11,13 @@ "allowUnsafeCode": false, "overrideReferences": true, "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "Castle.Core.dll", - "System.Threading.Tasks.Extensions.dll" + "nunit.framework.dll", + "NSubstitute.dll" ], "autoReferenced": false, "defineConstraints": [ - "UNITY_INCLUDE_TESTS", - "UNITY_EDITOR" + "UNITY_INCLUDE_TESTS", + "UNITY_EDITOR" ], "versionDefines": [], "noEngineReferences": false diff --git a/Packages/manifest.json b/Packages/manifest.json index 33d42ab..c9e9730 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -17,6 +17,7 @@ "com.unity.textmeshpro": "2.1.6", "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", + "org.nuget.nsubstitute": "5.1.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 58d4784..e95b702 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -236,6 +236,65 @@ }, "url": "https://packages.unity.com" }, + "org.nuget.castle.core": { + "version": "5.1.1", + "depth": 1, + "source": "registry", + "dependencies": { + "org.nuget.system.diagnostics.eventlog": "4.7.0", + "org.nuget.system.reflection.emit": "4.7.0" + }, + "url": "https://unitynuget-registry.azurewebsites.net" + }, + "org.nuget.nsubstitute": { + "version": "5.1.0", + "depth": 0, + "source": "registry", + "dependencies": { + "org.nuget.castle.core": "5.1.1", + "org.nuget.system.threading.tasks.extensions": "4.4.0" + }, + "url": "https://unitynuget-registry.azurewebsites.net" + }, + "org.nuget.system.diagnostics.eventlog": { + "version": "4.7.0", + "depth": 2, + "source": "registry", + "dependencies": { + "org.nuget.system.security.principal.windows": "4.7.0" + }, + "url": "https://unitynuget-registry.azurewebsites.net" + }, + "org.nuget.system.reflection.emit": { + "version": "4.7.0", + "depth": 2, + "source": "registry", + "dependencies": { + "org.nuget.system.reflection.emit.ilgeneration": "4.7.0" + }, + "url": "https://unitynuget-registry.azurewebsites.net" + }, + "org.nuget.system.reflection.emit.ilgeneration": { + "version": "4.7.0", + "depth": 3, + "source": "registry", + "dependencies": {}, + "url": "https://unitynuget-registry.azurewebsites.net" + }, + "org.nuget.system.security.principal.windows": { + "version": "4.7.0", + "depth": 3, + "source": "registry", + "dependencies": {}, + "url": "https://unitynuget-registry.azurewebsites.net" + }, + "org.nuget.system.threading.tasks.extensions": { + "version": "4.4.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://unitynuget-registry.azurewebsites.net" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, From b8a6ecc8a0617736e4178bd5423b13441978d97e Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:30:15 +0900 Subject: [PATCH 5/8] Install NSubstitute.Analyzers.CSharp v1.0.16 --- Packages/manifest.json | 1 + Packages/packages-lock.json | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Packages/manifest.json b/Packages/manifest.json index c9e9730..26a2983 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -18,6 +18,7 @@ "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", "org.nuget.nsubstitute": "5.1.0", + "org.nuget.nsubstitute.analyzers.csharp": "1.0.16", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e95b702..7b29aa1 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -256,6 +256,13 @@ }, "url": "https://unitynuget-registry.azurewebsites.net" }, + "org.nuget.nsubstitute.analyzers.csharp": { + "version": "1.0.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://unitynuget-registry.azurewebsites.net" + }, "org.nuget.system.diagnostics.eventlog": { "version": "4.7.0", "depth": 2, From 21b282f67b4ebeecf78110e3fa7f88ff9d024aa0 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:32:26 +0900 Subject: [PATCH 6/8] Install NUnit Analyzers v3.3.0 --- Packages/manifest.json | 1 + Packages/packages-lock.json | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Packages/manifest.json b/Packages/manifest.json index 26a2983..e94e2aa 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -19,6 +19,7 @@ "com.unity.ugui": "1.0.0", "org.nuget.nsubstitute": "5.1.0", "org.nuget.nsubstitute.analyzers.csharp": "1.0.16", + "org.nuget.nunit.analyzers": "3.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7b29aa1..daab7ea 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -263,6 +263,13 @@ "dependencies": {}, "url": "https://unitynuget-registry.azurewebsites.net" }, + "org.nuget.nunit.analyzers": { + "version": "3.3.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://unitynuget-registry.azurewebsites.net" + }, "org.nuget.system.diagnostics.eventlog": { "version": "4.7.0", "depth": 2, From 3e59a73066f41c0554dba2deb38123a33b4a8cd8 Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 05:33:57 +0900 Subject: [PATCH 7/8] Install IDisposableAnalyzers v4.0.7 --- Packages/manifest.json | 1 + Packages/packages-lock.json | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Packages/manifest.json b/Packages/manifest.json index e94e2aa..740daa8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -17,6 +17,7 @@ "com.unity.textmeshpro": "2.1.6", "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", + "org.nuget.idisposableanalyzers": "4.0.7", "org.nuget.nsubstitute": "5.1.0", "org.nuget.nsubstitute.analyzers.csharp": "1.0.16", "org.nuget.nunit.analyzers": "3.3.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index daab7ea..4314176 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -246,6 +246,13 @@ }, "url": "https://unitynuget-registry.azurewebsites.net" }, + "org.nuget.idisposableanalyzers": { + "version": "4.0.7", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://unitynuget-registry.azurewebsites.net" + }, "org.nuget.nsubstitute": { "version": "5.1.0", "depth": 0, From 895d9d0c939c6740f93154d2ad4458f7c5f2107d Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sun, 12 Nov 2023 06:18:29 +0900 Subject: [PATCH 8/8] Fix Unity versions running tests on CI --- .github/workflows/test-integration.yml | 2 -- .github/workflows/test.yml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 0209cde..5a70ca9 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -34,8 +34,6 @@ jobs: fail-fast: false matrix: unityVersion: # Available versions see: https://game.ci/docs/docker/versions - - 2019.4.40f1 - - 2020.3.48f1 - 2021.3.42f1 - 2022.3.42f1 - 2023.2.20f1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index de09cee..ff677f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,14 +35,12 @@ jobs: fail-fast: false matrix: unityVersion: # Available versions see: https://game.ci/docs/docker/versions - - 2019.4.40f1 - - 2020.3.48f1 - 2021.3.42f1 - 2022.3.42f1 - 2023.2.20f1 - 6000.0.22f1 include: - - unityVersion: 2019.4.40f1 + - unityVersion: 2021.3.42f1 octocov: true steps: