Fix tests

Author: shana

build.cmd

@@ -10,6 +10,7 @@ SET PUBLIC=""
 SET BUILD=0
 set UPM=0
 set UNITYVERSION=2019.2
+set UNITYBUILD=0
 
 :loop
 IF NOT "%1"=="" (
@@ -43,6 +44,12 @@ IF NOT "%1"=="" (
   IF "%1"=="--upm" (
     SET UPM=1
   )
+  IF "%1"=="-n" (
+    SET UNITYBUILD=1
+  )
+  IF "%1"=="--unity" (
+    SET UNITYBUILD=1
+  )
   IF "%1"=="-c" (
     SET CONFIGURATION=%2
     SHIFT
@@ -51,6 +58,10 @@ IF NOT "%1"=="" (
   GOTO :loop
 )
 
+if "%UNITYBUILD%" == "1" (
+  set CONFIGURATION="%CONFIGURATION%Unity"
+)
+
 if "%APPVEYOR%" == "" (
   dotnet restore
 )

build.sh

@@ -14,6 +14,7 @@ BUILD=0
 UPM=0
 UNITYVERSION=2019.2
 YAMATO=0
+UNITYBUILD=0
 
 while (( "$#" )); do
   case "$1" in
@@ -23,6 +24,9 @@ while (( "$#" )); do
     -r|--release)
       CONFIGURATION="Release"
     ;;
+    -n|--unity)
+      UNITYBUILD=1
+    ;;
     -p|--public)
       PUBLIC="-p:PublicRelease=true"
     ;;
@@ -44,6 +48,10 @@ while (( "$#" )); do
   shift
 done
 
+if [[ x"$UNITYBUILD" == x"1" ]]; then
+  CONFIGURATION="${CONFIGURATION}Unity"
+fi
+
 if [[ x"${YAMATO_JOB_ID:-}" != x"" ]]; then
   YAMATO=1
   export GITLAB_CI=1

pack.cmd

@@ -43,6 +43,12 @@ IF NOT "%1"=="" (
   IF "%1"=="--upm" (
     SET UPM=1
   )
+  IF "%1"=="-n" (
+    SET UNITYBUILD=1
+  )
+  IF "%1"=="--unity" (
+    SET UNITYBUILD=1
+  )
   IF "%1"=="-c" (
     SET CONFIGURATION=%2
     SHIFT
@@ -51,6 +57,10 @@ IF NOT "%1"=="" (
   GOTO :loop
 )
 
+if "%UNITYBUILD%" == "1" (
+  set CONFIGURATION="%CONFIGURATION%Unity"
+)
+
 if "x%BUILD%"=="x1" (
   if "%APPVEYOR%" == "" (
     dotnet restore
@@ -62,6 +72,6 @@ dotnet pack --no-restore --no-build -c %CONFIGURATION% %PUBLIC%
 
 if "x%UPM%"=="x1" (
   call powershell scripts/Pack-Upm.ps1
-) else (
+) else if "x%UNITYBUILD%"=="x0" (
   call powershell scripts/Pack-Npm.ps1
 )

pack.sh

@@ -14,6 +14,7 @@ BUILD=0
 UPM=0
 UNITYVERSION=2019.2
 YAMATO=0
+UNITYBUILD=0
 
 while (( "$#" )); do
   case "$1" in
@@ -32,6 +33,9 @@ while (( "$#" )); do
     -u|--upm)
       UPM=1
     ;;
+    -n|--unity)
+      UNITYBUILD=1
+    ;;
     -c)
       shift
       CONFIGURATION=$1
@@ -44,6 +48,10 @@ while (( "$#" )); do
   shift
 done
 
+if [[ x"$UNITYBUILD" == x"1" ]]; then
+  CONFIGURATION="${CONFIGURATION}Unity"
+fi
+
 if [[ x"${YAMATO_JOB_ID:-}" != x"" ]]; then
   YAMATO=1
   export GITLAB_CI=1
@@ -66,7 +74,9 @@ dotnet pack --no-build --no-restore -c $CONFIGURATION $PUBLIC
 
 if [[ x"$UPM" == x"1" ]]; then
   powershell scripts/Pack-Upm.ps1
-elif [[ x"$OS" == x"Windows" ]]; then
+elif [[ x"$UNITYBUILD" == x"0" ]]; then
+
+if [[ x"$OS" == x"Windows" ]]; then
   powershell scripts/Pack-Npm.ps1
 else
   srcdir="$DIR/build/packages"
@@ -112,5 +122,6 @@ EOL
 }
 EOL
 
+fi
 fi
 popd >/dev/null 2>&1

src/com.unity.editor.tasks/Editor/Unity.Editor.Tasks.csproj

@@ -5,7 +5,6 @@
     <PackageSourceRoot>$(MSBuildProjectDirectory)\..\</PackageSourceRoot>
     <FullBuild Condition="'$(SolutionName)' == 'Unity.Editor.Tasks'">true</FullBuild>
     <IsPackable Condition="'$(FullBuild)' != 'true'">false</IsPackable>
-    <PackageId>com.unity.editor.tasks</PackageId>
     <AssemblyName>Unity.Editor.Tasks</AssemblyName>
     <DefaultNamespace>$(AssemblyName)</DefaultNamespace>
     <Description>A friendly threaded task system for the Unity Editor.</Description>
@@ -15,12 +14,18 @@
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <PackageId>com.unity.editor.tasks</PackageId>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <PackageId>com.unity.editor.tasks</PackageId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='DebugUnity'">
     <DefineConstants>DEBUG;TRACE;UNITY_EDITOR</DefineConstants>
+    <PackageId>Unity.Editor.Tasks</PackageId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='ReleaseUnity'">
     <DefineConstants>UNITY_EDITOR</DefineConstants>
+    <PackageId>Unity.Editor.Tasks</PackageId>
   </PropertyGroup>
 
   <Import Project="$(RootDir)common\unityreferences.targets" Condition="'$(Configuration)'=='DebugUnity' or '$(Configuration)'=='ReleaseUnity'" />

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

@@ -11,7 +11,9 @@
 
 namespace BaseTests
 {
+#if NUNIT
 	using SpoiledCat.Tests.TestWebServer;
+#endif
 	using System.Threading;
 	using Unity.Editor.Tasks.Helpers;
 	using Unity.Editor.Tasks.Internal.IO;