diff --git a/.appveyor.yml b/.appveyor.yml index 114886e..68884da 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,13 +1,13 @@ #---------------------------------# # Build Image # #---------------------------------# -image: Visual Studio 2017 +image: Visual Studio 2019 #---------------------------------# # Build Script # #---------------------------------# build_script: - - ps: .\build.ps1 -Target AppVeyor + - ps: .\build.ps1 --target=CI # Tests test: off @@ -27,5 +27,4 @@ branches: # Build Cache # #---------------------------------# cache: -- Source\packages -> Source\**\packages.config -- tools -> recipe.cake, tools\packages.config \ No newline at end of file +- tools -> recipe.cake \ No newline at end of file diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 0000000..911998b --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "cake.tool": { + "version": "0.38.5", + "commands": [ + "dotnet-cake" + ] + } + } + } \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..249f342 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,70 @@ +name: Build + +on: + push: + paths-ignore: + - "README.md" + pull_request: + +jobs: + build: + runs-on: ${{ matrix.os }} + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository + strategy: + matrix: + os: [windows-latest] + + env: + AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }} + AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }} + AZURE_USER: ${{ secrets.AZURE_USER }} + GITHUB_PAT: ${{ secrets.GH_TOKEN }} + GITTER_ROOM_ID: ${{ secrets.GITTER_ROOM_ID }} + GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }} + GPR_SOURCE: ${{ secrets.GPR_SOURCE }} + GPR_USER: ${{ secrets.GPR_USER }} + GITTER_TOKEN: ${{ secrets.GITTER_TOKEN }} + NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} + NUGET_SOURCE: "https://api.nuget.org/v3/index.json" + TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }} + TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }} + TWITTER_CONSUMER_KEY: ${{ secrets.TWITTER_CONSUMER_KEY }} + TWITTER_CONSUMER_SECRET: ${{ secrets.TWITTER_CONSUMER_SECRET }} + WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }} + WYAM_DEPLOY_BRANCH: "gh-pages" + WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }} + steps: + - name: Checkout the repository + uses: actions/checkout@v2 + + - name: Fetch all tags and branches + run: git fetch --prune --unshallow + + - name: Cache Tools + uses: actions/cache@v2 + with: + path: tools + key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} + + - name: Build project + uses: cake-build/cake-action@v1 + with: + script-path: recipe.cake + target: CI + verbosity: Normal + cake-version: 0.38.5 + cake-bootstrap: true + + - name: Upload Issues-Report + uses: actions/upload-artifact@v2 + with: + if-no-files-found: warn + name: issues + path: BuildArtifacts/report.html + + - name: Upload Packages + uses: actions/upload-artifact@v2 + with: + if-no-files-found: warn + name: package + path: BuildArtifacts/Packages/**/* diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml new file mode 100644 index 0000000..5b2c083 --- /dev/null +++ b/.github/workflows/release-notes.yml @@ -0,0 +1,47 @@ +name: Draft Release Notes + +on: + workflow_dispatch: + +jobs: + draft-stable: + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + runs-on: ubuntu-latest + + steps: + - name: Checkout the requested branch + uses: actions/checkout@v2.3.4 + - name: Fetch all tags and branches + run: git fetch --prune --unshallow + - name: Cache Tools + uses: actions/cache@v2.1.4 + with: + path: tools + key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} + - name: Set up git version + if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }} + uses: gittools/actions/gitversion/setup@v0.9.9 + with: + versionSpec: "5.x" + - name: Run git version + if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }} + id: gitversion + uses: gittools/actions/gitversion/execute@v0.9.9 + - name: Create release branch ${{ github.event.inputs.version }} + if: ${{ steps.gitversion.outputs.majorMinorPatch }} + run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }} + - name: Push new branch + if: ${{ steps.gitversion.outputs.majorMinorPatch }} + uses: ad-m/github-push-action@v0.6.0 + with: + branch: "release/${{ steps.gitversion.outputs.majorMinorPatch }}" + github_token: ${{ secrets.GH_TOKEN }} + - name: Drafting Release Notes + uses: cake-build/cake-action@v1 + with: + script-path: recipe.cake + target: releasenotes + verbosity: Diagnostic + cake-version: 0.38.5 + cake-bootstrap: true diff --git a/.gitignore b/.gitignore index 00066f2..7834cc0 100644 --- a/.gitignore +++ b/.gitignore @@ -253,5 +253,4 @@ paket-files/ # Build related tools/** -!tools/packages.config BuildArtifacts/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a208e6c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "omnisharp.enableEditorConfigSupport": true, + "omnisharp.enableRoslynAnalyzers": true, + "[powershell]": { + "files.encoding": "utf8bom" + }, + "powershell.codeFormatting.addWhitespaceAroundPipe": true + } \ No newline at end of file diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index 721c1ba..6f27e12 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -1,12 +1,48 @@ issue-labels-include: - Breaking change -- Feature - Bug +- Feature +- Enhancement - Improvement - Documentation +- security issue-labels-exclude: - Build +- Internal / Refactoring issue-labels-alias: - name: Documentation header: Documentation - plural: Documentation \ No newline at end of file + plural: Documentation + - name: security + header: Security + plural: Security +create: + include-footer: true + footer-heading: Where to get it + footer-content: > + You can download this release from + [nuget](https://nuget.org/packages/Cake.Coveralls/{milestone}), + or you can just reference it in a cake build script + with `#addin nuget:?package=Cake.Coveralls&version={milestone}`. + footer-includes-milestone: true + milestone-replace-text: "{milestone}" + include-sha-section: true + sha-section-heading: "SHA256 Hashes of the release artifacts" + sha-section-line-format: "- `{1}\t{0}`" +export: + include-created-date-in-title: true + created-date-string-format: yyyy-MM-dd + perform-regex-removal: true + regex-text: '[\r\n]*### Where to get it[\r\n]*You can .*`\.[\r\n]*' + multiline-regex: true +close: + use-issue-comments: true + issue-comment: |- + :tada: This issue has been resolved in version {milestone} :tada: + + The release is available on: + + - [GitHub Release](https://github.com/{owner}/{repository}/releases/tag/{milestone}) + - [NuGet Package](https://www.nuget.org/packages/{repository}/{milestone}) + + Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket: diff --git a/README.md b/README.md index b202143..1715c76 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ Cake.Coveralls is an Addin for [Cake](http://cakebuild.net/) with ability to pus - [Documentation](https://cake-contrib.github.io/Cake.Coveralls/) -## Chat Room -Come join in the conversation about Cake.Coveralls in our Gitter Chat Room +## Discussion -[![Join the chat at https://gitter.im/cake-contrib/Lobby](https://badges.gitter.im/cake-contrib/Lobby.svg)](https://gitter.im/cake-contrib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +If you have questions, search for an existing one, or create a new discussion on the Cake GitHub repository, using the `extension-q-a` category. + +[![Join in the discussion on the Cake repository](https://img.shields.io/badge/GitHub-Discussions-green?logo=github)](https://github.com/cake-build/cake/discussions) diff --git a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj index 60fdb34..34742f2 100644 --- a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj +++ b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj @@ -1,13 +1,23 @@  - netcoreapp2.0 + netcoreapp2.1;netcoreapp3.1 + full + false + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/Source/Cake.Coveralls.sln b/Source/Cake.Coveralls.sln index ed66582..717e35b 100644 --- a/Source/Cake.Coveralls.sln +++ b/Source/Cake.Coveralls.sln @@ -18,11 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScript ..\recipe.cake = ..\recipe.cake EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{6B75DCDE-1B14-41E1-BEC9-05F3FDC6197F}" - ProjectSection(SolutionItems) = preProject - ..\tools\packages.config = ..\tools\packages.config - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Source/Cake.Coveralls/Cake.Coveralls.csproj b/Source/Cake.Coveralls/Cake.Coveralls.csproj index a475654..d31962e 100644 --- a/Source/Cake.Coveralls/Cake.Coveralls.csproj +++ b/Source/Cake.Coveralls/Cake.Coveralls.csproj @@ -3,14 +3,46 @@ netstandard2.0 true + true + snupkg + + 2016 + $([System.DateTime]::Today.Year) + $(StartYear) + $(StartYear)-$(EndYear) + + + Gary Ewan Park + Copyright © $(FullYear) — Cake Contributions + Cake AddIn that extends Cake with ability to post Code Coverage results to Coveralls.io. + icon.png + https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png + MIT + https://github.com/cake-contrib/Cake.Coveralls/ + Cake;Script;Build;Coveralls + https://github.com/cake-contrib/Cake.Coveralls.git + https://github.com/cake-contrib/Cake.Coveralls/releases/tag/$(Version) + Cake.Coveralls.ruleset + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/Source/Cake.Coveralls/icon.png b/Source/Cake.Coveralls/icon.png new file mode 100644 index 0000000..9881edc Binary files /dev/null and b/Source/Cake.Coveralls/icon.png differ diff --git a/Source/Directory.Build.targets b/Source/Directory.Build.targets new file mode 100644 index 0000000..86e3c03 --- /dev/null +++ b/Source/Directory.Build.targets @@ -0,0 +1,28 @@ + + + + + + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + true + true + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + + + + + + + + <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/> + + + diff --git a/build.ps1 b/build.ps1 index 0b70945..0940a31 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,256 +1,15 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## +$ErrorActionPreference = 'Stop' -<# +$SCRIPT_NAME = "recipe.cake" -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. +Write-Host "Restoring .NET Core tools" +dotnet tool restore +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -.DESCRIPTION -This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) -and execute your Cake build script with the parameters you provide. +Write-Host "Bootstrapping Cake" +dotnet cake $SCRIPT_NAME --bootstrap +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.PARAMETER ShowDescription -Shows description about tasks. -.PARAMETER DryRun -Performs a dry run. -.PARAMETER SkipToolPackageRestore -Skips restoring of packages. -.PARAMETER ScriptArgs -Remaining arguments are added here. - -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "recipe.cake", - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -# Attempt to set highest encryption available for SecurityProtocol. -# PowerShell will not set this by default (until maybe .NET 4.6.x). This -# will typically produce a message for PowerShell v2 (just an info -# message though) -try { - # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) - # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't - # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is - # installed (.NET 4.5 is an in-place upgrade). - # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. - if (-not $IsCoreCLR) { - [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 - } - } catch { - Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' - } - -[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null -function MD5HashFile([string] $filePath) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -function GetProxyEnabledWebClient -{ - $wc = New-Object System.Net.WebClient - $proxy = [System.Net.WebRequest]::GetSystemWebProxy() - $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials - $wc.Proxy = $proxy - return $wc -} - -Write-Host "Preparing to run build script..." - -if(!$PSScriptRoot){ - $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -} - -$TOOLS_DIR = Join-Path $PSScriptRoot "tools" -$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" -$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" -$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" -$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" -$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" -$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" -$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" -$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" -$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" - -# Make sure tools folder exists -if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { - Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type Directory | Out-Null -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) - } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$env:NUGET_EXE = $NUGET_EXE -$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$NUGET_EXE`"" -} else { - "`"$NUGET_EXE`"" -} - -# Restore tools from NuGet? -if(-Not $SkipToolPackageRestore.IsPresent) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | - Remove-Item -Recurse - } - - Write-Verbose -Message "Restoring tools from NuGet..." - - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore addins from NuGet -if (Test-Path $ADDINS_PACKAGES_CONFIG) { - Push-Location - Set-Location $ADDINS_DIR - - Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet addins." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Restore modules from NuGet -if (Test-Path $MODULES_PACKAGES_CONFIG) { - Push-Location - Set-Location $MODULES_DIR - - Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet modules." - } - - Write-Verbose -Message ($NuGetOutput | Out-String) - - Pop-Location -} - -# Make sure that Cake has been installed. -if (!(Test-Path $CAKE_EXE)) { - Throw "Could not find Cake.exe at $CAKE_EXE" -} - -$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { - "mono `"$CAKE_EXE`"" -} else { - "`"$CAKE_EXE`"" -} - - -# Build Cake arguments -$cakeArguments = @("$Script"); -if ($Target) { $cakeArguments += "-target=$Target" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } -if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } -if ($ShowDescription) { $cakeArguments += "-showdescription" } -if ($DryRun) { $cakeArguments += "-dryrun" } -$cakeArguments += $ScriptArgs - -# Start Cake -Write-Host "Running build script..." -Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" -exit $LASTEXITCODE +Write-Host "Running Build" +dotnet cake $SCRIPT_NAME @args +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } \ No newline at end of file diff --git a/build.sh b/build.sh index 7fc4599..ba5d0c9 100755 --- a/build.sh +++ b/build.sh @@ -1,117 +1,11 @@ -#!/usr/bin/env bash +#!/bin/bash +SCRIPT_NAME="recipe.cake" -########################################################################## -# 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. -########################################################################## +echo "Restoring .NET Core tools" +dotnet tool restore -# Define directories. -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools -ADDINS_DIR=$TOOLS_DIR/Addins -MODULES_DIR=$TOOLS_DIR/Modules -NUGET_EXE=$TOOLS_DIR/nuget.exe -CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe -PACKAGES_CONFIG=$TOOLS_DIR/packages.config -PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum -ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config -MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config +echo "Bootstrapping Cake" +dotnet cake $SCRIPT_NAME --bootstrap -# Define md5sum or md5 depending on Linux/OSX -MD5_EXE= -if [[ "$(uname -s)" == "Darwin" ]]; then - MD5_EXE="md5 -r" -else - MD5_EXE="md5sum" -fi - -# Define default arguments. -SCRIPT="recipe.cake" -CAKE_ARGUMENTS=() - -# Parse arguments. -for i in "$@"; do - case $1 in - -s|--script) SCRIPT="$2"; shift ;; - --) shift; CAKE_ARGUMENTS+=("$@"); break ;; - *) CAKE_ARGUMENTS+=("$1") ;; - esac - shift -done - -# Make sure the tools folder exist. -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" https://cakebuild.net/download/bootstrapper/packages - if [ $? -ne 0 ]; then - echo "An error occurred while downloading packages.config." - exit 1 - fi -fi - -# Download NuGet if it does not exist. -if [ ! -f "$NUGET_EXE" ]; then - echo "Downloading NuGet..." - curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - if [ $? -ne 0 ]; then - echo "An error occurred while downloading nuget.exe." - exit 1 - fi -fi - -# Restore tools from NuGet. -pushd "$TOOLS_DIR" >/dev/null -if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then - find . -type d ! -name . ! -name 'Cake.Bakery' | xargs rm -rf -fi - -mono "$NUGET_EXE" install -ExcludeVersion -if [ $? -ne 0 ]; then - echo "Could not restore NuGet tools." - exit 1 -fi - -$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5" - -popd >/dev/null - -# Restore addins from NuGet. -if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then - pushd "$ADDINS_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet addins." - exit 1 - fi - - popd >/dev/null -fi - -# Restore modules from NuGet. -if [ -f "$MODULES_PACKAGES_CONFIG" ]; then - pushd "$MODULES_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet modules." - exit 1 - fi - - popd >/dev/null -fi - -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -# Start Cake -exec mono "$CAKE_EXE" $SCRIPT "${CAKE_ARGUMENTS[@]}" +echo "Running Build" +dotnet cake $SCRIPT_NAME "$@" \ No newline at end of file diff --git a/docs/input/blog/new-release-0.1.0.md b/docs/input/blog/new-release-0.1.0.md deleted file mode 100644 index ee58202..0000000 --- a/docs/input/blog/new-release-0.1.0.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -Title: New Release - 0.1.0 -Published: 18/8/2016 -Category: Release -Author: gep13 ---- - -# First Release Completed - -Very happy to announce the initial release of the Cake.Coveralls addin for [Cake](http://cakebuild.net/). - -This initial release shipped with two main features: - -- [**#2**](https://github.com/gep13/Cake.Coveralls/issues/2) Add support for Coveralls.io -- [**#1**](https://github.com/gep13/Cake.Coveralls/issues/1) Add support for Coveralls.net - -Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin. \ No newline at end of file diff --git a/docs/input/blog/new-release-0.2.0.md b/docs/input/blog/new-release-0.2.0.md deleted file mode 100644 index 73e6288..0000000 --- a/docs/input/blog/new-release-0.2.0.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -Title: New Release - 0.2.0 -Published: 22/8/2016 -Category: Release -Author: gep13 ---- - -# Hot off the press, another release for Cake.Coveralls - -After the initial release of Cake.Coveralls a couple days ago, we noticed a couple problems, that warranted a new release, so here it is. - -This release includes the following: - -## Bug - -- [**#3**](https://github.com/cake-contrib/Cake.Coveralls/issues/3) Remove duplicate summary in alias - -## Improvement - -- [**#4**](https://github.com/cake-contrib/Cake.Coveralls/issues/4) Ensure correct stamping version number in generated assemblies - -Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin. \ No newline at end of file diff --git a/docs/input/blog/new-release-0.2.1.md b/docs/input/blog/new-release-0.2.1.md deleted file mode 100644 index e40d683..0000000 --- a/docs/input/blog/new-release-0.2.1.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -Title: New Release - 0.2.1 -Published: 8/11/2016 -Category: Release -Author: gep13 ---- - -# Correcting NuGet Folder Structure - -In order to allow Cake to correctly load addin's, we have updated the NuGet package structure to include a lib folder. - -Full details about this release can be found here: - -- [**#11**](https://github.com/cake-contrib/Cake.Coveralls/issues/11) Add lib folder structure to NuGet package - -Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin. \ No newline at end of file diff --git a/docs/input/blog/new-release-0.3.0.md b/docs/input/blog/new-release-0.3.0.md deleted file mode 100644 index 681d855..0000000 --- a/docs/input/blog/new-release-0.3.0.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -Title: New Release - 0.3.0 -Published: 26/1/2017 -Category: Release -Author: gep13 ---- - -# It's been a while... - -Since the last release, but I hope you will agree that it has been worth waiting for. This release includes the following: - -## Improvements - -- [__#10__](https://github.com/cake-contrib/Cake.Coveralls/issues/10) Switch away from using gep13.DefaultBuild and use Cake.Recipe instead -- [__#7__](https://github.com/cake-contrib/Cake.Coveralls/issues/7) Update nuspec with correct information - -## Documentation - -- [__#17__](https://github.com/cake-contrib/Cake.Coveralls/issues/17) Add Wyam Documentation generation -- [__#6__](https://github.com/cake-contrib/Cake.Coveralls/issues/6) Correct usage documentation - -The main one here is the inclusion of [Cake.Recipe](https://github.com/cake-contrib/Cake.Recipe). For a while now, I have been working on the concept of a convention driven, drop in, build system, that can be applied to any number of projects. This is very much nearing completion, with all the main parts now in place. - -In this most recent version, I have added: - -- Execution of GitLink to allow debugging of assemblies generated as part of the build -- Wyam documentation generation, including this blog post that you are reading now. -- Removal of some dependencies in the build process which meant additional nuget packages were required - -More details will follow on all of this when the Cake.Recipe project is officially released. This release of Cake.Coveralls is really just taking it for it's initial spin. - -Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin. \ No newline at end of file diff --git a/docs/input/blog/new-release-0.4.0.md b/docs/input/blog/new-release-0.4.0.md deleted file mode 100644 index 83852a0..0000000 --- a/docs/input/blog/new-release-0.4.0.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -Title: New Release - 0.4.0 -Published: 30/1/2017 -Category: Release -Author: gep13 ---- - -# Another one, already?!? - -Thanks to a contribution from @devlead, we are releasing 0.4.0 of Cake.Coveralls. This includes the following: - -## Improvement - -- [__#12__](https://github.com/cake-contrib/Cake.Coveralls/issues/12) Update to latest Cake - -It was decided that this was required due to the fact that with the impending release of Cake 0.18.0 all addins need to be at least 0.16.0, so we decided to upload to the latest. - -Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin. \ No newline at end of file diff --git a/nuspec/nuget/Cake.Coveralls.nuspec b/nuspec/nuget/Cake.Coveralls.nuspec deleted file mode 100644 index 4310ee4..0000000 --- a/nuspec/nuget/Cake.Coveralls.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - Cake.Coveralls - 0.0.0 - gep13 - gep13, cake-contrib - Cake Coveralls AddIn. - Cake AddIn that extends Cake with ability to post Code Coverage results to Coveralls.io. - MIT - - https://github.com/cake-contrib/Cake.Coveralls/ - false - https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png - Copyright (c) Cake Contributions 2016 - Present - Cake, Script, Build, Coveralls - - - - - - - diff --git a/recipe.cake b/recipe.cake index cfdbe90..9ecf955 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Cake.Recipe&version=1.0.0 +#load nuget:?package=Cake.Recipe&version=2.2.0 Environment.SetVariableNames(); @@ -9,13 +9,13 @@ BuildParameters.SetParameters(context: Context, repositoryOwner: "cake-contrib", repositoryName: "Cake.Coveralls", appVeyorAccountName: "cakecontrib", - shouldRunGitVersion: true); + shouldRunDotNetCorePack: true, + preferredBuildProviderType: BuildProviderType.GitHubActions); BuildParameters.PrintParameters(Context); ToolSettings.SetToolSettings(context: Context, - dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/Source/Cake.Coveralls.Tests/*.cs", BuildParameters.RootDirectoryPath + "/Source/Cake.Coveralls/**/*.AssemblyInfo.cs" }, - testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ", + testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]*", testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*", testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs"); diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index 997c0e1..0000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - -