FIXUP: Everything potentially fixed...

Author: daviwil

.build.ps1

@@ -5,11 +5,8 @@ param(
 
 #Requires -Modules @{ModuleName="InvokeBuild";ModuleVersion="3.2.1"}
 
-# AppVeyor causes trouble with the build platform, fix that
-# by setting the environment variable that MSBuild picks up
-$script:BuildPlatform = "Any CPU"
 if ($env:APPVEYOR -ne $null) {
-    # $env:Platform = "AnyCPU"
+    dotnet --info
 }
 
 task SetupDotNet -Before Clean, Build, BuildHost, Test, TestPowerShellApi {
@@ -64,23 +61,30 @@ task SetupDotNet -Before Clean, Build, BuildHost, Test, TestPowerShellApi {
     Write-Host "`n### Using dotnet at path $script:dotnetExe`n" -ForegroundColor Green
 }
 
+task Restore {
+    exec { & dotnet restore -v:m .\PowerShellEditorServices.sln }
+}
+
 task Clean {
-    # exec { & dotnet clean .\PowerShellEditorServices.sln -- /p:Platform="$script:BuildPlatform" }
-    exec { & dotnet clean -v:diag .\src\PowerShellEditorServices\PowerShellEditorServices.csproj }
+    exec { & dotnet clean .\PowerShellEditorServices.sln }
 }
 
 function BuildForPowerShellVersion($version) {
-    exec { & dotnet restore .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -- /p:PowerShellVersion=$version /p:Platform="$script:BuildPlatform" }
+    # Restore packages for the specified version
+    exec { & dotnet restore .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -- /p:PowerShellVersion=$version }
 
     Write-Host -ForegroundColor Green "`n### Testing API usage for PowerShell $version...`n"
-    exec { & dotnet build -f net451 .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -- /p:PowerShellVersion=$version /p:Platform="$script:BuildPlatform" }
+    exec { & dotnet build -f net451 .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -- /p:PowerShellVersion=$version }
 }
 
 task TestPowerShellApi {
     BuildForPowerShellVersion v3
     BuildForPowerShellVersion v4
     BuildForPowerShellVersion v5r1
     BuildForPowerShellVersion v5r2
+
+    # Do a final restore to put everything back to normal
+    exec { & dotnet restore .\src\PowerShellEditorServices\PowerShellEditorServices.csproj }
 }
 
 task BuildHost {
@@ -89,8 +93,7 @@ task BuildHost {
 }
 
 task Build {
-    exec { & dotnet restore -v:m .\PowerShellEditorServices.sln -- /p:Platform="$script:BuildPlatform" }
-    exec { & dotnet build -c $Configuration .\PowerShellEditorServices.sln -- /p:Platform="$script:BuildPlatform" }
+    exec { & dotnet build -c $Configuration .\PowerShellEditorServices.sln }
 }
 
 task Test {
@@ -99,9 +102,9 @@ task Test {
         $testParams = @{"l" = "appveyor"}
     }
 
-    exec { & dotnet test -c $Configuration @testParams .\test\PowerShellEditorServices.Test\PowerShellEditorServices.Test.csproj -- /p:Platform="$script:BuildPlatform" }
-    exec { & dotnet test -c $Configuration @testParams .\test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj -- /p:Platform="$script:BuildPlatform" }
-    exec { & dotnet test -c $Configuration @testParams .\test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj -- /p:Platform="$script:BuildPlatform" }
+    exec { & dotnet test -c $Configuration @testParams .\test\PowerShellEditorServices.Test\PowerShellEditorServices.Test.csproj }
+    exec { & dotnet test -c $Configuration @testParams .\test\PowerShellEditorServices.Test.Protocol\PowerShellEditorServices.Test.Protocol.csproj }
+    exec { & dotnet test -c $Configuration @testParams .\test\PowerShellEditorServices.Test.Host\PowerShellEditorServices.Test.Host.csproj }
 }
 
 task LayoutModule -After Build, BuildHost {
@@ -114,4 +117,5 @@ task LayoutModule -After Build, BuildHost {
     Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\netstandard1.6\* -Filter Microsoft.PowerShell.EditorServices*.dll -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\
 }
 
-task . Clean, Build, Test, TestPowerShellApi
+# The default task is to run the entire CI build
+task . Restore, Clean, Build, Test, TestPowerShellApi