diff --git a/FakeDemo/build.fsx b/FakeDemo/build.fsx index cdd9a66..8c18e29 100644 --- a/FakeDemo/build.fsx +++ b/FakeDemo/build.fsx @@ -6,8 +6,6 @@ open Fake.XamarinHelper let buildDir = "FakeDemo/bin/Debug" let testProj = !! "FakeDemo.UnitTests/FakeDemo.UnitTests.csproj" let testDll = !! "FakeDemo.UnitTests/bin/Debug/FakeDemo.UnitTests.dll" -let uiTestProj = !! "UITests/FakeDemo.UITests.csproj" -let uiTestDll = !! "UITests/bin/Debug/FakeDemo.UITests.dll" Target "Clean" (fun _ -> CleanDir buildDir @@ -19,12 +17,6 @@ Target "Build-UnitTests" (fun _ -> |> Log "---Unit Test build output----" ) -Target "Build-UITests" (fun _ -> - uiTestProj - |> MSBuild "UITests\bin\Debug" "Build" [ ("Configuration", "Debug"); ("Platform", "Any CPU") ] - |> Log "---UI Test build output----" -) - Target "Run-UnitTests" (fun _ -> testDll |> NUnit ( fun defaults -> { @@ -35,32 +27,6 @@ Target "Run-UnitTests" (fun _ -> }) ) -Target "Run-AndroidUITests" (fun _ -> - let source = PackageHelpers.androidPackage() - - let dest = - filename source.FullName - |> sprintf "./RebuyApp.Android.UITests/%s" - |> fileInfo - |> PackageHelpers.moveAndroidApk source - - !! @"./**/RebuyApp.Android.UITests/bin/Release/RebuyApp.Android.UITests.dll" - |> NUnit (fun defaults -> { defaults with ErrorLevel = DontFailBuild }) - - Shell.Exec("adb", "uninstall de.rebuy.android") - |> ignore - - DeleteFile dest.FullName -) - -Target "Run-iOSUITests" (fun _ -> - uiTestDll |> NUnit ( fun defaults -> - { - defaults with ToolPath = "/Library/Frameworks/Mono.framework/Commands/" - ToolName = "nunit-console4" - }) -) - Target "Build-Pcl" (fun _ -> RestorePackages() @@ -93,7 +59,6 @@ Target "Build-Droid" (fun _ -> ==> "Build-Pcl" ==> "Build-iOS" ==> "Build-Droid" - ==> "Build-UITests" - ==> "Run-AndroidUITests" + ==> "Run-UnitTests" RunTargetOrDefault "Run-UnitTests" \ No newline at end of file diff --git a/FakeDemo/packageHelpers.fsx b/FakeDemo/packageHelpers.fsx deleted file mode 100644 index 0366ba1..0000000 --- a/FakeDemo/packageHelpers.fsx +++ /dev/null @@ -1,17 +0,0 @@ -#r "packages/FAKE/tools/FakeLib.dll" -open System.IO -open Fake -open Fake.XamarinHelper - -let androidPackage() = - AndroidPackage (fun defaults -> - { - defaults with - ProjectPath = "Droid/FakeDemo.Droid.csproj" - }) - -let moveAndroidApk (source : FileInfo) (dest : FileInfo) = - DeleteFile dest.FullName - Rename dest.FullName source.FullName - - dest