diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/com.halodi.halodi-unity-package-creator.Newtonsoft.Json.dll b/Packages/halodi-unity-package-creator/ThirdParty/78E813DA.Newtonsoft.Json.dll similarity index 100% rename from Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/com.halodi.halodi-unity-package-creator.Newtonsoft.Json.dll rename to Packages/halodi-unity-package-creator/ThirdParty/78E813DA.Newtonsoft.Json.dll diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/com.halodi.halodi-unity-package-creator.Newtonsoft.Json.dll.meta b/Packages/halodi-unity-package-creator/ThirdParty/78E813DA.Newtonsoft.Json.dll.meta similarity index 100% rename from Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/com.halodi.halodi-unity-package-creator.Newtonsoft.Json.dll.meta rename to Packages/halodi-unity-package-creator/ThirdParty/78E813DA.Newtonsoft.Json.dll.meta diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/LICENSE.md b/Packages/halodi-unity-package-creator/ThirdParty/LICENSE.Newtonsoft.Json.md similarity index 100% rename from Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/LICENSE.md rename to Packages/halodi-unity-package-creator/ThirdParty/LICENSE.Newtonsoft.Json.md diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/LICENSE.md.meta b/Packages/halodi-unity-package-creator/ThirdParty/LICENSE.Newtonsoft.Json.md.meta similarity index 100% rename from Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/LICENSE.md.meta rename to Packages/halodi-unity-package-creator/ThirdParty/LICENSE.Newtonsoft.Json.md.meta diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json.meta b/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json.meta deleted file mode 100644 index 8ad4818..0000000 --- a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a8bb6d289111692598446382ad3715c9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/README.md b/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/README.md deleted file mode 100644 index 9d3514c..0000000 --- a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# ![Logo](Doc/icons/logo.jpg) Json.NET - -[![NuGet version (Newtonsoft.Json)](https://img.shields.io/nuget/v/Newtonsoft.Json.svg?style=flat-square)](https://www.nuget.org/packages/Newtonsoft.Json/) -[![Build status](https://dev.azure.com/jamesnk/Public/_apis/build/status/JamesNK.Newtonsoft.Json?branchName=master)](https://dev.azure.com/jamesnk/Public/_build/latest?definitionId=8) - -- [Homepage](https://www.newtonsoft.com/json) -- [Documentation](https://www.newtonsoft.com/json/help) -- [NuGet Package](https://www.nuget.org/packages/Newtonsoft.Json) -- [Release Notes](https://github.com/JamesNK/Newtonsoft.Json/releases) -- [Contributing Guidelines](CONTRIBUTING.md) -- [License](LICENSE.md) -- [Stack Overflow](https://stackoverflow.com/questions/tagged/json.net) diff --git a/Packages/halodi-unity-package-creator/ThirdParty/README.md b/Packages/halodi-unity-package-creator/ThirdParty/README.md new file mode 100644 index 0000000..09aeee9 --- /dev/null +++ b/Packages/halodi-unity-package-creator/ThirdParty/README.md @@ -0,0 +1,10 @@ +# Third party libraries + +To avoid conflicts between packages all third party managed DLL's are prefixed with "78E813DA", which is the CRC32 hash of "com.halodi.halodi-unity-package-creator". + +Due to the 260 character limit on windows paths, we avoid prefixing the DLL names with "com.halodi.halodi-unity-package-creator" + +## NewtonSoft JSON + +https://www.newtonsoft.com/json +License: MIT (see LICENSE.Newtonsoft.Json) diff --git a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/README.md.meta b/Packages/halodi-unity-package-creator/ThirdParty/README.md.meta similarity index 75% rename from Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/README.md.meta rename to Packages/halodi-unity-package-creator/ThirdParty/README.md.meta index 8d97bcf..9801618 100644 --- a/Packages/halodi-unity-package-creator/ThirdParty/Newtonsoft.Json/README.md.meta +++ b/Packages/halodi-unity-package-creator/ThirdParty/README.md.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 47b444b69d9d6e00d879edabeaf0bfef +guid: a5223f3f4fa4c6a5db413ccc8d56383b TextScriptImporter: externalObjects: {} userData: diff --git a/Packages/halodi-unity-package-creator/package.json b/Packages/halodi-unity-package-creator/package.json index fb0df48..69fbe46 100644 --- a/Packages/halodi-unity-package-creator/package.json +++ b/Packages/halodi-unity-package-creator/package.json @@ -1,6 +1,6 @@ { "name": "com.halodi.halodi-unity-package-creator", - "version": "0.2.3", + "version": "0.2.4", "displayName": "Halodi Unity Package Creator", "description": "Tools for creating, editing and publishing Unity packages", "unity": "2019.3", @@ -16,7 +16,7 @@ }, "keywords": [], "dependencies": { - "com.halodi.halodi-unity-package-registry-manager": "0.0.3" + "com.halodi.halodi-unity-package-registry-manager": "0.0.4" }, "publishConfig": { "registry": "https://api.bintray.com/npm/halodirobotics/unity" diff --git a/Packages/manifest.json b/Packages/manifest.json index e874524..5cf8db6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -50,4 +50,4 @@ "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" } -} +} \ No newline at end of file