Merge remote-tracking branch 'dr/master' into testing

Change-Id: Ide1ee5095a180dca9c1a0552dd4551a1b4d08e53

Author: Stewart Miles

source/ExportUnityPackage/export_unity_package.py

@@ -176,11 +176,11 @@
 
                 # A list of keywords for the package. Potentially used for
                 # filtering or searching. Optional.
-                # Add "vh_name:legacy_manifest_name" to link this package to
+                # Add "vh-name:legacy_manifest_name" to link this package to
                 # a renamed package imported as an asset package.
                 # Note that this script will automatically add
-                # "vh_name:current_package_name" to keywords.
-                "keywords": [ "Google", "Firebase", "vh_name:MyOldName"],
+                # "vh-name:current_package_name" to keywords.
+                "keywords": [ "Google", "Firebase", "vh-name:MyOldName"],
 
                 # Author information for the package. Optional.
                 "author": {
@@ -524,7 +524,7 @@
     (r"(^|{sep})Plugins{sep}(x86|x86_64){sep}(.*{sep}|)[^{sep}]+"
      r"\.(so|dll|bundle)$").format(sep=os.path.sep))
 # Prefix of the keywords to be added to UPM manifest to link to legacy manifest.
-UPM_KEYWORDS_MANIFEST_PREFIX = "vh_name:"
+UPM_KEYWORDS_MANIFEST_PREFIX = "vh-name:"
 # Everything in a Unity plugin - at the moment - lives under the Assets
 # directory
 ASSETS_DIRECTORY = "Assets"
@@ -2277,14 +2277,20 @@ def get_manifest_metadata(self,
     if manifest_type == VERSION_HANDLER_MANIFEST_TYPE_LEGACY:
       labels.add(
           version_handler_tag(field=VERSION_HANDLER_MANIFEST_FIELD_PREFIX))
+
       # Add gvhp_manifestname-0DisplayName
-      preferred_alias = self.package_name
+      priority = 0
       if self.common_package_display_name:
-        preferred_alias = self.common_package_display_name
-      labels.add(VERSION_HANDLER_PRESERVE_LABEL_PREFIX +
-                 VERSION_HANDLER_FIELD_SEPARATOR +
-                 VERSION_HANDLER_PRESERVE_MANIFEST_NAME_FIELD_PREFIX + "0" +
-                 preferred_alias)
+        labels.add(VERSION_HANDLER_PRESERVE_LABEL_PREFIX +
+                   VERSION_HANDLER_FIELD_SEPARATOR +
+                   VERSION_HANDLER_PRESERVE_MANIFEST_NAME_FIELD_PREFIX +
+                   str(priority) + self.common_package_display_name)
+        priority += 1
+      if self.package_name != self.common_package_display_name:
+        labels.add(VERSION_HANDLER_PRESERVE_LABEL_PREFIX +
+                   VERSION_HANDLER_FIELD_SEPARATOR +
+                   VERSION_HANDLER_PRESERVE_MANIFEST_NAME_FIELD_PREFIX +
+                   str(priority) + self.package_name)
 
     elif manifest_type == VERSION_HANDLER_MANIFEST_TYPE_UPM:
       # gupmr_manifest
@@ -2372,9 +2378,10 @@ def write_upm_manifest(self, output_dir):
     if self.export and self.manifest_path:
       keywords = safe_dict_get_value(package_manifest, "keywords",
                                      default_value=[])
-      legacy_manifest_keyword = (UPM_KEYWORDS_MANIFEST_PREFIX +
-                                 self.package_name)
-      keywords.append(legacy_manifest_keyword)
+      keywords.append(UPM_KEYWORDS_MANIFEST_PREFIX + self.package_name)
+      if self.common_package_display_name != self.package_name:
+        keywords.append(UPM_KEYWORDS_MANIFEST_PREFIX +
+                        self.common_package_display_name)
       package_manifest["keywords"] = keywords
 
     # Add minimum Unity version

source/ExportUnityPackage/export_unity_package_test.py

@@ -1041,7 +1041,7 @@ def setUp(self):
         export_unity_package.DEFAULT_METADATA_TEMPLATE)
     self.expected_manifest_metadata_prebuild["labels"] = [
         "gvh", "gvh_manifest", "gvh_version-1.2.3",
-        "gvhp_manifestname-0NiceName"]
+        "gvhp_manifestname-0NiceName", "gvhp_manifestname-1Test"]
     # Metadata when write() is called.
     self.expected_manifest_metadata = copy.deepcopy(
         export_unity_package.DEFAULT_METADATA_TEMPLATE)
@@ -3024,7 +3024,10 @@ def test_package_write_upm(self):
         "displayName": "Play Services Resolver",
         "version": "1.0.0",
         "unity": "2017.1",
-        "keywords": ["vh_name:play-services-resolver"],
+        "keywords": [
+            "vh-name:play-services-resolver",
+            "vh-name:Play Services Resolver"
+        ],
         "dependencies": {
             "com.some.third-party-package": "1.2.3",
             "com.google.ios-resolver": "1.0.0"