com.elestrago.unity.package-tools 2.0.7 → 2.0.9

package/CAHNGELOG.md

@@ -2,7 +2,28 @@
 
 ---
 
-## [v2.0.7](https://gitlab.com/pd-packages/package-tool/-/tags/v2.0.7)
+## [2.0.9](https://gitlab.com/elestrago-pkg/package-tool/-/tags/2.0.8)
+
+### Removed
+
+- Removed `v` prefix in package tags
+
+### Added
+
+- Coping sample files and folders to package destination folder from sample source folder
+
+---
+
+## [v2.0.8](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.8)
+
+### Changes
+
+- Remove author from namespace
+- Remove CI pipeline from package initialization template
+
+---
+
+## [v2.0.7](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.7)
 
 ### Fixed
 
@@ -10,7 +31,7 @@
 
 ---
 
-## [v2.0.6](https://gitlab.com/pd-packages/package-tool/-/tags/v2.0.6)
+## [v2.0.6](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.6)
 
 ### Fixed
 
@@ -18,7 +39,7 @@
 
 ---
 
-## [v2.0.5](https://gitlab.com/pd-packages/package-tool/-/tags/v2.0.5)
+## [v2.0.5](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.5)
 
 ### Fixed
 
@@ -27,7 +48,7 @@
 
 ---
 
-## [v2.0.4](https://gitlab.com/pd-packages/package-tool/-/tags/v2.0.4)
+## [v2.0.4](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.4)
 
 ### Fixed
 
@@ -36,7 +57,7 @@
 
 ---
 
-## [v2.0.3](https://gitlab.com/pd-packages/package-tool/-/tags/v2.0.3)
+## [v2.0.3](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.3)
 
 ### Fixed
 
@@ -44,7 +65,7 @@
 
 ---
 
-## [v2.0.2](https://gitlab.com/pd-packages/package-tool/-/tags/v2.0.2)
+## [v2.0.2](https://gitlab.com/elestrago-pkg/package-tool/-/tags/v2.0.2)
 
 ### Changed
 

package/Editor/CIUtils.cs

@@ -2,11 +2,11 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Playdarium.PackageTool.Tools;
+using PackageTool.Tools;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool
+namespace PackageTool
 {
 	/// <summary>
 	/// Continuous-integration API for package tools.

package/Editor/Drawers/AuthorPropertyDrawer.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Drawers
+namespace PackageTool.Drawers
 {
 	/// <summary>
 	/// A property drawer for drawing <see cref="PackageManifestConfig.Author"/>

package/Editor/Drawers/DependencyPropertyDrawer.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Drawers
+namespace PackageTool.Drawers
 {
 	/// <summary>
 	/// A property drawer for drawing <see cref="PackageManifestConfig.Dependency"/>

package/Editor/Drawers/SamplePropertyDrawer.cs

@@ -1,62 +1,68 @@
-using Playdarium.PackageTool.Tools;
+using PackageTool.Tools;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Drawers
+namespace PackageTool.Drawers
 {
 	[CustomPropertyDrawer(typeof(PackageManifestConfig.Sample))]
 	public class SamplePropertyDrawer : PropertyDrawer
 	{
+		private const string SOURCE_PATH_PROPERTY_NAME = "sourcePath";
 		private const string DISPLAY_NAME_PROPERTY_NAME = "displayName";
 		private const string DESCRIPTION_PROPERTY_NAME = "description";
-		private const string PATH_PROPERTY_NAME = "path";
+		private const string FOLDER_NAME_PROPERTY_NAME = "folderName";
 
 		public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
 		{
+			var sourcePathRect = new Rect(position)
+			{
+				height = EditorConstants.FOLDER_PATH_PICKER_HEIGHT
+			};
+
 			var displayNameRect = new Rect(position)
 			{
+				position = new Vector2(position.x, sourcePathRect.y + sourcePathRect.height + 2),
 				height = EditorGUIUtility.singleLineHeight
 			};
-			displayNameRect.height = EditorConstants.FOLDER_PATH_PICKER_HEIGHT;
 
 			var descriptionRect = new Rect(displayNameRect)
 			{
-				position = new Vector2(position.x, displayNameRect.y + displayNameRect.height + 2)
+				position = new Vector2(position.x, displayNameRect.y + displayNameRect.height + 2),
+				height = EditorGUIUtility.singleLineHeight
 			};
-			descriptionRect.height = EditorConstants.FOLDER_PATH_PICKER_HEIGHT;
 
-			var pathRect = new Rect(descriptionRect)
+			var folderNameRect = new Rect(descriptionRect)
 			{
 				position = new Vector2(position.x, descriptionRect.y + displayNameRect.height + 2),
 			};
 
-			pathRect.width -= EditorConstants.FOLDER_PATH_PICKER_BUFFER;
-			pathRect.height = EditorConstants.FOLDER_PATH_PICKER_HEIGHT;
-			var newPathRect = new Rect(pathRect);
+			sourcePathRect.width -= EditorConstants.FOLDER_PATH_PICKER_BUFFER;
+			sourcePathRect.height = EditorConstants.FOLDER_PATH_PICKER_HEIGHT;
+			var newSourcePathRect = new Rect(sourcePathRect);
 
-			var pathProperty = property.FindPropertyRelative(PATH_PROPERTY_NAME);
-			EditorGUI.PropertyField(displayNameRect, property.FindPropertyRelative(DISPLAY_NAME_PROPERTY_NAME));
-			EditorGUI.PropertyField(descriptionRect, property.FindPropertyRelative(DESCRIPTION_PROPERTY_NAME));
-			EditorGUI.PropertyField(newPathRect, pathProperty);
+			var sourcePathProperty = property.FindPropertyRelative(SOURCE_PATH_PROPERTY_NAME);
+			EditorGUI.PropertyField(newSourcePathRect, sourcePathProperty);
 
 			var folderPickerRect = new Rect
 			{
 				position = new Vector2(
-					newPathRect.width + EditorConstants.FOLDER_PATH_PICKER_BUFFER + 10,
-					newPathRect.position.y),
+					newSourcePathRect.width + EditorConstants.FOLDER_PATH_PICKER_BUFFER + 10,
+					newSourcePathRect.position.y),
 				width = EditorConstants.FOLDER_PATH_PICKER_HEIGHT,
 				height = EditorConstants.FOLDER_PATH_PICKER_HEIGHT,
 			};
 
-			GUILayoutTools.DrawSourceFolderPicker(
+			GUILayoutTools.DrawFolderPicker(
 				folderPickerRect,
-				pathProperty,
+				sourcePathProperty,
 				EditorConstants.SELECT_SAMPLES_PATH_FOLDER_TITLE);
+
+			EditorGUI.PropertyField(displayNameRect, property.FindPropertyRelative(DISPLAY_NAME_PROPERTY_NAME));
+			EditorGUI.PropertyField(descriptionRect, property.FindPropertyRelative(DESCRIPTION_PROPERTY_NAME));
+			EditorGUI.PropertyField(folderNameRect, property.FindPropertyRelative(FOLDER_NAME_PROPERTY_NAME));
 		}
 
 		public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
-		{
-			return EditorGUIUtility.singleLineHeight * 3f;
-		}
+			=> EditorConstants.FOLDER_PATH_PICKER_HEIGHT + EditorGUIUtility.singleLineHeight * 3f + 6f;
 	}
 }

package/Editor/EditorConstants.cs

@@ -24,7 +24,7 @@ SOFTWARE.
 
 using UnityEngine;
 
-namespace Playdarium.PackageTool
+namespace PackageTool
 {
 	/// <summary>
 	/// Internal constants and readonly fields for package tools usage.
@@ -39,7 +39,8 @@ namespace Playdarium.PackageTool
 		public const string PACKAGE_JSON_FILENAME = "package.json";
 		public const string WILDCARD_FILTER = "*";
 		public const string ASSET_EXTENSION = ".asset";
-		public const string META_FORMAT = "{0}.meta";
+		public const string META_EXTENSION = ".meta";
+		public const string META_FORMAT = "{0}" + META_EXTENSION;
 		public const string GENERATED_FOLDER_NAME = "Generated";
 		public const string UNITY_PACKAGE_NAME_FORMAT = "{0}_v{1}.unityPackage";
 		public const char EMPTY_SPACE = ' ';
@@ -104,6 +105,7 @@ namespace Playdarium.PackageTool
 		public const string PACKAGE_UPDATE_SUCCESS_FORMAT =
 			"[Package Tools] Successfully updated package source for [{0}].";
 
+		public const string SAMPLES_FOLDER_NAME = "Samples~";
 		public const string SAMPLES_HEADER_LABEL = "Samples";
 		public const string SAMPLES_ELEMENT_LABEL_FORMAT = "Sample {0}:";
 	}

package/Editor/Inspectors/PackageManifestConfigInspector.cs

@@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-using Playdarium.PackageTool.Tools;
+using PackageTool.Tools;
 using UnityEditor;
 using UnityEditorInternal;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Inspectors
+namespace PackageTool.Inspectors
 {
 	[CustomEditor(typeof(PackageManifestConfig))]
 	internal sealed class PackageManifestConfigInspector : UnityEditor.Editor

package/Editor/MenuItems.cs

@@ -1,7 +1,7 @@
-using Playdarium.PackageTool.Utils.PackageInitialize;
+using PackageTool.Utils.PackageInitialize;
 using UnityEditor;
 
-namespace Playdarium.PackageTool
+namespace PackageTool
 {
 	internal static class MenuItems
 	{

package/Editor/PackageManifestConfig.cs

@@ -23,10 +23,10 @@ SOFTWARE.
 */
 
 using System;
-using Playdarium.PackageTool.Tools;
+using PackageTool.Tools;
 using UnityEngine;
 
-namespace Playdarium.PackageTool
+namespace PackageTool
 {
 	/// <summary>
 	/// <see cref="PackageManifestConfig"/> is an asset config representing a Unity Package. It allows for
@@ -72,13 +72,14 @@ namespace Playdarium.PackageTool
 		[Serializable]
 		public sealed class Sample
 		{
+			public string sourcePath;
 			public string displayName;
 			public string description;
-			public string path;
+			public string folderName;
 
 			public bool IsEmpty() => string.IsNullOrEmpty(displayName)
-			                         || string.IsNullOrEmpty(description)
-			                         || string.IsNullOrEmpty(path);
+			                         || string.IsNullOrEmpty(sourcePath)
+			                         || string.IsNullOrEmpty(folderName);
 		}
 
 		/// <summary>
@@ -91,7 +92,6 @@ namespace Playdarium.PackageTool
 		/// <summary>
 		/// A collection of paths to folders and files for the source for the package.
 		/// </summary>
-		// public string[] packageSourcePaths;
 		public string sourcePath;
 
 		public string documentationPath = "Documentation~";

package/Editor/Tools/CodeGenTools.cs

@@ -28,7 +28,7 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for code-gen.

package/Editor/Tools/CommandLineTools.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using System;
 using System.Collections.Generic;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for command-line usage

package/Editor/Tools/FileTools.cs

@@ -30,7 +30,7 @@ using UnityEditor;
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for dealing with files/directories
@@ -123,34 +123,8 @@ namespace Playdarium.PackageTool.Tools
 				var normalizedSourcePath = Path.GetFullPath(packageManifest.sourcePath);
 
 				CopyDocumentationToDirectory(packageManifest);
-
-				// if (IsFile(normalizedSourcePath) && File.Exists(normalizedSourcePath))
-				// {
-				// 	var fileInfo = new FileInfo(normalizedSourcePath);
-				// 	if (fileInfo.Directory == null)
-				// 		return;
-				//
-				// 	var parentDirectoryPath = fileInfo.Directory.FullName;
-				// 	var newPath = normalizedSourcePath.Replace(parentDirectoryPath, normalizedDestinationPath);
-				//
-				// 	File.Copy(normalizedSourcePath, newPath);
-				//
-				// 	var sourceMetaPath = string.Format(EditorConstants.META_FORMAT, normalizedSourcePath);
-				// 	if (File.Exists(sourceMetaPath))
-				// 	{
-				// 		var newMetaPath = sourceMetaPath.Replace(parentDirectoryPath, normalizedDestinationPath);
-				// 		File.Copy(sourceMetaPath, newMetaPath);
-				// 	}
-				// }
-				// Otherwise if this is a folder, copy it and all the contents over to the destination folder.
-				// else
-				{
-					RecursivelyCopyDirectoriesAndFiles(
-						packageManifest,
-						new DirectoryInfo(normalizedSourcePath),
-						normalizedSourcePath,
-						normalizedDestinationPath);
-				}
+				RecursivelyCopyDirectoriesAndFiles(packageManifest, normalizedSourcePath, normalizedDestinationPath);
+				CopySamplesToDirectory(packageManifest);
 
 				Debug.LogFormat(EditorConstants.PACKAGE_UPDATE_SUCCESS_FORMAT, packageManifest.packageName);
 
@@ -188,11 +162,9 @@ namespace Playdarium.PackageTool.Tools
 
 			Directory.CreateDirectory(destinationPath);
 
-			var documentationDir = new DirectoryInfo(packageManifest.documentationPath);
-			if (documentationDir.Exists)
+			if (Directory.Exists(packageManifest.documentationPath))
 				RecursivelyCopyDirectoriesAndFiles(
 					packageManifest,
-					documentationDir,
 					normalizedDocumentationPath,
 					destinationPath
 				);
@@ -220,6 +192,34 @@ namespace Playdarium.PackageTool.Tools
 			File.Copy(normalizedSourcePath, destinationPath);
 		}
 
+		private static void CopySamplesToDirectory(PackageManifestConfig packageManifest)
+		{
+			var samples = packageManifest.samples;
+			samples = samples.Where(s => !s.IsEmpty()).ToArray();
+			if (samples.Length == 0)
+				return;
+
+			var sampleDestinationPath =
+				Path.Combine(packageManifest.packageDestinationPath, EditorConstants.SAMPLES_FOLDER_NAME);
+			var normalizedSamplesPath = Path.GetFullPath(sampleDestinationPath);
+			if (Directory.Exists(normalizedSamplesPath))
+				Directory.Delete(normalizedSamplesPath, true);
+
+			Directory.CreateDirectory(normalizedSamplesPath);
+
+			foreach (var sample in samples)
+				RecursivelyCopyDirectoriesAndFiles(
+					packageManifest,
+					sample.sourcePath,
+					Path.Combine(sampleDestinationPath, sample.folderName),
+					IgnoreMetaFile
+				);
+
+			return;
+
+			bool IgnoreMetaFile(FileInfo fileInfo) => fileInfo.Extension == EditorConstants.META_EXTENSION;
+		}
+
 		/// <summary>
 		/// Returns true if the <paramref name="path"/> is for a file, otherwise false.
 		/// </summary>
@@ -241,14 +241,16 @@ namespace Playdarium.PackageTool.Tools
 		/// <param name="destinationPath"></param>
 		private static void RecursivelyCopyDirectoriesAndFiles(
 			PackageManifestConfig packageManifest,
-			DirectoryInfo directoryInfo,
 			string sourcePath,
-			string destinationPath
+			string destinationPath,
+			Func<FileInfo, bool> ignoreFile = null
 		)
 		{
 			var normalizedSourcePath = Path.GetFullPath(sourcePath);
 			var normalizedDestinationPath = Path.GetFullPath(destinationPath);
-			var subDirectoryInfo = directoryInfo.GetDirectories(EditorConstants.WILDCARD_FILTER);
+			var directoryInfo = new DirectoryInfo(sourcePath);
+			var subDirectoryInfo =
+				directoryInfo.GetDirectories(EditorConstants.WILDCARD_FILTER, SearchOption.AllDirectories);
 			foreach (var sdi in subDirectoryInfo)
 			{
 				// If any of the paths we're looking at match the ignore paths from the user, skip them
@@ -259,12 +261,9 @@ namespace Playdarium.PackageTool.Tools
 				}
 
 				Directory.CreateDirectory(sdi.FullName.Replace(normalizedSourcePath, normalizedDestinationPath));
-
-				RecursivelyCopyDirectoriesAndFiles(packageManifest, sdi, normalizedSourcePath,
-					normalizedDestinationPath);
 			}
 
-			var fileInfo = directoryInfo.GetFiles(EditorConstants.WILDCARD_FILTER);
+			var fileInfo = directoryInfo.GetFiles(EditorConstants.WILDCARD_FILTER, SearchOption.AllDirectories);
 			foreach (var fi in fileInfo)
 			{
 				// If any of the paths we're looking at match the ignore paths from the user, skip them
@@ -274,6 +273,9 @@ namespace Playdarium.PackageTool.Tools
 					continue;
 				}
 
+				if (ignoreFile?.Invoke(fi) ?? false)
+					continue;
+
 				var newPath = Path.GetFullPath(fi.FullName).Replace(normalizedSourcePath, normalizedDestinationPath);
 				File.Copy(fi.FullName, newPath);
 			}

package/Editor/Tools/GUILayoutTools.cs

@@ -26,7 +26,7 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for Unity Editor GUI.
@@ -59,6 +59,8 @@ namespace Playdarium.PackageTool.Tools
 				{
 					var relativePath = FileTools.ConvertToRelativePath(path, Application.dataPath);
 					property.stringValue = relativePath;
+					property.serializedObject.ApplyModifiedProperties();
+					GUIUtility.ExitGUI();
 				}
 			}
 		}
@@ -85,6 +87,8 @@ namespace Playdarium.PackageTool.Tools
 					var relativePath = "/" + FileTools.ConvertToRelativePath(path, Application.dataPath);
 					relativePath = FileTools.ConvertToRelativePath(relativePath, sourcePath);
 					property.stringValue = relativePath;
+					property.serializedObject.ApplyModifiedProperties();
+					GUIUtility.ExitGUI();
 				}
 			}
 		}
@@ -115,6 +119,8 @@ namespace Playdarium.PackageTool.Tools
 				{
 					var relativePath = FileTools.ConvertToRelativePath(path, Application.dataPath);
 					property.stringValue = relativePath;
+					property.serializedObject.ApplyModifiedProperties();
+					GUIUtility.ExitGUI();
 				}
 			}
 		}
@@ -145,6 +151,8 @@ namespace Playdarium.PackageTool.Tools
 				{
 					var relativePath = FileTools.ConvertToRelativePath(path, Application.dataPath);
 					property.stringValue = relativePath;
+					property.serializedObject.ApplyModifiedProperties();
+					GUIUtility.ExitGUI();
 				}
 			}
 		}
@@ -170,6 +178,8 @@ namespace Playdarium.PackageTool.Tools
 				{
 					var relativePath = FileTools.ConvertToRelativePath(path, Application.dataPath);
 					property.stringValue = relativePath;
+					property.serializedObject.ApplyModifiedProperties();
+					GUIUtility.ExitGUI();
 				}
 			}
 		}

package/Editor/Tools/GitTools.cs

@@ -25,7 +25,7 @@ SOFTWARE.
 using System.Diagnostics;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for retrieving git information

package/Editor/Tools/PackageJsonModel.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	public class PackageJsonModel
 	{
@@ -59,7 +59,7 @@ namespace Playdarium.PackageTool.Tools
 			model.Samples = manifest.samples != null && manifest.samples.Length > 0
 				? manifest.samples
 					.Where(s => !s.IsEmpty())
-					.Select(s => new Sample(s.displayName, s.description, s.path))
+					.Select(s => new Sample(s.displayName, s.description, "Samples~/" + s.folderName))
 					.ToArray()
 				: null;
 
@@ -70,9 +70,9 @@ namespace Playdarium.PackageTool.Tools
 					homepage = homepage.Remove(homepage.Length - 2, 1);
 
 				model.Homepage = homepage;
-				model.DocumentationUrl = $"{homepage}/-/blob/main/README.md";
-				model.ChangelogUrl = $"{homepage}/-/blob/main/CHANGELOG.md";
-				model.LicensesUrl = $"{homepage}/-/blob/main/LICENSE";
+				model.DocumentationUrl = $"{homepage}/-/blob/{manifest.packageVersion}/README.md";
+				model.ChangelogUrl = $"{homepage}/-/blob/{manifest.packageVersion}/CHANGELOG.md";
+				model.LicensesUrl = $"{homepage}/-/blob/{manifest.packageVersion}/LICENSE";
 				model.Repository = new Repository("git", $"{homepage}.git");
 				model.Bugs = new Bugs($"{homepage}/-/issues");
 			}

package/Editor/Tools/PackageManifestTools.cs

@@ -26,7 +26,7 @@ using System.Collections.Generic;
 using Newtonsoft.Json;
 using UnityEditor;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for the Package Manifest Tools

package/Editor/Tools/UnityFileTools.cs

@@ -28,7 +28,7 @@ using System.Linq;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Tools
+namespace PackageTool.Tools
 {
 	/// <summary>
 	/// Helper methods for dealing with files/directories in the Unity Assets folder.

package/Editor/Utils/PackageInitialize/PackageInitializeTemplates.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Playdarium.PackageTool.Utils.PackageInitialize
+namespace PackageTool.Utils.PackageInitialize
 {
 	public static class PackageInitializeTemplates
 	{
@@ -8,7 +8,7 @@ namespace Playdarium.PackageTool.Utils.PackageInitialize
 
 ---
 
-## [v0.0.0]({homepage}/-/tags/v0.0.0)
+## [0.0.0]({homepage}/-/tags/0.0.0)
 
 ### Added
 
@@ -65,6 +65,8 @@ registry.
 ```
 {{
   ""dependencies"": {{
+	...
+	""{packageName}"": ""x.x.x"",
     ...
   }},
   ""scopedRegistries"": [
@@ -79,15 +81,6 @@ registry.
 }}
 ```
 
-#### Add package in PackageManager
-
-Open `Window -> Package Manager` choose `Packages: My Regestries` and install package
-
-### Install via GIT URL
-
-```
-""{packageName}"": ""{homepage}.git#upm""
-```
 ";
 		}
 
@@ -112,60 +105,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.";
-
-		public static string CiScript => @"
-##############################################################
-#                                                            #
-#   This file is auto generated by Playdarium.PackageTool    #
-#                                                            #
-##############################################################
-
-workflow:
-  rules:
-    - if: $CI_COMMIT_BRANCH =~ /^main$/
-      changes:
-        paths:
-          - 'Release/package.json'
-      when: always
-    - when: never
-
-stages:
-  - deploy
-
-deploy-npm:
-  stage: deploy
-  image: node:lts-alpine
-  before_script:
-    - |
-      export PACKAGE_VERSION=$(grep -o '""version"": ""[^""]*""' ./Release/package.json | awk -F'""' '{print $4}')
-      export GIT_URL=https://$GITLAB_USER_NAME:$GITLAB_TOKEN@$CI_SERVER_HOST/$CI_PROJECT_PATH.git
-    - apk update
-    - apk add git
-    - git config --global user.name ""$GITLAB_USER_NAME""
-    - git config --global user.email ""$GITLAB_USER_EMAIL""
-    - git clone -b upm $GIT_URL ./upm-package
-  script:
-    - echo ""Create package version $PACKAGE_VERSION""
-    - cd ./upm-package
-    - git rm -r *
-    - git rm .gitlab-ci.yml || true
-    - git rm -rf .idea || true
-    - cp -r ../Release/* .
-    - git add .
-    - git commit -m ""[$PACKAGE_VERSION] GitLab CI auto package publish""
-    - git push $GIT_URL upm
-    - cd ..
-
-    - echo ""Push tag v$PACKAGE_VERSION""
-    - git tag -a v$PACKAGE_VERSION -m 'GitLab CI auto tag publish'
-    - git push --tags $GIT_URL
-
-    - echo ""Publish to NPM""
-    - cd ./upm-package
-    - echo ""registry=https://registry.npmjs.org/"" >> "".npmrc""
-    - echo ""//registry.npmjs.org/:_authToken=$NPM_TOKEN"" >> "".npmrc""
-    - npm publish
-
-";
 	}
 }

package/Editor/Utils/PackageInitialize/PackageInitializeUtil.cs

@@ -2,7 +2,7 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Utils.PackageInitialize
+namespace PackageTool.Utils.PackageInitialize
 {
 	public static class PackageInitializeUtil
 	{
@@ -18,9 +18,6 @@ namespace Playdarium.PackageTool.Utils.PackageInitialize
 		private const string CHANGELOG_FILE_NAME = "CHANGELOG.md";
 		private const string LICENSE_FILE_NAME = "LICENSE";
 
-		private const string CI_FILE_PATH = "./";
-		private const string CI_FILE_NAME = ".gitlab-ci.yml";
-
 		private static readonly string AssetPath = Application.dataPath;
 
 		private static readonly string ProjectPath = Application.dataPath
@@ -46,8 +43,6 @@ namespace Playdarium.PackageTool.Utils.PackageInitialize
 				PackageInitializeTemplates.CreateChangelog(config.homepage));
 			CreateFileAtPath(ProjectPath, LICENSE_FILE_NAME,
 				PackageInitializeTemplates.CreateLicense(config.author.name));
-			CreateFileAtPath(Path.Combine(ProjectPath, CI_FILE_PATH), CI_FILE_NAME,
-				PackageInitializeTemplates.CiScript);
 
 			AssetDatabase.Refresh();
 		}

package/Editor/Utils/PackageInitialize/PackageInitializeWindow.cs

@@ -2,7 +2,7 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-namespace Playdarium.PackageTool.Utils.PackageInitialize
+namespace PackageTool.Utils.PackageInitialize
 {
 	public class PackageInitializeWindow : EditorWindow
 	{

package/README.md

@@ -35,10 +35,6 @@ registry.
 }
 ```
 
-#### Add package in PackageManager
-
-Open `Window -> Package Manager` choose `Packages: My Regestries` and install package
-
 ## Setting up your first package
 
 Creating your first package is a simple process that can be made more complex because information available about Unity

package/Samples~/ExampleSample/Prefabs/ExamplePrefab.prefab

@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7163308873607426892
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 189958532589283299}
+  - component: {fileID: 415496657422796839}
+  - component: {fileID: 9059559485555714885}
+  m_Layer: 0
+  m_Name: ExamplePrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &189958532589283299
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7163308873607426892}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &415496657422796839
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7163308873607426892}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &9059559485555714885
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7163308873607426892}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}

package/Samples~/ExampleSample/Scene/SampleScene.unity

@@ -0,0 +1,291 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: fa48e9f62fa1abb339b66860c7d9a71f,
+    type: 2}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    buildHeightMesh: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &519420028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 519420032}
+  - component: {fileID: 519420031}
+  - component: {fileID: 519420029}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &519420029
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_Enabled: 1
+--- !u!20 &519420031
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 1
+  m_AllowMSAA: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 0
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &519420032
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &520738513
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 189958532589283299, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7163308873607426892, guid: 62664beb370d5502fae71af4eead615b,
+        type: 3}
+      propertyPath: m_Name
+      value: ExamplePrefab
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 62664beb370d5502fae71af4eead615b, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 519420032}
+  - {fileID: 520738513}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "com.elestrago.unity.package-tools",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "displayName": "Package Tool",
   "description": "Tool for create unity packages",
   "category": "unity",
   "unity": "2021.3",
   "homepage": "https://gitlab.com/elestrago-pkg/package-tool",
-  "documentationUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/main/README.md",
-  "changelogUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/main/CHANGELOG.md",
-  "licensesUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/main/LICENSE",
+  "documentationUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.0.9/README.md",
+  "changelogUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.0.9/CHANGELOG.md",
+  "licensesUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.0.9/LICENSE",
   "license": "MIT",
   "keywords": [
     "unity",
@@ -21,9 +21,9 @@
   },
   "samples": [
     {
-      "displayName": "Example Project",
-      "description": "This is example project for check test samples",
-      "path": "Samples~/Example Project"
+      "displayName": "Example Sample",
+      "description": "This is example for check test samples",
+      "path": "Samples~/ExampleSample"
     }
   ],
   "author": {