Rename Package Manager Resolver component.

Change-Id: I9208638ce73fc0e09f7565f8f2d4b233d1998148

Author: Stewart Miles

README.md

@@ -11,7 +11,7 @@ Unity plugin that requires:
      [AARs](https://developer.android.com/studio/projects/android-library.html)).
    * iOS [CocoaPods](https://cocoapods.org/).
    * Version management of transitive dependencies.
-   * Management of Unity Package Manager Registries.
+   * Management of Unity Package Manager (UPM) Registries.
 
 Updated releases are available on
 [GitHub](https://github.com/googlesamples/unity-jar-resolver)
@@ -77,7 +77,7 @@ hosting and provides ways to discover, install, upgrade and uninstall packages.
 This makes it easier for developers to manage plugins within their projects.
 
 However, installing additional package registries requires a few manual steps
-that can potentially be error prone.  The *Unity Package Manager Resolver*
+that can potentially be error prone.  The *Package Manager Resolver*
 component of this plugin integrates with
 [UPM](https://docs.unity3d.com/Manual/Packages.html) to provide a way to
 auto-install UPM package registries when a `.unitypackage` is installed which
@@ -132,7 +132,7 @@ with Unity version 4.6.8 or higher.
 The *Version Handler* component only works with Unity 5.x or higher as it
 depends upon the `PluginImporter` UnityEditor API.
 
-The *Unity Package Manager Resolver* component only works with
+The *Package Manager Resolver* component only works with
 Unity 2018.4 or above, when
 [scoped registry](https://docs.unity3d.com/Manual/upm-scoped.html)
 support was added to the Unity Package Manager.
@@ -456,11 +456,11 @@ private static void PostProcessBuild_iOS(BuildTarget target, string buildPath)
 }
 ```
 
-# Unity Package Manager Resolver Usage
+# Package Manager Resolver Usage
 
 Adding registries to the
 [Unity Package Manager](https://docs.unity3d.com/Manual/Packages.html)
-(UPM) is a manual process. The Unity Package Manager Resolver (UPMR) component
+(UPM) is a manual process. The Package Manager Resolver (PMR) component
 of this plugin makes it easy for plugin maintainers to distribute new UPM
 registry servers and easy for plugin users to manage UPM registry servers.
 
@@ -497,30 +497,30 @@ For example, to add a registry for plugins in the scope `com.coolstuff`:
 </registries>
 ```
 
-When UPMR is loaded it will prompt the developer to add the registry to their
+When PMR is loaded it will prompt the developer to add the registry to their
 project if it isn't already present in the `Packages/manifest.json` file.
 
 For more information, see Unity's documentation on
 [scoped package registries](https://docs.unity3d.com/Manual/upm-scoped.html).
 
 ## Managing Registries
 
-It's possible to add and remove registries that are specified via UPMR
+It's possible to add and remove registries that are specified via PMR
 XML configuration files via the following menu options:
 
-* `Assets > External Dependency Manager > Unity Package Manager Resolver >
+* `Assets > External Dependency Manager > Package Manager Resolver >
   Add Registries` will prompt the user with a window which allows them to
   add registries discovered in the project to the Unity Package Manager.
-* `Assets > External Dependency Manager > Unity Package Manager Resolver >
+* `Assets > External Dependency Manager > Package Manager Resolver >
   Remove Registries` will prompt the user with a window which allows them to
   remove registries discovered in the project from the Unity Package Manager.
-* `Assets > External Dependency Manager > Unity Package Manager Resolver >
+* `Assets > External Dependency Manager > Package Manager Resolver >
   Modify Registries` will prompt the user with a window which allows them to
   add or remove registries discovered in the project.
 
 ## Migration
 
-UPMR can migrate Version Handler packages installed in the `Assets` folder
+PMR can migrate Version Handler packages installed in the `Assets` folder
 to UPM packages. This requires the plugins to implement the following:
 
 * `.unitypackage` must include a Version Handler manifests that describes
@@ -535,7 +535,7 @@ to UPM packages. This requires the plugins to implement the following:
   in the *Version Handler Usage* section.
 
 When using the `Assets > External Dependency Manager >
-Unity Package Manager Resolver > Migrate Packages` menu option, UPMR then
+Package Manager Resolver > Migrate Packages` menu option, PMR then
 will:
 
 * List all Version Handler manager packages in the project.
@@ -549,8 +549,8 @@ will:
 
 ## Configuration
 
-UPMR can be configured via the `Assets > External Dependency Manager >
-Unity Package Manager Resolver > Settings` menu option:
+PMR can be configured via the `Assets > External Dependency Manager >
+Package Manager Resolver > Settings` menu option:
 
 * `Add package registries` when enabled, when the plugin loads or registry
   configuration files change, this will prompt the user to add registries

build.gradle

@@ -1381,9 +1381,9 @@ Task buildAndroidResolver = createBuildPluginDllTask(
 Task buildIosResolver = createBuildPluginDllTask(
   "IosResolver", "IOSResolver", "Google.IOSResolver.dll", true,
   [buildAndroidResolver])
-Task buildUnityPackageManagerResolver = createBuildPluginDllTask(
-  "UnityPackageManagerResolver", "UnityPackageManagerResolver",
-  "Google.UnityPackageManagerResolver.dll", true,
+Task buildPackageManagerResolver = createBuildPluginDllTask(
+  "PackageManagerResolver", "PackageManagerResolver",
+  "Google.PackageManagerResolver.dll", true,
   [buildVersionHandlerImpl])
 
 task preparePluginStagingAreaDir(type: Task) {
@@ -1446,7 +1446,7 @@ Iterable<Task> copyComponentsToStagingAreaTasks = [
     copyVersionHandlerStaging,
     copyVersionHandlerImplStaging,
     copyIosResolverStaging,
-    copyUnityPackageManagerResolverStaging].collect {
+    copyPackageManagerResolverStaging].collect {
   task ->
     createCopyFilesTask(
       sprintf("copy%sToStagingArea", task.ext.componentName),
@@ -1721,28 +1721,28 @@ createNUnitTask(
   compileVersionHandlerImplTests.outputs.files[0],
   [compileVersionHandlerImplTests])
 
-Task compileUnityPackageManagerResolverTests = createXbuildTask(
-    "compileUnityPackageManagerResolverTests",
-    "Compile tests for UnityPackageManagerResolver.",
+Task compilePackageManagerResolverTests = createXbuildTask(
+    "compilePackageManagerResolverTests",
+    "Compile tests for PackageManagerResolver.",
     project.ext.pluginSolutionFile,
-    "UnityPackageManagerResolverTests",
+    "PackageManagerResolverTests",
     fileTree(new File(
                new File(
                  new File(project.ext.pluginSourceDir,
-                          "UnityPackageManagerResolver"),
+                          "PackageManagerResolver"),
                  "unit_tests"),
                "src")),
-    new File(project.ext.testDir, "UnityPackageManagerResolverTests"),
-    [new File("Google.UnityPackageManagerResolverTests.dll")],
-    [buildUnityPackageManagerResolver]).with {
+    new File(project.ext.testDir, "PackageManagerResolverTests"),
+    [new File("Google.PackageManagerResolverTests.dll")],
+    [buildPackageManagerResolver]).with {
   doFirst { checkNUnitDllPath() }
 }
 
 createNUnitTask(
-  "testUnityPackageManagerResolver",
-  "Runs tests for the UnityPackageManagerResolver module",
-  compileUnityPackageManagerResolverTests.outputs.files[0],
-  [compileUnityPackageManagerResolverTests])
+  "testPackageManagerResolver",
+  "Runs tests for the PackageManagerResolver module",
+  compilePackageManagerResolverTests.outputs.files[0],
+  [compilePackageManagerResolverTests])
 
 createUnityTestBatchAndNonBatch(
   "testVersionHandlerActivation",
@@ -1860,32 +1860,32 @@ createUnityIntegrationTest(
   ["-buildTarget", "android"])
 
 createUnityIntegrationTest(
-  "testUnityPackageManagerClientIntegrationTests",
+  "testPackageManagerClientIntegrationTests",
   ("Imports the plugin into a Unity project and uses the Unity Package " +
    "Manager client to list, search, install and remove packages. "),
-  [compileUnityPackageManagerResolver],
-  "UnityPackageManagerClientIntegrationTests",
+  [compilePackageManagerResolver],
+  "PackageManagerClientIntegrationTests",
   fileTree(new File(new File(new File(project.ext.pluginSourceDir,
-                             "UnityPackageManagerResolver"), "test"),
-                    "UnityPackageManagerClientIntegrationTests")),
-  [new File("Google.UnityPackageManagerClientIntegrationTests.dll"),
-   new File("Google.UnityPackageManagerClientIntegrationTests.dll.mdb")],
+                             "PackageManagerResolver"), "test"),
+                    "PackageManagerClientIntegrationTests")),
+  [new File("Google.PackageManagerClientIntegrationTests.dll"),
+   new File("Google.PackageManagerClientIntegrationTests.dll.mdb")],
   null, [])
 
 createUnityIntegrationTest(
   "testPackageMigratorIntegrationTests",
   ("Imports the plugin into a Unity project and uses the Package Migrator " +
    "list packages that can be migrated and self migrate EDM to UPM. "),
-  [compileUnityPackageManagerResolver],
+  [compilePackageManagerResolver],
   "PackageMigratorIntegrationTests",
   fileTree(new File(new File(new File(project.ext.pluginSourceDir,
-                             "UnityPackageManagerResolver"), "test"),
+                             "PackageManagerResolver"), "test"),
                     "PackageMigratorIntegrationTests")),
   [new File("Google.PackageMigratorIntegrationTests.dll"),
    new File("Google.PackageMigratorIntegrationTests.dll.mdb")],
   new File(
     project.ext.scriptDirectory,
-    "source/UnityPackageManagerResolver/test/" +
+    "source/PackageManagerResolver/test/" +
     "PackageMigratorIntegrationTestsUnityProject"),
   [])
 

export_unity_package_config.json

@@ -18,7 +18,7 @@
             "ExternalDependencyManager/Editor/Google.IOSResolver_*.*",
             "ExternalDependencyManager/Editor/Google.JarResolver_*.*",
             "ExternalDependencyManager/Editor/Google.VersionHandlerImpl_*.*",
-            "ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver_*.*"
+            "ExternalDependencyManager/Editor/Google.PackageManagerResolver_*.*"
           ],
           "override_metadata_upm": {
             "PluginImporter": {

plugin/Assets/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver.dll.mdb.meta renamed to plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.mdb.meta

@@ -19,13 +19,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionHandlerImplTests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IOSResolver", "IOSResolver\IOSResolver.csproj", "{5B581BAE-D432-41AB-AEED-FD269AEA081D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerResolver", "UnityPackageManagerResolver\UnityPackageManagerResolver.csproj", "{77EBE819-CBE6-4CA8-A791-ED747EA29D30}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagerResolver", "PackageManagerResolver\PackageManagerResolver.csproj", "{77EBE819-CBE6-4CA8-A791-ED747EA29D30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerResolverTests", "UnityPackageManagerResolver\unit_tests\UnityPackageManagerResolverTests.csproj", "{FEECDCE1-F528-4931-A4CF-808DDBCE1A8D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagerResolverTests", "PackageManagerResolver\unit_tests\PackageManagerResolverTests.csproj", "{FEECDCE1-F528-4931-A4CF-808DDBCE1A8D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerClientIntegrationTests", "UnityPackageManagerResolver\test\UnityPackageManagerClientIntegrationTests.csproj", "{00A0DB5E-1120-24C9-331A-BE692C1F7C01}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagerClientIntegrationTests", "PackageManagerResolver\test\PackageManagerClientIntegrationTests.csproj", "{00A0DB5E-1120-24C9-331A-BE692C1F7C01}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageMigratorIntegrationTests", "UnityPackageManagerResolver\test\PackageMigratorIntegrationTests.csproj", "{4DBDEE33-4B6C-A866-93FE-04C15486BB03}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageMigratorIntegrationTests", "PackageManagerResolver\test\PackageMigratorIntegrationTests.csproj", "{4DBDEE33-4B6C-A866-93FE-04C15486BB03}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

plugin/Assets/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver.dll.meta renamed to plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.dll.meta

@@ -8,7 +8,7 @@
     <ProjectGuid>{77EBE819-CBE6-4CA8-A791-ED747EA29D30}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Google</RootNamespace>
-    <AssemblyName>Google.UnityPackageManagerResolver</AssemblyName>
+    <AssemblyName>Google.PackageManagerResolver</AssemblyName>
     <ReleaseVersion>1.2</ReleaseVersion>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
@@ -62,10 +62,10 @@
     <Compile Include="src\PackageManifestModifier.cs" />
     <Compile Include="src\PackageMigrator.cs" />
     <Compile Include="src\SettingsDialog.cs" />
-    <Compile Include="src\UnityPackageManagerClient.cs" />
-    <Compile Include="src\UnityPackageManagerResolver.cs" />
-    <Compile Include="src\XmlUnityPackageManagerRegistries.cs" />
-    <Compile Include="src\UnityPackageManagerRegistry.cs" />
+    <Compile Include="src\PackageManagerClient.cs" />
+    <Compile Include="src\PackageManagerResolver.cs" />
+    <Compile Include="src\XmlPackageManagerRegistries.cs" />
+    <Compile Include="src\PackageManagerRegistry.cs" />
     <Compile Include="src\VersionNumber.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

plugin/Assets/ExternalDependencyManager/Editor/Google.UnityPackageManagerResolver.pdb.meta renamed to plugin/Assets/ExternalDependencyManager/Editor/Google.PackageManagerResolver.pdb.meta

@@ -19,7 +19,7 @@
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
-[assembly: AssemblyTitle("Google.UnityPackageManagerResolver")]
+[assembly: AssemblyTitle("Google.PackageManagerResolver")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Google LLC")]
@@ -54,5 +54,5 @@
 // </copyright>[assembly: AssemblyKeyFile("")]
 
 [assembly: InternalsVisibleTo("Google.PackageMigratorIntegrationTests")]
-[assembly: InternalsVisibleTo("Google.UnityPackageManagerResolverTests")]
-[assembly: InternalsVisibleTo("Google.UnityPackageManagerClientIntegrationTests")]
+[assembly: InternalsVisibleTo("Google.PackageManagerResolverTests")]
+[assembly: InternalsVisibleTo("Google.PackageManagerClientIntegrationTests")]

source/ExternalDependencyManager.sln

@@ -26,7 +26,7 @@ namespace Google {
 /// Provides a safe, simple interface that can be used across any Unity version for interaction
 /// with the Unity Package Manager.
 /// </summary>
-internal static class UnityPackageManagerClient {
+internal static class PackageManagerClient {
 
     /// <summary>
     /// Wrapper object.
@@ -671,7 +671,7 @@ public bool IsComplete {
         public Error Error {
             get {
                 var error = errorProperty.GetValue(instance, null);
-                return error != null ? new UnityPackageManagerClient.Error(error) : null;
+                return error != null ? new PackageManagerClient.Error(error) : null;
             }
         }
     }
@@ -986,7 +986,7 @@ protected void ReportProgress(float itemProgress, string item) {
                 try {
                     progress(itemProgress, item);
                 } catch (Exception e) {
-                    UnityPackageManagerClient.Logger.Log(
+                    PackageManagerClient.Logger.Log(
                         String.Format("Progress reporter raised exception {0}", e),
                         level: LogLevel.Error);
                 }
@@ -1204,7 +1204,7 @@ private void SearchNext() {
     /// <summary>
     /// Logger for this class.
     /// </summary>
-    public static Logger Logger = UnityPackageManagerResolver.logger;
+    public static Logger Logger = PackageManagerResolver.logger;
 
     /// <summary>
     /// Job queue for package managers jobs.

source/UnityPackageManagerResolver/UnityPackageManagerResolver.csproj renamed to source/PackageManagerResolver/PackageManagerResolver.csproj

@@ -1,4 +1,4 @@
-// <copyright file="UnityPackageManagerRegistry.cs" company="Google Inc.">
+// <copyright file="PackageManagerRegistry.cs" company="Google Inc.">
 // Copyright (C) 2020 Google Inc. All Rights Reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,12 +21,12 @@ namespace Google {
     /// <summary>
     /// UPM/NPM package registry.
     /// </summary>
-    internal class UnityPackageManagerRegistry {
+    internal class PackageManagerRegistry {
 
         /// <summary>
         /// Construct an empty registry.
         /// </summary>
-        public UnityPackageManagerRegistry() {
+        public PackageManagerRegistry() {
             Scopes = new List<string>();
         }
 
@@ -96,7 +96,7 @@ public override string ToString() {
         /// <returns>true if both objects have the same contents excluding CreatedBy,
         /// false otherwise.</returns>
         public override bool Equals(System.Object obj) {
-            var other = obj as UnityPackageManagerRegistry;
+            var other = obj as PackageManagerRegistry;
             return other != null &&
                 Name == other.Name &&
                 Url == other.Url &&
@@ -127,12 +127,12 @@ public override int GetHashCode() {
         }
 
         /// <summary>
-        /// Convert a list of UnityPackageManagerRegistry instances to a list of strings.
+        /// Convert a list of PackageManagerRegistry instances to a list of strings.
         /// </summary>
         /// <param name="registries">List of registries to convert to strings.</param>
         /// <returns>List of strings.</returns>
         public static List<string> ToStringList(
-                IEnumerable<UnityPackageManagerRegistry> registries) {
+                IEnumerable<PackageManagerRegistry> registries) {
             var registryStrings = new List<string>();
             foreach (var registry in registries) {
                 registryStrings.Add(registry.ToString());
@@ -141,11 +141,11 @@ public static List<string> ToStringList(
         }
 
         /// <summary>
-        /// Convert a list of UnityPackageManagerRegistry instance to a newline separated string.
+        /// Convert a list of PackageManagerRegistry instance to a newline separated string.
         /// </summary>
         /// <param name="registries">List of registries to convert to strings.</param>
         /// <returns>String representation of the list.</returns>
-        public static string ToString(IEnumerable<UnityPackageManagerRegistry> registries) {
+        public static string ToString(IEnumerable<PackageManagerRegistry> registries) {
             return String.Join("\n", ToStringList(registries).ToArray());
         }
     }