This commit is contained in:
James Newton-King
2015-08-23 21:33:15 +12:00
parent f486f9acdb
commit 32869955f1
5 changed files with 34 additions and 7 deletions
+28 -4
View File
@@ -210,15 +210,26 @@ function DnxBuild($build)
{ {
$name = $build.Name $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 } exec { dnvm use 1.0.0-beta8-15120 -r clr | Out-Default }
Write-Host -ForegroundColor Green "Restoring packages for $name" Write-Host -ForegroundColor Green "Restoring packages for $name"
Write-Host 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\project.json" --configuration Release | Out-Default }
exec { dnu build "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release | Out-Default }
} }
function DnxTests($build) function DnxTests($build)
@@ -229,11 +240,24 @@ function DnxTests($build)
#Write-Host #Write-Host
#exec { & $toolsDir\Kvm\kvm.ps1 upgrade -r CoreCLR -NoNative | Out-Default } #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 } exec { dnvm use 1.0.0-beta8-15120 -r coreclr | Out-Default }
Write-Host -ForegroundColor Green "Restoring packages for $name" Write-Host -ForegroundColor Green "Restoring packages for $name"
Write-Host 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 -ForegroundColor Green "Ensuring test project builds for $name"
Write-Host Write-Host
@@ -42,7 +42,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@@ -42,7 +42,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile>Client</TargetFrameworkProfile> <TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
+1 -1
View File
@@ -43,7 +43,7 @@
"System.Xml": "" "System.Xml": ""
} }
}, },
"net45+win+wp80+wpa81": { ".NETPortable,Version=v4.5,Profile=Profile259": {
"compilationOptions": { "compilationOptions": {
"define": [ "PORTABLE" ] "define": [ "PORTABLE" ]
}, },
+1
View File
@@ -6,5 +6,6 @@
<add key="CI Builds (aspnetvnext)" value="https://www.myget.org/F/aspnetvnext/" /> <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="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="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> </packageSources>
</configuration> </configuration>