Skip to content

Commit 1dd774d

Browse files
author
Stewart Miles
committed
Unity Package Manager client and integration test.
Added thread safe client for the Unity Package Manager that can be compiled into a DLL that works across multiple Unity versions. Bug: 150471207 Change-Id: Ifa66403a9c9881c1aead23d8fbf248141e6fe9d1
1 parent de7accc commit 1dd774d

File tree

8 files changed

+1785
-2
lines changed

8 files changed

+1785
-2
lines changed

build.gradle

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1715,7 +1715,8 @@ createNUnitTask(
17151715
Task compileUnityPackageManagerResolverTests = createXbuildTask(
17161716
"compileUnityPackageManagerResolverTests",
17171717
"Compile tests for UnityPackageManagerResolver.",
1718-
project.ext.pluginSolutionFile, "UnityPackageManagerResolverTests",
1718+
project.ext.pluginSolutionFile,
1719+
"UnityPackageManagerResolverTests",
17191720
fileTree(new File(
17201721
new File(
17211722
new File(project.ext.pluginSourceDir,
@@ -1849,6 +1850,19 @@ createUnityIntegrationTest(
18491850
"source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject"),
18501851
["-buildTarget", "android"])
18511852

1853+
createUnityIntegrationTest(
1854+
"testUnityPackageManagerClientIntegrationTests",
1855+
("Imports the plugin into a Unity project and uses the Unity Package " +
1856+
"Manager client to list, search, install and remove packages. "),
1857+
[compileUnityPackageManagerResolver],
1858+
"UnityPackageManagerClientIntegrationTests",
1859+
fileTree(new File(new File(new File(project.ext.pluginSourceDir,
1860+
"UnityPackageManagerResolver"), "test"),
1861+
"UnityPackageManagerClientIntegrationTests")),
1862+
[new File("Google.UnityPackageManagerClientIntegrationTests.dll"),
1863+
new File("Google.UnityPackageManagerClientIntegrationTests.dll.mdb")],
1864+
null, [])
1865+
18521866
task cleanTests(type: Delete) {
18531867
description "Clean test directories."
18541868
delete project.ext.testDir

source/ExternalDependencyManager.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerResolver
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerResolverTests", "UnityPackageManagerResolver\unit_tests\UnityPackageManagerResolverTests.csproj", "{FEECDCE1-F528-4931-A4CF-808DDBCE1A8D}"
2525
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityPackageManagerClientIntegrationTests", "UnityPackageManagerResolver\test\UnityPackageManagerClientIntegrationTests.csproj", "{00A0DB5E-1120-24C9-331A-BE692C1F7C01}"
27+
EndProject
2628
Global
2729
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2830
Debug|Any CPU = Debug|Any CPU
@@ -73,5 +75,9 @@ Global
7375
{FEECDCE1-F528-4931-A4CF-808DDBCE1A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
7476
{FEECDCE1-F528-4931-A4CF-808DDBCE1A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
7577
{FEECDCE1-F528-4931-A4CF-808DDBCE1A8D}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{00A0DB5E-1120-24C9-331A-BE692C1F7C01}.Release|Any CPU.Build.0 = Release|Any CPU
7682
EndGlobalSection
7783
EndGlobal

source/UnityPackageManagerResolver/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454
// </copyright>[assembly: AssemblyKeyFile("")]
5555

5656
[assembly: InternalsVisibleTo("Google.UnityPackageManagerResolverTests")]
57-
57+
[assembly: InternalsVisibleTo("Google.UnityPackageManagerClientIntegrationTests")]

source/UnityPackageManagerResolver/UnityPackageManagerResolver.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<ItemGroup>
6262
<Compile Include="src\PackageManifestModifier.cs" />
6363
<Compile Include="src\SettingsDialog.cs" />
64+
<Compile Include="src\UnityPackageManagerClient.cs" />
6465
<Compile Include="src\UnityPackageManagerResolver.cs" />
6566
<Compile Include="src\XmlUnityPackageManagerRegistries.cs" />
6667
<Compile Include="src\UnityPackageManagerRegistry.cs" />

0 commit comments

Comments
 (0)