-Build
This commit is contained in:
+3
-3
@@ -11,7 +11,7 @@
|
|||||||
$buildNuGet = $true
|
$buildNuGet = $true
|
||||||
$treatWarningsAsErrors = $false
|
$treatWarningsAsErrors = $false
|
||||||
$workingName = if ($workingName) {$workingName} else {"Working"}
|
$workingName = if ($workingName) {$workingName} else {"Working"}
|
||||||
$dnvmVersion = "1.0.0-beta8-15654"
|
$dnvmVersion = "1.0.0-beta8"
|
||||||
|
|
||||||
$baseDir = resolve-path ..
|
$baseDir = resolve-path ..
|
||||||
$buildDir = "$baseDir\Build"
|
$buildDir = "$baseDir\Build"
|
||||||
@@ -209,7 +209,7 @@ function DnxBuild($build)
|
|||||||
$name = $build.Name
|
$name = $build.Name
|
||||||
$projectPath = "$workingSourceDir\Newtonsoft.Json\project.json"
|
$projectPath = "$workingSourceDir\Newtonsoft.Json\project.json"
|
||||||
|
|
||||||
exec { dnvm install $dnvmVersion -r clr -u | Out-Default }
|
exec { dnvm install $dnvmVersion -r clr | Out-Default }
|
||||||
exec { dnvm use $dnvmVersion -r clr | Out-Default }
|
exec { dnvm use $dnvmVersion -r clr | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
||||||
@@ -240,7 +240,7 @@ 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 $dnvmVersion -r coreclr -u | Out-Default }
|
exec { dnvm install $dnvmVersion -r coreclr | Out-Default }
|
||||||
exec { dnvm use $dnvmVersion -r coreclr | Out-Default }
|
exec { dnvm use $dnvmVersion -r coreclr | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
||||||
|
|||||||
@@ -196,7 +196,7 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
|
|
||||||
Assert.AreEqual(3, a.Count);
|
Assert.AreEqual(3, a.Count);
|
||||||
Assert.AreEqual(JTokenType.Integer, a[0].Type);
|
Assert.AreEqual(JTokenType.Integer, a[0].Type);
|
||||||
Assert.AreEqual(1, ((JValue)a[0]).Value);
|
Assert.AreEqual(1L, ((JValue)a[0]).Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"projects": [ "src" ],
|
"projects": [ "src" ],
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "1.0.0-beta8-15654"
|
"version": "1.0.0-beta8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user