From b1aff0f56a9421d7e15c79390c47ceb3435c4e26 Mon Sep 17 00:00:00 2001 From: "D. Domig" Date: Tue, 1 Oct 2019 23:07:51 +0200 Subject: [PATCH 01/21] Fix typo --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b202143..99bb612 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ 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 + +Come join in the conversation about Cake.Coveralls in our Gitter Chat Room. [![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) From 4de382f20c0ec0c5aabb7e381865d3398d2c0e61 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 15 Jan 2021 07:21:53 +0000 Subject: [PATCH 02/21] (GH-43) Remove reference to Gitter --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99bb612..1715c76 100644 --- a/README.md +++ b/README.md @@ -25,8 +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 +## Discussion -Come join in the conversation about Cake.Coveralls in our Gitter Chat Room. +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 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) +[![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) From 3204892e4f33e4152c09fef0e06f5ec787c7d4c7 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 15 Jan 2021 07:22:20 +0000 Subject: [PATCH 03/21] (GH-43) Remove blog post This is not something that will be maintained going forward. --- docs/input/blog/new-release-0.1.0.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 docs/input/blog/new-release-0.1.0.md 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 From 78b4b86e303a8284f047adbd56061218a8dd1273 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 15 Jan 2021 07:22:42 +0000 Subject: [PATCH 04/21] (GH-43) Remove blog post This is not something that will be maintained going forward. --- docs/input/blog/new-release-0.2.0.md | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 docs/input/blog/new-release-0.2.0.md 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 From 3b93d9761fa59e16606a7611cca4b8ef66f86bc5 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 15 Jan 2021 07:23:03 +0000 Subject: [PATCH 05/21] (GH-43) Remove blog post This is not something that will be maintained going forward. --- docs/input/blog/new-release-0.2.1.md | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 docs/input/blog/new-release-0.2.1.md 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 From 05ea3903b4ca6afc0c3e30ab7e62528cf75eaeca Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 15 Jan 2021 07:23:37 +0000 Subject: [PATCH 06/21] (GH-43) Remove blog post This is not something that will be maintained going forward. --- docs/input/blog/new-release-0.3.0.md | 32 ---------------------------- 1 file changed, 32 deletions(-) delete mode 100644 docs/input/blog/new-release-0.3.0.md 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 From 50a42b4993968d11323f392feb059b19a0d7e743 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 15 Jan 2021 07:24:05 +0000 Subject: [PATCH 07/21] (GH-43) Remove blog post This is not something that will be maintained going forward. --- docs/input/blog/new-release-0.4.0.md | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 docs/input/blog/new-release-0.4.0.md 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 From 634d8eb3369d8a66269997c6021bb03323db1549 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 21:01:30 +0000 Subject: [PATCH 08/21] (GH-46) Update GRM config --- GitReleaseManager.yaml | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) 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: From 8b0901e6bfc3472260d064c4ff3cdaeaf1767955 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 21:20:12 +0000 Subject: [PATCH 09/21] (GH-47) Add workflow to generate release notes --- .github/workflows/release-notes.yml | 47 +++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/release-notes.yml 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 From c4f10f822c6f1023a850268ae5d60371d8ba1a6f Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 21:42:46 +0000 Subject: [PATCH 10/21] (GH-48) Add workflow to build on GHA --- .github/workflows/build.yml | 70 +++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..021b64c --- /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, ubuntu-latest, macos-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/**/* From 049a2fe8b4b1008406ce0616375ed402e4c1e4a1 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 22:07:22 +0000 Subject: [PATCH 11/21] (GH-52) Update to use Cake.Recipe 2.2.0 --- .appveyor.yml | 7 +- .config/dotnet-tools.json | 12 ++ build.ps1 | 263 ++------------------------------------ build.sh | 122 ++---------------- recipe.cake | 7 +- tools/packages.config | 4 - 6 files changed, 37 insertions(+), 378 deletions(-) create mode 100644 .config/dotnet-tools.json delete mode 100644 tools/packages.config 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/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/recipe.cake b/recipe.cake index cfdbe90..9e9f175 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(); @@ -8,14 +8,13 @@ BuildParameters.SetParameters(context: Context, title: "Cake.Coveralls", repositoryOwner: "cake-contrib", repositoryName: "Cake.Coveralls", - appVeyorAccountName: "cakecontrib", - shouldRunGitVersion: true); + appVeyorAccountName: "cakecontrib"); 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 @@ - - - - From 0b271f5121229a9e15693a7285651cbb1e9f60fd Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 22:11:05 +0000 Subject: [PATCH 12/21] (build) Only build on Windows for now --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 021b64c..249f342 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository strategy: matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + os: [windows-latest] env: AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }} From 40189a3796d670042df77bd58826a279c50e3c13 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 19:58:54 +0000 Subject: [PATCH 13/21] (maint) Remove references to packages.config This file has been removed from the repository --- .gitignore | 1 - Source/Cake.Coveralls.sln | 5 ----- 2 files changed, 6 deletions(-) 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/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 From a30b7cecee14a2ccf994f63d00319a49cfd74181 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 20:42:57 +0000 Subject: [PATCH 14/21] (GH-54) Enable deterministic builds --- .../Cake.Coveralls.Tests.csproj | 8 ++++++ Source/Cake.Coveralls/Cake.Coveralls.csproj | 23 +++++++++++++++ Source/Directory.Build.targets | 28 +++++++++++++++++++ nuspec/nuget/Cake.Coveralls.nuspec | 23 --------------- recipe.cake | 3 +- 5 files changed, 61 insertions(+), 24 deletions(-) create mode 100644 Source/Directory.Build.targets delete mode 100644 nuspec/nuget/Cake.Coveralls.nuspec diff --git a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj index 60fdb34..c348e14 100644 --- a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj +++ b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj @@ -7,7 +7,15 @@ + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/Source/Cake.Coveralls/Cake.Coveralls.csproj b/Source/Cake.Coveralls/Cake.Coveralls.csproj index a475654..ad87a5c 100644 --- a/Source/Cake.Coveralls/Cake.Coveralls.csproj +++ b/Source/Cake.Coveralls/Cake.Coveralls.csproj @@ -3,14 +3,37 @@ netstandard2.0 true + true + snupkg + + 2016 + $([System.DateTime]::Today.Year) + $(StartYear) + $(StartYear)-$(EndYear) + + + Gary Ewan Park + Copyright © $(FullYear) — Gary Ewan Park + Cake AddIn that extends Cake with ability to post Code Coverage results to Coveralls.io. + 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 + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/Source/Directory.Build.targets b/Source/Directory.Build.targets new file mode 100644 index 0000000..690ab26 --- /dev/null +++ b/Source/Directory.Build.targets @@ -0,0 +1,28 @@ + + + + + + + + true + true + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + + + + + + + + <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/> + + + 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 9e9f175..c16f203 100644 --- a/recipe.cake +++ b/recipe.cake @@ -8,7 +8,8 @@ BuildParameters.SetParameters(context: Context, title: "Cake.Coveralls", repositoryOwner: "cake-contrib", repositoryName: "Cake.Coveralls", - appVeyorAccountName: "cakecontrib"); + appVeyorAccountName: "cakecontrib", + shouldRunDotNetCorePack: true); BuildParameters.PrintParameters(Context); From 25ac7c18d0a06aa7cb9d928bb31d852cd103b5ad Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 20:55:44 +0000 Subject: [PATCH 15/21] (maint) Fix copyright --- Source/Cake.Coveralls/Cake.Coveralls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.Coveralls/Cake.Coveralls.csproj b/Source/Cake.Coveralls/Cake.Coveralls.csproj index ad87a5c..deca9e9 100644 --- a/Source/Cake.Coveralls/Cake.Coveralls.csproj +++ b/Source/Cake.Coveralls/Cake.Coveralls.csproj @@ -15,7 +15,7 @@ Gary Ewan Park - Copyright © $(FullYear) — Gary Ewan Park + Copyright © $(FullYear) — Cake Contributions Cake AddIn that extends Cake with ability to post Code Coverage results to Coveralls.io. https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png MIT From d921a124725af95b40c0e33d64df29cc580d2a0a Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 21:21:54 +0000 Subject: [PATCH 16/21] (GH-55) Add CakeContrib.Guidelines package --- Source/Cake.Coveralls/Cake.Coveralls.csproj | 5 +++++ Source/Cake.Coveralls/icon.png | Bin 0 -> 15580 bytes 2 files changed, 5 insertions(+) create mode 100644 Source/Cake.Coveralls/icon.png diff --git a/Source/Cake.Coveralls/Cake.Coveralls.csproj b/Source/Cake.Coveralls/Cake.Coveralls.csproj index deca9e9..d873485 100644 --- a/Source/Cake.Coveralls/Cake.Coveralls.csproj +++ b/Source/Cake.Coveralls/Cake.Coveralls.csproj @@ -17,6 +17,7 @@ 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/ @@ -30,6 +31,10 @@ + + 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 0000000000000000000000000000000000000000..9881edc4e937ff34999ecf375c550249d82acc32 GIT binary patch literal 15580 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 literal 0 HcmV?d00001 From d81f71c0d74a9bdf7534134ebb84b9ee9db52485 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 21:32:42 +0000 Subject: [PATCH 17/21] (GH-56) Add Cake.Addin.Analyzer package --- Source/Cake.Coveralls/Cake.Coveralls.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/Cake.Coveralls/Cake.Coveralls.csproj b/Source/Cake.Coveralls/Cake.Coveralls.csproj index d873485..d31962e 100644 --- a/Source/Cake.Coveralls/Cake.Coveralls.csproj +++ b/Source/Cake.Coveralls/Cake.Coveralls.csproj @@ -30,6 +30,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all From 85b1fccfc66dbb3570628cef80af8589709852ee Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 21:44:44 +0000 Subject: [PATCH 18/21] (GH-57) Include pdb in nupkg --- Source/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Directory.Build.targets b/Source/Directory.Build.targets index 690ab26..86e3c03 100644 --- a/Source/Directory.Build.targets +++ b/Source/Directory.Build.targets @@ -5,7 +5,7 @@ https://github.com/dotnet/sourcelink/issues/572 --> - + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb true true $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) From d2fb73929a9dad7c1a427ffbef9dae2ab2bb7bc8 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 21:52:19 +0000 Subject: [PATCH 19/21] (GH-58) Prefer building on GHA --- recipe.cake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe.cake b/recipe.cake index c16f203..53bcd00 100644 --- a/recipe.cake +++ b/recipe.cake @@ -9,7 +9,8 @@ BuildParameters.SetParameters(context: Context, repositoryOwner: "cake-contrib", repositoryName: "Cake.Coveralls", appVeyorAccountName: "cakecontrib", - shouldRunDotNetCorePack: true); + shouldRunDotNetCorePack: true, + preferredBuildProviderType: BuildProviderType.GitHubActions); BuildParameters.PrintParameters(Context); From 140296fb0c0f5575ce4ffac404f4141e43b0c811 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 21:58:30 +0000 Subject: [PATCH 20/21] (maint) Add VSCode settings file --- .vscode/settings.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .vscode/settings.json 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 From 63699fe75e14d6c9bb49cb369a85f9beb43cc94c Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Fri, 19 Feb 2021 22:16:54 +0000 Subject: [PATCH 21/21] (GH-59) Update TargetFrameworks --- Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj | 4 +++- recipe.cake | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj index c348e14..34742f2 100644 --- a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj +++ b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj @@ -1,7 +1,9 @@  - netcoreapp2.0 + netcoreapp2.1;netcoreapp3.1 + full + false diff --git a/recipe.cake b/recipe.cake index 53bcd00..9ecf955 100644 --- a/recipe.cake +++ b/recipe.cake @@ -15,7 +15,6 @@ BuildParameters.SetParameters(context: Context, 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]*", testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*", testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");