From 62fdcf7be25f66d541c3901c51a0573729b7538e Mon Sep 17 00:00:00 2001 From: Mitchell Duncan Date: Tue, 12 Jun 2018 14:21:37 +1200 Subject: [PATCH] Removong the windows phone compile step from the main build script, so it can live in its own script. --- build.ps1 | 9 ++------- buildWindowsPhone.bat | 4 ++++ buildWindowsPhone.ps1 | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 buildWindowsPhone.bat create mode 100644 buildWindowsPhone.ps1 diff --git a/build.ps1 b/build.ps1 index 31cc12d9..590aed87 100644 --- a/build.ps1 +++ b/build.ps1 @@ -9,7 +9,6 @@ properties { $solution_file_webjob = "$root/Mindscape.Raygun4Net.Azure.WebJob.sln" $solution_file_webapi = "$root/Mindscape.Raygun4Net.WebApi.sln" $solution_file_winrt = "$root/Mindscape.Raygun4Net.WinRT.sln" - $solution_file_windows_phone = "$root/Mindscape.Raygun4Net.WindowsPhone.sln" $configuration = "Release" $build_dir = "$root\build\" $build_dir_client_profile = "$build_dir\Net3.ClientProfile" @@ -25,7 +24,7 @@ properties { $env:Path += ";$nunit_dir;$tools_dir;$nuget_dir" } -task default -depends Compile, CompileWinRT, CompileWindowsPhone +task default -depends Compile, CompileWinRT task Clean { remove-item -force -recurse $build_dir -ErrorAction SilentlyContinue | Out-Null @@ -57,11 +56,7 @@ task CompileWinRT -depends Init { remove-item -force -recurse $build_dir/Mindscape.Raygun4Net.WinRT.Tests -ErrorAction SilentlyContinue | Out-Null } -task CompileWindowsPhone -depends Init { - exec { msbuild "$solution_file_windows_phone" /m /p:OutDir=$build_dir /p:Configuration=$Configuration } -} - -task Test -depends Compile, CompileWinRT, CompileWindowsPhone, CompileWindowsStore { +task Test -depends Compile, CompileWinRT { $test_assemblies = Get-ChildItem $build_dir -Include *Tests.dll -Name Push-Location -Path $build_dir diff --git a/buildWindowsPhone.bat b/buildWindowsPhone.bat new file mode 100644 index 00000000..15262a1c --- /dev/null +++ b/buildWindowsPhone.bat @@ -0,0 +1,4 @@ +set EnableNuGetPackageRestore=true +call .\packages\psake.4.3.2\tools\psake.cmd buildWindowsPhone.ps1 %* + +pause \ No newline at end of file diff --git a/buildWindowsPhone.ps1 b/buildWindowsPhone.ps1 new file mode 100644 index 00000000..ca926086 --- /dev/null +++ b/buildWindowsPhone.ps1 @@ -0,0 +1,34 @@ +properties { + $root = $psake.build_script_dir + $solution_file = "$root/Mindscape.Raygun4Net.WindowsPhone.sln" + $configuration = "Release" + $build_dir = "$root\build\WindowsPhone\" + $nunit_dir = "$root\packages\NUnit.Runners.2.6.2\tools\" + $tools_dir = "$root\tools" + $nuget_dir = "$root\.nuget" + $env:Path += ";$nunit_dir;$tools_dir;$nuget_dir" +} + +task default -depends Compile + +task Clean { + remove-item -force -recurse $build_dir -ErrorAction SilentlyContinue | Out-Null +} + +task Init -depends Clean { + new-item $build_dir -itemType directory | Out-Null +} + +task Compile -depends Init { + exec { msbuild "$solution_file" /m /p:OutDir=$build_dir /p:Configuration=$Configuration } +} + +task Test -depends Compile { + $test_assemblies = Get-ChildItem $build_dir -Include *Tests.dll -Name + + Push-Location -Path $build_dir + + exec { nunit-console.exe $test_assemblies } + + Pop-Location +}