Merge branch 'release/0.3.1'

Author: pascalberger

README.md

@@ -16,7 +16,8 @@ This addin for Cake allows you to work with Azure DevOps or Azure DevOps Server.
 | | Develop | Master |
 |:--:|:--:|:--:|
 |AppVeyor Windows|[![Build status](https://ci.appveyor.com/api/projects/status/c0akmejs4b136s0o/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-tfs/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/c0akmejs4b136s0o/branch/master?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-tfs/branch/master)|
-|Azure DevOps Windows|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Tfs/_apis/build/status/cake-contrib.Cake.Tfs?branchName=develop&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Tfs/_build/latest?definitionId=9?branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Tfs/_apis/build/status/cake-contrib.Cake.Tfs?branchName=master&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Tfs/_build/latest?definitionId=9?branchName=master)|
+|Azure DevOps Windows|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Tfs/_apis/build/status/cake-contrib.Cake.Tfs?branchName=develop&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Tfs/_build/latest?definitionId=9&branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Tfs/_apis/build/status/cake-contrib.Cake.Tfs?branchName=master&jobName=Windows)](https://dev.azure.com/cake-contrib/Cake.Tfs/_build/latest?definitionId=9&branchName=master)|
+|Azure DevOps Ubuntu|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Tfs/_apis/build/status/cake-contrib.Cake.Tfs?branchName=develop&jobName=Ubuntu)](https://dev.azure.com/cake-contrib/Cake.Tfs/_build/latest?definitionId=9&branchName=develop)|[![Build Status](https://dev.azure.com/cake-contrib/Cake.Tfs/_apis/build/status/cake-contrib.Cake.Tfs?branchName=master&jobName=Ubuntu)](https://dev.azure.com/cake-contrib/Cake.Tfs/_build/latest?definitionId=9&branchName=master)|
 
 ## Code Coverage
 

azure-pipelines.yml

@@ -12,5 +12,15 @@ jobs:
   pool:
     vmImage: 'vs2017-win2016'
   steps:
-  - powershell: ./build.ps1
+  - powershell: |
+      $ENV:CAKE_SKIP_GITVERSION=([string]::IsNullOrEmpty($ENV:SYSTEM_PULLREQUEST_PULLREQUESTID) -eq $False).ToString()
+      .\build.ps1
+      exit $LASTEXITCODE 
+    displayName: 'Cake Build'
+- job: Ubuntu
+  pool:
+    vmImage: 'ubuntu-16.04'
+  steps:
+  - bash: |
+      ./build.sh
     displayName: 'Cake Build'

build.sh

@@ -1,82 +1,97 @@
 #!/usr/bin/env bash
-###############################################################
-# This is the Cake bootstrapper script that is responsible for
-# downloading Cake and all specified tools from NuGet.
-###############################################################
+##########################################################################
+# This is the Cake bootstrapper script for Linux and OS X.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
 
 # Define directories.
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 TOOLS_DIR=$SCRIPT_DIR/tools
 NUGET_EXE=$TOOLS_DIR/nuget.exe
-CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
+NUGET_URL=https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+CAKE_VERSION=0.32.1
+CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
+
+# Temporarily skip verification of addins.
+export CAKE_SETTINGS_SKIPVERIFICATION='true'
 
 # Define default arguments.
-SCRIPT="setup.cake"
 TARGET="Default"
 CONFIGURATION="Release"
 VERBOSITY="verbose"
 DRYRUN=
-SHOW_VERSION=false
 SCRIPT_ARGUMENTS=()
 
 # Parse arguments.
 for i in "$@"; do
     case $1 in
-        -s|--script) SCRIPT="$2"; shift ;;
         -t|--target) TARGET="$2"; shift ;;
         -c|--configuration) CONFIGURATION="$2"; shift ;;
         -v|--verbosity) VERBOSITY="$2"; shift ;;
         -d|--dryrun) DRYRUN="-dryrun" ;;
-        --version) SHOW_VERSION=true ;;
         --) shift; SCRIPT_ARGUMENTS+=("$@"); break ;;
         *) SCRIPT_ARGUMENTS+=("$1") ;;
     esac
     shift
 done
 
 # Make sure the tools folder exist.
-if [ ! -d $TOOLS_DIR ]; then
-  mkdir $TOOLS_DIR
+if [ ! -d "$TOOLS_DIR" ]; then
+  mkdir "$TOOLS_DIR"
 fi
 
-# Make sure that packages.config exist.
-if [ ! -f $TOOLS_DIR/packages.config ]; then
-    echo "Downloading packages.config..."
-    curl -Lsfo $TOOLS_DIR/packages.config http://cakebuild.net/bootstrapper/packages
-    if [ $? -ne 0 ]; then
-        echo "An error occured while downloading packages.config."
-        exit 1
-    fi
+###########################################################################
+# INSTALL .NET CORE CLI
+###########################################################################
+
+echo "Installing .NET CLI..."
+if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
+  mkdir "$SCRIPT_DIR/.dotnet"
 fi
+curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
+sudo bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 2.1.400 --install-dir .dotnet --no-path
+export PATH="$SCRIPT_DIR/.dotnet":$PATH
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
+"$SCRIPT_DIR/.dotnet/dotnet" --info
+
+###########################################################################
+# INSTALL NUGET
+###########################################################################
 
 # Download NuGet if it does not exist.
-if [ ! -f $NUGET_EXE ]; then
+if [ ! -f "$NUGET_EXE" ]; then
     echo "Downloading NuGet..."
-    curl -Lsfo $NUGET_EXE https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+    curl -Lsfo "$NUGET_EXE" $NUGET_URL
     if [ $? -ne 0 ]; then
-        echo "An error occured while downloading nuget.exe."
+        echo "An error occurred while downloading nuget.exe."
         exit 1
     fi
 fi
 
-# Restore tools from NuGet.
-pushd $TOOLS_DIR >/dev/null
-mono $NUGET_EXE install -ExcludeVersion -PreRelease -Source https://www.myget.org/F/cake/api/v3/index.json
-if [ $? -ne 0 ]; then
-    echo "Could not restore NuGet packages."
-    exit 1
+###########################################################################
+# INSTALL CAKE
+###########################################################################
+
+if [ ! -f "$CAKE_EXE" ]; then
+    mono "$NUGET_EXE" install Cake -Version $CAKE_VERSION -OutputDirectory "$TOOLS_DIR"
+    if [ $? -ne 0 ]; then
+        echo "An error occurred while installing Cake."
+        exit 1
+    fi
 fi
-popd >/dev/null
 
 # Make sure that Cake has been installed.
-if [ ! -f $CAKE_EXE ]; then
+if [ ! -f "$CAKE_EXE" ]; then
     echo "Could not find Cake.exe at '$CAKE_EXE'."
     exit 1
 fi
 
+###########################################################################
+# RUN BUILD SCRIPT
+###########################################################################
+
 # Start Cake
-if $SHOW_VERSION; then
-    exec mono $CAKE_EXE -version
-else
-    exec mono $CAKE_EXE $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"
-fi
+exec mono "$CAKE_EXE" setup.cake --verbosity=$VERBOSITY --configuration=$CONFIGURATION --target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"

nuspec/nuget/Cake.Tfs.nuspec

@@ -1,4 +1,4 @@
-#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease
+#load nuget:?package=Cake.Recipe&version=1.0.0
 
 Environment.SetVariableNames();
 
@@ -10,15 +10,17 @@ BuildParameters.SetParameters(
     repositoryOwner: "cake-contrib",
     repositoryName: "Cake.Tfs",
     appVeyorAccountName: "cakecontrib",
-    shouldDeployGraphDocumentation: false);
+    shouldRunGitVersion: true,
+    shouldDeployGraphDocumentation: false,
+    shouldRunDotNetCorePack: true);
 
 BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(
     context: Context,
     dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Tfs.Tests/**/*.cs" },
-    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[*.Tests]* -[*]Costura.AssemblyLoader -[*]ProcessedByFody ",
+    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[*.Tests]* -[Shouldly]*",
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
-Build.Run();
+Build.RunDotNetCore();

setup.cake

@@ -2,7 +2,9 @@
 <RuleSet Name="Ruleset for Cake.Tfs test cases" Description="Rules valid for Cake.Tfs test cases" ToolsVersion="14.0">
   <Include Path="Cake.Tfs.ruleset" Action="Default" />
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA0001" Action="None" />
     <Rule Id="SA1118" Action="None" />
+    <Rule Id="SA1600" Action="None" />
     <Rule Id="SA1652" Action="None" />
   </Rules>
 </RuleSet>

src/Cake.Tfs.Tests.ruleset

@@ -1,7 +1,7 @@
 namespace Cake.Tfs.Tests.Authentication
 {
+    using Cake.Tfs.Authentication;
     using Shouldly;
-    using Tfs.Authentication;
     using Xunit;
 
     public sealed class AuthenticationProviderTests

src/Cake.Tfs.Tests/Authentication/AuthenticationProviderTests.cs

@@ -1,7 +1,7 @@
 namespace Cake.Tfs.Tests.Authentication
 {
+    using Cake.Tfs.Authentication;
     using Shouldly;
-    using Tfs.Authentication;
     using Xunit;
 
     public sealed class TfsAadCredentialsTests

src/Cake.Tfs.Tests/Authentication/TfsAadCredentialsTests.cs

@@ -1,7 +1,7 @@
 namespace Cake.Tfs.Tests.Authentication
 {
+    using Cake.Tfs.Authentication;
     using Shouldly;
-    using Tfs.Authentication;
     using Xunit;
 
     public sealed class TfsBasicCredentialsTests

src/Cake.Tfs.Tests/Authentication/TfsBasicCredentialsTests.cs

@@ -1,7 +1,7 @@
 namespace Cake.Tfs.Tests.Authentication
 {
+    using Cake.Tfs.Authentication;
     using Shouldly;
-    using Tfs.Authentication;
     using Xunit;
 
     public sealed class TfsNtlmCredentialsTests

src/Cake.Tfs.Tests/Authentication/TfsNtlmCredentialsTests.cs

@@ -1,7 +1,7 @@
 namespace Cake.Tfs.Tests.Authentication
 {
+    using Cake.Tfs.Authentication;
     using Shouldly;
-    using Tfs.Authentication;
     using Xunit;
 
     public sealed class TfsOAuthCredentialsTests

src/Cake.Tfs.Tests/Authentication/TfsOAuthCredentialsTests.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Product>Cake.Tfs</Product>
     <Copyright>Copyright © Pascal Berger</Copyright>
@@ -14,12 +14,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="Cake.Core" Version="0.33.0" />
     <PackageReference Include="Cake.Testing" Version="0.33.0" />
-    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.143.2" />
+    <PackageReference Include="Moq" Version="4.12.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>