Really fix upm testing

Author: shana

.yamato/build.yml

@@ -11,15 +11,14 @@ build:
 
   commands:
     - powershell scripts\Get-Deps.ps1
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
     - build.cmd
     - test.cmd
-    - pack.cmd -u
+    - pack.cmd
 
   artifacts:
     nuget:
       paths:
-        - "build/nuget/**/*.nupkg"
+        - "build/nuget/**/*nupkg"
         - "nuget.config"
     packman:
       paths:
@@ -33,4 +32,4 @@ build:
         - "tests/**/TestResults/*"
     sources:
       paths:
-        - "build/upm/**/*"
+        - "build/packages/**/*"

.yamato/publish.yml

@@ -52,7 +52,7 @@ publish_packman:
   commands:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
 {% for package in packages %}
-    - upm-ci package publish --package-path build\upm\{{ package.name }}
+    - upm-ci package publish --package-path build\packages\{{ package.name }}
 {% endfor %}
 
   dependencies:

.yamato/test.yml

@@ -12,7 +12,7 @@ test_{{ platform.name }}_{{ editor.version }}:
   commands:
     - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
 {% for package in packages %}
-    - upm-ci package test --package-path build\upm\{{ package.name }} -u {{editor.version}}
+    - upm-ci package test --package-path build\packages\{{ package.name }} -u {{editor.version}}
 {% endfor %}
 
   dependencies:

common/packaging.targets

@@ -25,7 +25,7 @@
   <Target Name="EnumeratePackageFiles" Returns="@(SourcesToCopy)">
     <CreateItem
       Include="$(PackageSourceRootFull)**\*.*;$(RootDir)\extras\$(PackageName)\**\*.*"
-      Exclude="$(PackageSourceRootFull)**\*.csproj*;$(PackageSourceRootFull)**\*.ncrunch*;$(PackageSourceRootFull)**\obj\**;$(PackageSourceRootFull)version.json*;$(PackageSourceRootFull)Tests\**;$(RootDir)\extras\$(PackageName)\Tests\**">
+      Exclude="$(PackageSourceRootFull)**\*.csproj*;$(PackageSourceRootFull)**\*.ncrunch*;$(PackageSourceRootFull)**\obj\**;$(PackageSourceRootFull)version.json*;$(PackageSourceRootFull)Tests\**;$(RootDir)\extras\$(PackageName)\Tests\**;$(PackageSourceRootFull)Tests.meta">
       <Output TaskParameter="Include" ItemName="SourcesToCopy" />
     </CreateItem>
   </Target>

scripts/Pack-Upm.ps1

@@ -17,20 +17,26 @@ $srcDir = Join-Path $rootDirectory 'src'
 
 New-Item -itemtype Directory -Path $upmDir -Force -ErrorAction SilentlyContinue
 
+# the loops I have to go throught to get upm to do the right thing...
 Get-ChildItem -Directory $srcDir | % {
     Write-Output "Packing $($_.Name)"
 
+    $pkgdir = Join-Path $upmDir $_.Name
+
     $src = Join-Path $packagesDir $_.Name
     $target = $upmDir
     Copy-Item $src $target -Recurse -Force -ErrorAction SilentlyContinue
 
-    $packageDir = Join-Path $srcDir $_.Name
-    $src = Join-Path $packageDir "Tests"
-    $target = Join-Path $upmDir $_.Name
-    Copy-Item $src $target -Recurse -Force -ErrorAction SilentlyContinue
-    $src = Join-Path $packageDir "Tests.meta"
-    $target = Join-Path $upmDir $_.Name
+    $src = "$srcDir\$($_.Name)\Tests.meta"
+    $target = $pkgdir
     Copy-Item $src $target -Force -ErrorAction SilentlyContinue
-    $packageDir = Join-Path $upmDir $_.Name
-    Invoke-Command -Fatal { & upm-ci package pack --package-path $packageDir }
+
+    $testsdir = Join-Path $pkgdir "Tests"
+    New-Item -itemtype Directory -Path $testsdir -Force -ErrorAction SilentlyContinue
+
+    $src = "$packagesDir\$($_.Name).tests\*"
+    $target = "$testsdir\"
+    Copy-Item $src $target -Recurse -Force -ErrorAction SilentlyContinue
+
+    Invoke-Command -Fatal { & upm-ci package pack --package-path $pkgdir }
 }

src/com.unity.editor.tasks/Tests/Editor/UnityBaseTest.cs

@@ -110,9 +110,13 @@ internal SPath TestApp
 						testApp = "Packages/com.unity.editor.tasks.tests/Helpers~/Helper.CommandLine.exe".ToSPath().Resolve();
 						if (!testApp.Value.FileExists())
 						{
-							Debug.LogException(new InvalidOperationException(
-								"Test helper binaries are missing. Build the UnityTools.sln solution once with `dotnet build` in order to set up the tests."));
-							testApp = SPath.Default;
+							testApp = "Packages/com.unity.editor.tasks.tests/Tests/Helpers~/Helper.CommandLine.exe".ToSPath().Resolve();
+							if (!testApp.Value.FileExists())
+							{
+								Debug.LogException(new InvalidOperationException(
+									"Test helper binaries are missing. Build the UnityTools.sln solution once with `dotnet build` in order to set up the tests."));
+								testApp = SPath.Default;
+							}
 						}
 					}
 				}