From a48ccc781c07a29d44999cdd9c0865ecdddf42de Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 16 Oct 2015 21:42:59 +1300 Subject: [PATCH] -Build --- Build/build.ps1 | 6 +++--- Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs | 2 +- Src/global.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index ed694d51..5f32aefd 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -11,7 +11,7 @@ $buildNuGet = $true $treatWarningsAsErrors = $false $workingName = if ($workingName) {$workingName} else {"Working"} - $dnvmVersion = "1.0.0-beta8-15654" + $dnvmVersion = "1.0.0-beta8" $baseDir = resolve-path .. $buildDir = "$baseDir\Build" @@ -209,7 +209,7 @@ function DnxBuild($build) $name = $build.Name $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 } Write-Host -ForegroundColor Green "Restoring packages for $name" @@ -240,7 +240,7 @@ function DnxTests($build) #Write-Host #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 } Write-Host -ForegroundColor Green "Restoring packages for $name" diff --git a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs index c9dfffa2..f2934bf3 100644 --- a/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs +++ b/Src/Newtonsoft.Json.Tests/Linq/LinqToJsonTest.cs @@ -196,7 +196,7 @@ namespace Newtonsoft.Json.Tests.Linq Assert.AreEqual(3, a.Count); Assert.AreEqual(JTokenType.Integer, a[0].Type); - Assert.AreEqual(1, ((JValue)a[0]).Value); + Assert.AreEqual(1L, ((JValue)a[0]).Value); } [Test] diff --git a/Src/global.json b/Src/global.json index 2582cc8c..3b28590b 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0-beta8-15654" + "version": "1.0.0-beta8" } }