diff --git a/.travis.yml b/.travis.yml index 016965ce31..d9f978c4d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ matrix: - os: linux dist: trusty sudo: required - dotnet: 1.0.4 + dotnet: 2.0.3 - os: osx osx_image: xcode8.3 - dotnet: 1.0.4 + dotnet: 2.0.3 before_script: - if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj index 7b86824986..9ec5bb01ea 100644 --- a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj +++ b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj @@ -4,7 +4,7 @@ Convention-based tests for Octokit Octokit.Tests.Conventions GitHub - netcoreapp1.0;net452 + netcoreapp2.0;net452 $(NoWarn);CS4014;CS1998 Octokit.Tests.Conventions Octokit.Tests.Conventions diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj index 726470a412..9ed8fc2720 100644 --- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj +++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj @@ -4,7 +4,7 @@ Integration tests for Octokit Octokit.Tests.Integration GitHub - netcoreapp1.0;net452 + netcoreapp2.0;net452 $(NoWarn);CS4014;CS1998 Octokit.Tests.Integration Octokit.Tests.Integration diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj index 09f702ac02..d53e8befbe 100644 --- a/Octokit.Tests/Octokit.Tests.csproj +++ b/Octokit.Tests/Octokit.Tests.csproj @@ -4,7 +4,7 @@ Tests for Octokit Octokit.Tests GitHub - netcoreapp1.0;net452 + netcoreapp2.0;net452 $(NoWarn);CS4014;CS1998 Octokit.Tests Octokit.Tests @@ -32,7 +32,7 @@ - + $(DefineConstants);NO_SERIALIZABLE;HAS_TYPEINFO diff --git a/build.ps1 b/build.ps1 index e4fcc58b21..2cceda4763 100644 --- a/build.ps1 +++ b/build.ps1 @@ -32,9 +32,9 @@ Param( [string[]]$ScriptArgs ) -$DotNetChannel = "preview"; -$DotNetVersion = "1.0.4"; -$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.1/scripts/obtain/dotnet-install.ps1"; +$DotNetChannel = "2.0"; +$DotNetVersion = "2.0.3"; +$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1"; $NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" # Make sure tools folder exists @@ -65,7 +65,7 @@ if (Get-Command dotnet -ErrorAction SilentlyContinue) { $FoundDotNetCliVersion = dotnet --version; } -if($FoundDotNetCliVersion -ne $DotNetVersion) { +if($FoundDotNetCliVersion -lt $DotNetVersion) { $InstallPath = Join-Path $PSScriptRoot ".dotnet" if (!(Test-Path $InstallPath)) { mkdir -Force $InstallPath | Out-Null; diff --git a/build/Build.csproj b/build/Build.csproj index 725a902448..00ec86fa0a 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp1.1 + netcoreapp2.0 diff --git a/build/Context.cs b/build/Context.cs index 0fbaedb524..12f6cb437f 100644 --- a/build/Context.cs +++ b/build/Context.cs @@ -36,7 +36,7 @@ public DotNetCoreTestSettings GetTestSettings() if (!this.IsRunningOnWindows()) { - var testFramework = "netcoreapp1.0"; + var testFramework = "netcoreapp2.0"; this.Information($"Running tests against {testFramework} only as we're not on Windows."); settings.Framework = testFramework;