From 977da566dcdff74f5fa568010fbf746e8f774e44 Mon Sep 17 00:00:00 2001 From: Gabriel Weyer Date: Wed, 6 Jun 2018 20:52:09 +1000 Subject: [PATCH] Upgrade to .NET Core 2.1 - Update all NuGet packages - Use `dotnet test` instead of `dotnet xunit` --- README.md | 2 +- appveyor.yml | 2 +- build.cake | 21 +++++++------------ .../BeanstalkWorker.SimpleRouting.csproj | 12 +++++------ src/Core/Core.csproj | 14 ++++++------- src/SampleWeb/SampleWeb.csproj | 18 ++++++++-------- src/SampleWorker/SampleWorker.csproj | 16 +++++++------- ...BeanstalkWorker.SimpleRouting.Tests.csproj | 16 +++++++------- 8 files changed, 47 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 71b560b..47e09f8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ | CI | Status | Platform(s) | Framework(s) | Test Framework(s) | | --- | --- | --- | --- | --- | -| [AppVeyor][app-veyor] | [![Build Status][app-veyor-shield]][app-veyor] | `Windows` | `nestandard2.0` | `netcoreapp2.0.5` | +| [AppVeyor][app-veyor] | [![Build Status][app-veyor-shield]][app-veyor] | `Windows` | `nestandard2.0` | `netcoreapp2.1.0` | Allows to route a `SQS` message to a specific endpoint on the `Worker` instead of having a single endpoint handling all the messages. diff --git a/appveyor.yml b/appveyor.yml index 4ab664e..43eba20 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -78,7 +78,7 @@ install: # The runtime is required to run a `.NET Core` application, it's part of the `SDK` # https://github.com/dotnet/core/blob/master/release-notes/download-archive.md - ps: .\build\dotnet-install.ps1 -SharedRuntime -Version 1.0.9 - # `SimpleRouting` is targeting `.NET Core` `2.0`, so we can safely install the latest `SDK` + # `SimpleRouting` is targeting `.NET Core` `2.1`, so we can safely install the latest `SDK` # The `SDK` is required to restore, build, publish... a `.NET Core` application # https://www.microsoft.com/net/download/windows - ps: .\build\dotnet-install.ps1 -Channel Current diff --git a/build.cake b/build.cake index 5f7693c..8fa7333 100644 --- a/build.cake +++ b/build.cake @@ -76,22 +76,15 @@ Task("Test") .IsDependentOn("Build") .Does(() => { - var settings = new DotNetCoreToolSettings(); - - var argumentsBuilder = new ProcessArgumentBuilder() - .Append("-configuration") - .Append(configuration) - .Append("-nobuild"); - - var projectFiles = GetFiles("./tests/*/*.Tests.csproj"); - - foreach (var projectFile in projectFiles) + var settings = new DotNetCoreTestSettings { - var testResultsFile = testsResultsDir.Combine($"{projectFile.GetFilenameWithoutExtension()}.xml"); - var arguments = $"{argumentsBuilder.Render()} -xml \"{testResultsFile}\""; + Configuration = configuration, + NoBuild = true + }; - DotNetCoreTool(projectFile, "xunit", arguments, settings); - } + GetFiles("./tests/*/*Tests.csproj") + .ToList() + .ForEach(f => DotNetCoreTest(f.FullPath, settings)); }); Task("Pack") diff --git a/src/BeanstalkWorker.SimpleRouting/BeanstalkWorker.SimpleRouting.csproj b/src/BeanstalkWorker.SimpleRouting/BeanstalkWorker.SimpleRouting.csproj index 27e11bc..774a49f 100644 --- a/src/BeanstalkWorker.SimpleRouting/BeanstalkWorker.SimpleRouting.csproj +++ b/src/BeanstalkWorker.SimpleRouting/BeanstalkWorker.SimpleRouting.csproj @@ -12,10 +12,10 @@ Copyright © Beanstalk Worker Simple Routing contributors - - - - - + + + + + - + \ No newline at end of file diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj index 95e2bab..9531303 100644 --- a/src/Core/Core.csproj +++ b/src/Core/Core.csproj @@ -1,15 +1,15 @@  - netcoreapp2.0 + netcoreapp2.1 BeanstalkWorker.SimpleRouting.Core BeanstalkWorker.SimpleRouting.Core false - - - - - + + + + + - + \ No newline at end of file diff --git a/src/SampleWeb/SampleWeb.csproj b/src/SampleWeb/SampleWeb.csproj index 85363a5..7bf2f38 100644 --- a/src/SampleWeb/SampleWeb.csproj +++ b/src/SampleWeb/SampleWeb.csproj @@ -1,20 +1,20 @@  - netcoreapp2.0 + netcoreapp2.1 BeanstalkWorker.SimpleRouting.SampleWeb BeanstalkWorker.SimpleRouting.SampleWeb - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/src/SampleWorker/SampleWorker.csproj b/src/SampleWorker/SampleWorker.csproj index 0838052..6a03fd7 100644 --- a/src/SampleWorker/SampleWorker.csproj +++ b/src/SampleWorker/SampleWorker.csproj @@ -1,19 +1,19 @@  - netcoreapp2.0 + netcoreapp2.1 BeanstalkWorker.SimpleRouting.SampleWorker BeanstalkWorker.SimpleRouting.SampleWorker - - - - - - + + + + + + - + \ No newline at end of file diff --git a/tests/BeanstalkWorker.SimpleRouting.Tests/BeanstalkWorker.SimpleRouting.Tests.csproj b/tests/BeanstalkWorker.SimpleRouting.Tests/BeanstalkWorker.SimpleRouting.Tests.csproj index d77dd5d..5a40165 100644 --- a/tests/BeanstalkWorker.SimpleRouting.Tests/BeanstalkWorker.SimpleRouting.Tests.csproj +++ b/tests/BeanstalkWorker.SimpleRouting.Tests/BeanstalkWorker.SimpleRouting.Tests.csproj @@ -1,11 +1,11 @@  - netcoreapp2.0 - 2.0.5 + netcoreapp2.1 + 2.1.0 false - + @@ -14,9 +14,9 @@ - - - - + + + + - + \ No newline at end of file