moving test script into yml

2 files changed, 40 insertions, 50 deletions

diff --git a/appveyor.yml b/appveyor.yml
index 9b88bf4..f209e3b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -130,9 +130,47 @@ after_build:
         Get-ChildItem $env:SOLUTION_ARTIFACTS_DIRECTORY
     }
 
+# UWP tests are not currently not supported by appveyor: https://github.com/appveyor/ci/issues/393
 test_script:
-  # UWP tests are not currently not supported by appveyor: https://github.com/appveyor/ci/issues/393
-  - ps: .\tools\test.ps1 -configuration $env:Configuration -solutionPath $env:solution_name
+- ps: >-
+    Write-Host "Starting Test Run: $env:solution_name - $env:Configuration"
+
+    if($env:solution_name -like '*PrismLibrary_Core*')
+
+    {
+        Write-Host "Testing Prism Core"
+        dotnet test .\Source\Prism.Tests\Prism.Tests.csproj -c $env:Configuration
+    }
+
+    elseif($env:solution_name -like '*PrismLibrary_Win10*')
+
+    {
+        Write-Host "Testing Windows 10"
+        Write-Host "UWP tests are not currently not supported by appveyor:https://github.com/appveyor/ci/issues/393"
+        vstest.console /logger:Appveyor .\Source\Windows10\Prism.Windows.Tests\bin\$env:Configuration\Prism.Windows.Tests.exe
+    }
+
+    elseif($env:solution_name -like '*PrismLibrary_Wpf*')
+
+    {
+        Write-Host "Testing WPF"
+        vstest.console /logger:Appveyor .\Source\Wpf\\Prism.Wpf.Tests\bin\$env:Configuration\Prism.Wpf.Tests.dll
+        vstest.console /logger:Appveyor .\Source\Wpf\Prism.Autofac.Wpf.Tests\bin\$env:Configuration\Prism.Autofac.Wpf.Tests.dll
+        vstest.console /logger:Appveyor .\Source\Wpf\Prism.DryIoc.Wpf.Tests\bin\$env:Configuration\Prism.DryIoc.Wpf.Tests.dll
+        vstest.console /logger:Appveyor .\Source\Wpf\Prism.Mef.Wpf.Tests\bin\$env:Configuration\Prism.Mef.Wpf.Tests.dll
+        vstest.console /logger:Appveyor .\Source\Wpf\Prism.StructureMap.Wpf.Tests\bin\$env:Configuration\Prism.StructureMap.Wpf.Tests.dll
+        vstest.console /logger:Appveyor .\Source\Wpf\Prism.Unity.Wpf.Tests\bin\$env:Configuration\Prism.Unity.Wpf.Tests.dll
+    }
+
+    elseif($env:solution_name -like '*PrismLibrary_XF*' -and $env:Configuration -eq "Test")
+
+    {
+        Write-Host "Testing Prism Forms"
+        dotnet test .\Source\Xamarin\Prism.Forms.Tests\Prism.Forms.Tests.csproj -c Test --no-build
+        dotnet test .\Source\Xamarin\Prism.Autofac.Forms.Tests\Prism.Autofac.Forms.Tests.csproj -c Test --no-build
+        dotnet test .\Source\Xamarin\Prism.DryIoc.Forms.Tests\Prism.DryIoc.Forms.Tests.csproj -c Test --no-build
+        dotnet test .\Source\Xamarin\Prism.Unity.Forms.Tests\Prism.Unity.Forms.Tests.csproj -c Test --no-build
+    }
 
 artifacts:
   - path: '**\Build\*.nupkg'
diff --git a/tools/test.ps1 b/tools/test.ps1
deleted file mode 100644
index fda6887..0000000
--- a/tools/test.ps1
+++ /dev/null
@@ -1,48 +0,0 @@
-param([string]$solutionPath, [string]$configuration)
-
-Write-Host "Starting Test Run: $solutionPath - $configuration"
-
-if($solutionPath -like '*PrismLibrary_Core*')
-{
-    Write-Host "Testing Prism Core"
-    dotnet test .\Source\Prism.Tests\Prism.Tests.csproj -c $configuration
-}
-elseif($solutionPath -like '*PrismLibrary_Win10*')
-{
-    Write-Host "Testing Windows 10"
-    Write-Host "UWP tests are not currently not supported by appveyor: https://github.com/appveyor/ci/issues/393"
-    # Write-Host "listing current directory"
-    # ls
-    # Write-Host "listing source directory"
-    # ls ./Source
-    # Write-Host "listing Windows10 directory"
-    # ls ./Source/Windows10
-    # Write-Host "listing Windows Tests directory"
-    # ls ./Source/Windows10/Prism.Windows.Tests
-    # Write-Host "listing bin directory"
-    # ls ./Source/Windows10/Prism.Windows.Tests/bin
-    # Write-Host "listing Release binary"
-    # ls ./Source/Windows10/Prism.Windows.Tests/bin/Release
-    # Get-ChildItem ./Source/Windows10/Prism.Windows.Tests/bin
-    # xunit.console .\Source\Windows10\Prism.Windows.Tests\bin\Debug\Prism.Windows.Tests.dll /appveyor
-    vstest.console /logger:Appveyor .\Source\Windows10\Prism.Windows.Tests\bin\$configuration\Prism.Windows.Tests.exe
-}
-elseif($solutionPath -like '*PrismLibrary_Wpf*')
-{
-    Write-Host "Testing WPF"
-    # ls Source\Wpf\Prism.Wpf.Tests\bin
-    vstest.console /logger:Appveyor .\Source\Wpf\\Prism.Wpf.Tests\bin\$configuration\Prism.Wpf.Tests.dll
-    vstest.console /logger:Appveyor .\Source\Wpf\Prism.Autofac.Wpf.Tests\bin\$configuration\Prism.Autofac.Wpf.Tests.dll
-    vstest.console /logger:Appveyor .\Source\Wpf\Prism.DryIoc.Wpf.Tests\bin\$configuration\Prism.DryIoc.Wpf.Tests.dll
-    vstest.console /logger:Appveyor .\Source\Wpf\Prism.Mef.Wpf.Tests\bin\$configuration\Prism.Mef.Wpf.Tests.dll
-    vstest.console /logger:Appveyor .\Source\Wpf\Prism.StructureMap.Wpf.Tests\bin\$configuration\Prism.StructureMap.Wpf.Tests.dll
-    vstest.console /logger:Appveyor .\Source\Wpf\Prism.Unity.Wpf.Tests\bin\$configuration\Prism.Unity.Wpf.Tests.dll
-}
-elseif($solutionPath -like '*PrismLibrary_XF*' -and $configuration -eq "Test")
-{
-    Write-Host "Testing Prism Forms"
-    dotnet test .\Source\Xamarin\Prism.Forms.Tests\Prism.Forms.Tests.csproj -c Test --no-build
-    dotnet test .\Source\Xamarin\Prism.Autofac.Forms.Tests\Prism.Autofac.Forms.Tests.csproj -c Test --no-build
-    dotnet test .\Source\Xamarin\Prism.DryIoc.Forms.Tests\Prism.DryIoc.Forms.Tests.csproj -c Test --no-build
-    dotnet test .\Source\Xamarin\Prism.Unity.Forms.Tests\Prism.Unity.Forms.Tests.csproj -c Test --no-build
-}
\ No newline at end of file