From 26ef3faa11a23cb9ebc962fd87d382fdbd3a8ed9 Mon Sep 17 00:00:00 2001 From: Tom Pallister Date: Wed, 11 Jul 2018 06:28:08 +0100 Subject: [PATCH] upgraded packages to netcoreapp2.1 Ocelot is still netstandard2.0 (#455) * upgraded packages to netcoreapp2.1 Ocelot is still netstandard2.0 * try get latest sdk travis * try get specific sdk travis --- .travis.yml | 2 +- src/Ocelot/Ocelot.csproj | 48 +++++++++---------- .../Ocelot.AcceptanceTests.csproj | 27 +++++------ .../Ocelot.Benchmarks.csproj | 3 +- .../Ocelot.IntegrationTests.csproj | 27 +++++------ .../Ocelot.ManualTest.csproj | 28 ++++++----- test/Ocelot.UnitTests/Ocelot.UnitTests.csproj | 25 +++++----- 7 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef0701aad..192d14b7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ osx_image: xcode9.2 mono: - 4.4.2 -dotnet: 2.1.4 +dotnet: 2.1.301 before_install: - git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags diff --git a/src/Ocelot/Ocelot.csproj b/src/Ocelot/Ocelot.csproj index 8224be2ca..4d13aeda1 100644 --- a/src/Ocelot/Ocelot.csproj +++ b/src/Ocelot/Ocelot.csproj @@ -25,37 +25,37 @@ True - + NU1701 - - - - - - - - - - + + + + + + + + + + NU1701 - - - - + + + + all - - - - - - - - - + + + + + + + + + diff --git a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj index dd9d855cc..c4e902fd0 100644 --- a/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj +++ b/test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj @@ -1,8 +1,7 @@  0.0.0-dev - netcoreapp2.0 - 2.0.0 + netcoreapp2.1 Ocelot.AcceptanceTests Exe Ocelot.AcceptanceTests @@ -34,25 +33,25 @@ - - - + + + all - - - - - - - - + + + + + + + + - + diff --git a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj index e97450d38..e7d255c92 100644 --- a/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj +++ b/test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj @@ -2,8 +2,7 @@ 0.0.0-dev - netcoreapp2.0 - 2.0.0 + netcoreapp2.1 Ocelot.Benchmarks Exe Ocelot.Benchmarks diff --git a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj index 5b2cac213..19bf854fb 100644 --- a/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj +++ b/test/Ocelot.IntegrationTests/Ocelot.IntegrationTests.csproj @@ -1,8 +1,7 @@ - + 0.0.0-dev - netcoreapp2.0 - 2.0.0 + netcoreapp2.1 Ocelot.IntegrationTests Exe Ocelot.IntegrationTests @@ -25,26 +24,26 @@ - - + + all - - - - - - - + + + + + + + - + - + diff --git a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj index b7c3ac18f..d9ddff9c4 100644 --- a/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj +++ b/test/Ocelot.ManualTest/Ocelot.ManualTest.csproj @@ -1,8 +1,7 @@ - + 0.0.0-dev - netcoreapp2.0 - 2.0.0 + netcoreapp2.1 true Ocelot.ManualTest Exe @@ -15,6 +14,11 @@ PreserveNewest + + + PreserveNewest + + PreserveNewest @@ -24,15 +28,15 @@ - - - - - - - - - + + + + + + + + + all diff --git a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj index a1908e7af..cb7110b40 100644 --- a/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj +++ b/test/Ocelot.UnitTests/Ocelot.UnitTests.csproj @@ -2,8 +2,7 @@ 0.0.0-dev - netcoreapp2.0 - 2.0.0 + netcoreapp2.1 Ocelot.UnitTests Ocelot.UnitTests Exe @@ -38,22 +37,22 @@ - - - + + + all - - - - - - - - + + + + + + + +