diff --git a/Build/build.ps1 b/Build/build.ps1 index f16e67d1..aeeee77e 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -210,15 +210,26 @@ function DnxBuild($build) { $name = $build.Name - exec { dnvm install 1.0.0-beta8-15120 -u | Out-Default } + exec { dnvm install 1.0.0-beta8-15120 -r clr -u | Out-Default } exec { dnvm use 1.0.0-beta8-15120 -r clr | Out-Default } Write-Host -ForegroundColor Green "Restoring packages for $name" Write-Host - exec { dnu restore "$workingSourceDir\Newtonsoft.Json\project.json" | Out-Default } + exec { + try { + dnu restore "$workingSourceDir\Newtonsoft.Json\project.json" | Out-Default + Write-Host "Restore last exit code: $lastexitcode" + } + catch [System.Management.Automation.RemoteException] + { + Write-Host "Restore last exit code: $lastexitcode" + Write-Host ("Restore exception: " + $_.ToString()) + $global:lastexitcode = 0 + $lastexitcode = 0 + } + } exec { dnu build "$workingSourceDir\Newtonsoft.Json\project.json" --configuration Release | Out-Default } - exec { dnu build "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release | Out-Default } } function DnxTests($build) @@ -229,11 +240,24 @@ function DnxTests($build) #Write-Host #exec { & $toolsDir\Kvm\kvm.ps1 upgrade -r CoreCLR -NoNative | Out-Default } + exec { dnvm install 1.0.0-beta8-15120 -r coreclr -u | Out-Default } exec { dnvm use 1.0.0-beta8-15120 -r coreclr | Out-Default } Write-Host -ForegroundColor Green "Restoring packages for $name" Write-Host - exec { dnu restore "$workingSourceDir\Newtonsoft.Json.Tests\project.json" | Out-Default } + exec { + try { + dnu restore "$workingSourceDir\Newtonsoft.Json.Tests\project.json" | Out-Default + Write-Host "Restore last exit code: $lastexitcode" + } + catch [System.Management.Automation.RemoteException] + { + Write-Host "Restore last exit code: $lastexitcode" + Write-Host ("Restore exception: " + $_.ToString()) + $global:lastexitcode = 0 + $lastexitcode = 0 + } + } Write-Host -ForegroundColor Green "Ensuring test project builds for $name" Write-Host diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj index 28cdfedf..598a763a 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj @@ -42,7 +42,8 @@ 1.0.0.%2a false true - Client + + true diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Net40.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Net40.csproj index c98380df..6da9dd65 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Net40.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Net40.csproj @@ -42,7 +42,8 @@ 1.0.0.%2a false true - Client + + true diff --git a/Src/Newtonsoft.Json/project.json b/Src/Newtonsoft.Json/project.json index fd5eec61..aacedc30 100644 --- a/Src/Newtonsoft.Json/project.json +++ b/Src/Newtonsoft.Json/project.json @@ -43,7 +43,7 @@ "System.Xml": "" } }, - "net45+win+wp80+wpa81": { + ".NETPortable,Version=v4.5,Profile=Profile259": { "compilationOptions": { "define": [ "PORTABLE" ] }, diff --git a/Src/NuGet.Config b/Src/NuGet.Config index 0257b60e..83b1a4ed 100644 --- a/Src/NuGet.Config +++ b/Src/NuGet.Config @@ -6,5 +6,6 @@ + \ No newline at end of file