Skip to content

Commit 052c9f3

Browse files
author
Stewart Miles
committed
Version Handler to Unity Package Manager Package Migrator
Added a package migration feature to the Unity Package Manager Resolver. This detects Version Handler packages installed in a developer's project and provides a UI to select which ones to migrate to UPM packages. Bug: 150471207 Change-Id: I1816cc3cb4690194c780e5359f9f325f95f44d44
1 parent 54f9e14 commit 052c9f3

14 files changed

+1394
-6
lines changed

build.gradle

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,6 +1863,23 @@ createUnityIntegrationTest(
18631863
new File("Google.UnityPackageManagerClientIntegrationTests.dll.mdb")],
18641864
null, [])
18651865

1866+
createUnityIntegrationTest(
1867+
"testPackageMigratorIntegrationTests",
1868+
("Imports the plugin into a Unity project and uses the Package Migrator " +
1869+
"list packages that can be migrated and self migrate EDM to UPM. "),
1870+
[compileUnityPackageManagerResolver],
1871+
"PackageMigratorIntegrationTests",
1872+
fileTree(new File(new File(new File(project.ext.pluginSourceDir,
1873+
"UnityPackageManagerResolver"), "test"),
1874+
"PackageMigratorIntegrationTests")),
1875+
[new File("Google.PackageMigratorIntegrationTests.dll"),
1876+
new File("Google.PackageMigratorIntegrationTests.dll.mdb")],
1877+
new File(
1878+
project.ext.scriptDirectory,
1879+
"source/UnityPackageManagerResolver/test/" +
1880+
"PackageMigratorIntegrationTestsUnityProject"),
1881+
[])
1882+
18661883
task cleanTests(type: Delete) {
18671884
description "Clean test directories."
18681885
delete project.ext.testDir

source/ExternalDependencyManager.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerResolver
2525
EndProject
2626
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerClientIntegrationTests", "UnityPackageManagerResolver\test\UnityPackageManagerClientIntegrationTests.csproj", "{00A0DB5E-1120-24C9-331A-BE692C1F7C01}"
2727
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageMigratorIntegrationTests", "UnityPackageManagerResolver\test\PackageMigratorIntegrationTests.csproj", "{4DBDEE33-4B6C-A866-93FE-04C15486BB03}"
29+
EndProject
2830
Global
2931
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3032
Debug|Any CPU = Debug|Any CPU
@@ -79,5 +81,9 @@ Global
7981
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
8082
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
8183
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Release|Any CPU.Build.0 = Release|Any CPU
84+
{4DBDEE33-4B6C-A866-93FE-04C15486BB03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85+
{4DBDEE33-4B6C-A866-93FE-04C15486BB03}.Debug|Any CPU.Build.0 = Debug|Any CPU
86+
{4DBDEE33-4B6C-A866-93FE-04C15486BB03}.Release|Any CPU.ActiveCfg = Release|Any CPU
87+
{4DBDEE33-4B6C-A866-93FE-04C15486BB03}.Release|Any CPU.Build.0 = Release|Any CPU
8288
EndGlobalSection
8389
EndGlobal

source/UnityPackageManagerResolver/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@
5353
// limitations under the License.
5454
// </copyright>[assembly: AssemblyKeyFile("")]
5555

56+
[assembly: InternalsVisibleTo("Google.PackageMigratorIntegrationTests")]
5657
[assembly: InternalsVisibleTo("Google.UnityPackageManagerResolverTests")]
5758
[assembly: InternalsVisibleTo("Google.UnityPackageManagerClientIntegrationTests")]

source/UnityPackageManagerResolver/UnityPackageManagerResolver.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
</ItemGroup>
6161
<ItemGroup>
6262
<Compile Include="src\PackageManifestModifier.cs" />
63+
<Compile Include="src\PackageMigrator.cs" />
6364
<Compile Include="src\SettingsDialog.cs" />
6465
<Compile Include="src\UnityPackageManagerClient.cs" />
6566
<Compile Include="src\UnityPackageManagerResolver.cs" />

0 commit comments

Comments
 (0)