Merged feature/checkout -> develop

.gitignore

@@ -8,6 +8,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.sonarqube
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

GitVersion.yml

@@ -0,0 +1,86 @@
+branches:
+  master:
+    regex: ^master
+    mode: ContinuousDelivery
+    tag: ''
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  mastertest:
+    regex: ^mastertest
+    source-branches: ['develop', 'release', 'hotfix', 'feature']
+    mode: ContinuousDelivery
+    tag: ''
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  release:
+    regex: ^releases?[/-]
+    mode: ContinuousDelivery
+    tag: beta
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: true
+    pre-release-weight: 1000
+  feature-checkout:
+    regex: ^feature/checkout
+    source-branches: ['develop']
+    mode: ContinuousDeployment
+    tag: alpha.check
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  feature:
+    regex: ^feature?[/-]
+    mode: ContinuousDelivery
+    tag: alpha.{BranchName}
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  pull-request:
+    regex: ^(pull|pull\-requests|pr)[/-]
+    mode: ContinuousDelivery
+    tag: PullRequest
+    increment: Inherit
+    prevent-increment-of-merged-branch-version: false
+    tag-number-pattern: '[/-](?<number>\d+)[-/]'
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  hotfix:
+    regex: ^hotfix(es)?[/-]
+    mode: ContinuousDelivery
+    tag: beta
+    increment: Patch
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  support:
+    regex: ^support[/-]
+    mode: ContinuousDelivery
+    tag: ''
+    increment: Patch
+    prevent-increment-of-merged-branch-version: true
+    track-merge-target: false
+    tracks-release-branches: false
+    is-release-branch: false
+  develop:
+    regex: ^dev(elop)?(ment)?$
+    mode: ContinuousDeployment
+    tag: alpha
+    increment: Minor
+    prevent-increment-of-merged-branch-version: false
+    track-merge-target: true
+    tracks-release-branches: true
+    is-release-branch: false

Linux.Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update \
     && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
     && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list' \
     && apt-get update \
-    && apt-get install -y --no-install-recommends dotnet-sdk-2.1.101 unzip mono-devel \
+    && apt-get install -y --no-install-recommends dotnet-sdk-3.0 unzip mono-devel \
 	&& rm -rf /var/lib/apt/lists/* \
     && apt-get clean \
     && mkdir -p /opt/nuget \

Windows.Dockerfile

@@ -4,7 +4,7 @@ FROM microsoft/windowsservercore:latest
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 # Retrieve .NET Core SDK
-ENV DOTNET_SDK_VERSION 2.1.101
+ENV DOTNET_SDK_VERSION 3.0.100
 ENV DOTNET_SDK_DOWNLOAD_URL https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-win-x64.zip
 ENV DOTNET_SDK_DOWNLOAD_SHA 794901f629921c2ef8db9de9ef984725a3b7f7b165289294593f4add34a5abb456d1165b90cf63df287d22ba21d06a136086e4db37a63c74196332608f18b0e8
 ENV DOTNET_CLI_TELEMETRY_OPTOUT 1

build.cake

@@ -1,9 +1,11 @@
-var target = Argument("target", "Pack");
+var target = Argument("target", "Copy-And-Publish-Artifacts");
 var configuration = Argument("configuration", "Release");
-var proj = $"./src/PayEx.Client/PayEx.Client.csproj";
+var proj = $"./src/SwedbankPay.Sdk/SwedbankPay.Sdk.csproj";
 
-var version = "4.0.0"; 
-var outputDir = "./output";
+var version = "1.0.0"; 
+
+var artifactsDir = MakeAbsolute(Directory("artifacts"));
+var packagesDir = artifactsDir.Combine(Directory("packages"));
 
 Task("Build")    
     .Does(() => {
@@ -14,7 +16,7 @@ Task("Test")
     .IsDependentOn("Build")
     .Does(() => {
         Warning("Lacking tests."); 
-        //var testproj = $"./src/PayEx.Client/PayEx.Client.csproj";       
+        //var testproj = $"./src/SwedbankPay.Sdk/SwedbankPay.Sdk.csproj";       
         //DotNetCoreTest(testproj);     
 });
 
@@ -24,7 +26,7 @@ Task("Pack")
         var coresettings = new DotNetCorePackSettings
         {
             Configuration = "Release",
-            OutputDirectory = outputDir,
+            OutputDirectory = packagesDir,
         };
         coresettings.MSBuildSettings = new DotNetCoreMSBuildSettings()
                                         .WithProperty("Version", new[] { version });
@@ -33,6 +35,14 @@ Task("Pack")
         DotNetCorePack(proj, coresettings);
 });
 
+Task("Copy-And-Publish-Artifacts")
+	.IsDependentOn("Pack")
+    .Does(() =>
+    {
+        Information($"Uploading files from packagesDir directory: {packagesDir} to TFS");
+        TFBuild.Commands.UploadArtifactDirectory($"{packagesDir}");
+    });
+
 Task("PublishToNugetOrg")
     .IsDependentOn("Pack")
     .Does(() => {        
@@ -42,7 +52,7 @@ Task("PublishToNugetOrg")
             ApiKey = Argument("nugetapikey", "must-be-given")
         };
 
-        DotNetCoreNuGetPush($"{outputDir}/PayEx.Client.{version}.nupkg", settings);        
+        DotNetCoreNuGetPush($"{packagesDir}/SwedbankPay.Sdk.{version}.nupkg", settings);        
 });
 
 RunTarget(target);