Merge branch 'features/netcore2.1'

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.
 

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

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")

src/BeanstalkWorker.SimpleRouting/BeanstalkWorker.SimpleRouting.csproj

@@ -12,10 +12,10 @@
     <copyright>Copyright © Beanstalk Worker Simple Routing contributors</copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.0" />
   </ItemGroup>
-</Project>
+</Project>

src/Core/Core.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>BeanstalkWorker.SimpleRouting.Core</AssemblyName>
     <RootNamespace>BeanstalkWorker.SimpleRouting.Core</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
-    <PackageReference Include="BeanstalkWorker.SimpleRouting" Version="0.2.4" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.8" />
+    <PackageReference Include="BeanstalkWorker.SimpleRouting" Version="0.2.5" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
-</Project>
+</Project>

src/SampleWeb/SampleWeb.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>BeanstalkWorker.SimpleRouting.SampleWeb</AssemblyName>
     <RootNamespace>BeanstalkWorker.SimpleRouting.SampleWeb</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
-    <PackageReference Include="BeanstalkWorker.SimpleRouting" Version="0.2.4" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-    <PackageReference Include="Serilog" Version="2.6.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="2.1.0" />
-    <PackageReference Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-00011" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="2.4.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.8" />
+    <PackageReference Include="BeanstalkWorker.SimpleRouting" Version="0.2.5" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
+    <PackageReference Include="Serilog" Version="2.7.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-00016" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="2.6.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
-</Project>
+</Project>

src/SampleWorker/SampleWorker.csproj

@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>BeanstalkWorker.SimpleRouting.SampleWorker</AssemblyName>
     <RootNamespace>BeanstalkWorker.SimpleRouting.SampleWorker</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BeanstalkWorker.SimpleRouting" Version="0.2.4" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-    <PackageReference Include="Serilog" Version="2.6.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="2.1.0" />
-    <PackageReference Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-00011" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="2.4.0" />
+    <PackageReference Include="BeanstalkWorker.SimpleRouting" Version="0.2.5" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0" />
+    <PackageReference Include="Serilog" Version="2.7.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Serilog.Enrichers.Demystify" Version="0.1.0-dev-00016" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="2.6.1" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
-</Project>
+</Project>

tests/BeanstalkWorker.SimpleRouting.Tests/BeanstalkWorker.SimpleRouting.Tests.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
@@ -14,9 +14,9 @@
     <ProjectReference Include="..\..\src\BeanstalkWorker.SimpleRouting\BeanstalkWorker.SimpleRouting.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
+    <PackageReference Include="AWSSDK.SQS" Version="3.3.3.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" />
   </ItemGroup>
-</Project>
+</Project>