From 4633bb8665455dbe293761b13e40077cd10a8614 Mon Sep 17 00:00:00 2001 From: sin Date: Fri, 6 Dec 2024 20:09:33 +0900 Subject: [PATCH 1/4] gitignore: ignore UserSettings --- .gitignore | 1 + WebRTC~/UserSettings/EditorUserSettings.asset | 21 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 WebRTC~/UserSettings/EditorUserSettings.asset diff --git a/.gitignore b/.gitignore index 5f015ee8c..8842b1deb 100644 --- a/.gitignore +++ b/.gitignore @@ -359,6 +359,7 @@ Plugin~/WebRTCPluginTest/webrtc-test.xcodeproj/* [Tt]emp/ [Oo]bj/ [Bb]uild/ +[Uu]serSettings/ # Exclude Documentation folder !Documentation~ diff --git a/WebRTC~/UserSettings/EditorUserSettings.asset b/WebRTC~/UserSettings/EditorUserSettings.asset deleted file mode 100644 index d2ce6fb40..000000000 --- a/WebRTC~/UserSettings/EditorUserSettings.asset +++ /dev/null @@ -1,21 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!162 &1 -EditorUserSettings: - m_ObjectHideFlags: 0 - serializedVersion: 4 - m_ConfigSettings: - vcSharedLogLevel: - value: 0d5e400f0650 - flags: 0 - m_VCAutomaticAdd: 1 - m_VCDebugCom: 0 - m_VCDebugCmd: 0 - m_VCDebugOut: 0 - m_SemanticMergeMode: 2 - m_VCShowFailedCheckout: 1 - m_VCOverwriteFailedCheckoutAssets: 1 - m_VCProjectOverlayIcons: 1 - m_VCHierarchyOverlayIcons: 1 - m_VCOtherOverlayIcons: 1 - m_VCAllowAsyncUpdate: 1 From c2d1cdd801a4426f78c1318d3f9a966cbe36649f Mon Sep 17 00:00:00 2001 From: sin Date: Fri, 6 Dec 2024 20:10:07 +0900 Subject: [PATCH 2/4] logs [skip ci] --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8842b1deb..5956a9e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -218,6 +218,7 @@ upm-ci~/ Plugin~/webrtc/* WebRTC~/CodeCoverage WebRTC~/TestResults-* +WebRTC~/Logs *.dbmdl *.dbproj.schemaview *.jfm From 5b8f452f56ac5aadec2a6aa4f662a2b2f28d7fdd Mon Sep 17 00:00:00 2001 From: sin Date: Fri, 6 Dec 2024 20:12:12 +0900 Subject: [PATCH 3/4] upgrade to 2021 and add DocTOols --- WebRTC~/Packages/manifest.json | 16 +- WebRTC~/Packages/packages-lock.json | 58 +++++- WebRTC~/ProjectSettings/MemorySettings.asset | 35 ++++ .../PackageManagerSettings.asset | 25 ++- .../Settings.json | 7 + WebRTC~/ProjectSettings/ProjectVersion.txt | 4 +- .../SceneTemplateSettings.json | 167 ++++++++++++++++++ WebRTC~/ProjectSettings/boot.config | 0 8 files changed, 297 insertions(+), 15 deletions(-) create mode 100644 WebRTC~/ProjectSettings/MemorySettings.asset create mode 100644 WebRTC~/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json create mode 100644 WebRTC~/ProjectSettings/SceneTemplateSettings.json create mode 100644 WebRTC~/ProjectSettings/boot.config diff --git a/WebRTC~/Packages/manifest.json b/WebRTC~/Packages/manifest.json index 108ed58bc..a239109b9 100644 --- a/WebRTC~/Packages/manifest.json +++ b/WebRTC~/Packages/manifest.json @@ -2,11 +2,12 @@ "dependencies": { "com.unity.editorcoroutines": "1.0.0", "com.unity.ext.nunit": "1.0.6", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.31", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", + "com.unity.package-manager-doctools": "3.6.2-preview", "com.unity.test-framework": "1.1.33", - "com.unity.testtools.codecoverage": "1.2.4", + "com.unity.testtools.codecoverage": "1.2.6", "com.unity.ugui": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.audio": "1.0.0", @@ -15,5 +16,14 @@ "com.unity.modules.screencapture": "1.0.0", "com.unity.modules.ui": "1.0.0", "com.unity.modules.uielements": "1.0.0" - } + }, + "scopedRegistries": [ + { + "name": "Internal Package Candidates", + "url": "https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-candidates", + "scopes": [ + "com.unity.package-manager-doctools" + ] + } + ] } diff --git a/WebRTC~/Packages/packages-lock.json b/WebRTC~/Packages/packages-lock.json index 0ab2e3fd6..796947f1f 100644 --- a/WebRTC~/Packages/packages-lock.json +++ b/WebRTC~/Packages/packages-lock.json @@ -15,7 +15,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.31", "depth": 0, "source": "registry", "dependencies": { @@ -39,8 +39,49 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.nuget.mono-cecil": { + "version": "1.10.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.package-manager-doctools": { + "version": "3.6.2-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.package-validation-suite": "0.73.0-preview", + "com.unity.nuget.newtonsoft-json": "2.0.2", + "com.unity.sharp-zip-lib": "1.3.8" + }, + "url": "https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-candidates" + }, + "com.unity.package-validation-suite": { + "version": "0.73.0-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.nuget.mono-cecil": "0.1.6-preview.2" + }, + "url": "https://packages.unity.com" + }, "com.unity.settings-manager": { - "version": "2.0.1", + "version": "1.0.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sharp-zip-lib": { + "version": "1.3.8", "depth": 1, "source": "registry", "dependencies": {}, @@ -58,7 +99,7 @@ "url": "https://packages.unity.com" }, "com.unity.testtools.codecoverage": { - "version": "1.2.4", + "version": "1.2.6", "depth": 0, "source": "registry", "dependencies": { @@ -134,6 +175,17 @@ "version": "1.0.0", "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", diff --git a/WebRTC~/ProjectSettings/MemorySettings.asset b/WebRTC~/ProjectSettings/MemorySettings.asset new file mode 100644 index 000000000..5b5faceca --- /dev/null +++ b/WebRTC~/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/WebRTC~/ProjectSettings/PackageManagerSettings.asset b/WebRTC~/ProjectSettings/PackageManagerSettings.asset index be4a7974e..bba5b6dcc 100644 --- a/WebRTC~/ProjectSettings/PackageManagerSettings.asset +++ b/WebRTC~/ProjectSettings/PackageManagerSettings.asset @@ -24,20 +24,31 @@ MonoBehaviour: m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 + m_ConfigSource: 0 + - m_Id: scoped:project:Internal Package Candidates + m_Name: Internal Package Candidates + m_Url: https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-candidates + m_Scopes: + - com.unity.package-manager-doctools + m_IsDefault: 0 + m_Capabilities: 0 + m_ConfigSource: 4 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_ErrorMessage: m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] + m_Id: scoped:project:Internal Package Candidates + m_Name: Internal Package Candidates + m_Url: https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-candidates + m_Scopes: + - com.unity.package-manager-doctools m_IsDefault: 0 m_Capabilities: 0 + m_ConfigSource: 4 m_Modified: 0 - m_Name: - m_Url: + m_Name: Internal Package Candidates + m_Url: https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-candidates m_Scopes: - - + - com.unity.package-manager-doctools m_SelectedScopeIndex: 0 diff --git a/WebRTC~/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/WebRTC~/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json new file mode 100644 index 000000000..ad11087f4 --- /dev/null +++ b/WebRTC~/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json @@ -0,0 +1,7 @@ +{ + "m_Name": "Settings", + "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json", + "m_Dictionary": { + "m_DictionaryValues": [] + } +} \ No newline at end of file diff --git a/WebRTC~/ProjectSettings/ProjectVersion.txt b/WebRTC~/ProjectSettings/ProjectVersion.txt index da76706d2..8386a0523 100644 --- a/WebRTC~/ProjectSettings/ProjectVersion.txt +++ b/WebRTC~/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.48f1 -m_EditorVersionWithRevision: 2020.3.48f1 (b805b124c6b7) +m_EditorVersion: 2021.3.45f1 +m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79) diff --git a/WebRTC~/ProjectSettings/SceneTemplateSettings.json b/WebRTC~/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 000000000..6f3e60fd8 --- /dev/null +++ b/WebRTC~/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/WebRTC~/ProjectSettings/boot.config b/WebRTC~/ProjectSettings/boot.config new file mode 100644 index 000000000..e69de29bb From 641b82b1eaa544ff72286413e6bc1947ff5c5850 Mon Sep 17 00:00:00 2001 From: sin Date: Fri, 6 Dec 2024 20:12:33 +0900 Subject: [PATCH 4/4] modify package.json [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e20af15a6..512b2f68e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "com.unity.webrtc", "displayName": "WebRTC", "version": "3.0.0-pre.7", - "unity": "2020.3", + "unity": "2021.3", "description": "The WebRTC package provides browsers and mobile applications with Real-Time Communications (RTC) capabilities.", "keywords": [ "webrtc",