From 60a4787574f6e6541693045173c4f33c4e2818ff Mon Sep 17 00:00:00 2001 From: Braedon Date: Mon, 17 Jan 2022 17:04:10 -0500 Subject: [PATCH] Switch newtonsoft package with official unity one --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 11 ++--------- ProjectSettings/PackageManagerSettings.asset | 6 ++++++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 8cb6ba189..d86d3bfe8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,11 +5,11 @@ "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.12", "com.unity.ide.vscode": "1.2.4", + "com.unity.nuget.newtonsoft-json": "2.0.2", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", - "jillejr.newtonsoft.json-for-unity": "13.0.102", "jillejr.newtonsoft.json-for-unity.converters": "1.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1f4e0fd28..a04e64b45 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -49,8 +49,8 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", - "depth": 1, + "version": "2.0.2", + "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -105,13 +105,6 @@ "com.unity.modules.imgui": "1.0.0" } }, - "jillejr.newtonsoft.json-for-unity": { - "version": "13.0.102", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity" - }, "jillejr.newtonsoft.json-for-unity.converters": { "version": "1.3.0", "depth": 0, diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index cc542455f..cacc37d9a 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,6 +12,9 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 oneTimeWarningShown: 0 m_Registries: @@ -20,12 +23,14 @@ MonoBehaviour: m_Url: https://packages.unity.com m_Scopes: [] m_IsDefault: 1 + m_Capabilities: 7 - m_Id: scoped:jilleJr m_Name: jilleJr m_Url: https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity m_Scopes: - jillejr.newtonsoft.json-for-unity m_IsDefault: 0 + m_Capabilities: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: @@ -37,6 +42,7 @@ MonoBehaviour: m_Scopes: - jillejr.newtonsoft.json-for-unity m_IsDefault: 0 + m_Capabilities: 0 m_Modified: 0 m_Name: jilleJr m_Url: https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity