-Build

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

Src/Newtonsoft.Json/Newtonsoft.Json.Net35.csproj

@@ -42,7 +42,8 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Src/Newtonsoft.Json/Newtonsoft.Json.Net40.csproj

@@ -42,7 +42,8 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Src/Newtonsoft.Json/project.json

@@ -43,7 +43,7 @@
         "System.Xml": ""
       }
     },
-    "net45+win+wp80+wpa81": {
+    ".NETPortable,Version=v4.5,Profile=Profile259": {
       "compilationOptions": {
         "define": [ "PORTABLE" ]
       },

Src/NuGet.Config

@@ -6,5 +6,6 @@
     <add key="CI Builds (aspnetvnext)" value="https://www.myget.org/F/aspnetvnext/" />
     <add key="CI Builds (xunit)" value="https://www.myget.org/F/xunit/" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="nuget.org/api/v2" value="https://nuget.org/api/v2/" />
   </packageSources>
 </configuration>