From 1c0a38139ad29722fe721ba8dc51596891200643 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 20:50:47 +0000 Subject: [PATCH 01/36] (maint) Update GRM config --- GitReleaseManager.yaml | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index 405c5a6..41342fd 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -1,12 +1,14 @@ 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 @@ -15,9 +17,24 @@ issue-labels-alias: header: Security plural: Security create: - include-sha-section: true - sha-section-heading: "SHA256 Hashes of the release artifacts" - sha-section-line-format: "- `{1}\t{0}`" + include-footer: true + footer-heading: Where to get it + footer-content: > + You can download this release from + [nuget](https://nuget.org/packages/Cake.StrongNameSigner/{milestone}), + or you can just reference it in a cake build script + with `#addin nuget:?package=Cake.StrongNameSigner&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: |- @@ -28,4 +45,4 @@ close: - [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: \ No newline at end of file + Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket: From cd3983b1e74e03e27d705edd150eeb2f3d5267e9 Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Thu, 18 Feb 2021 20:58:31 +0000 Subject: [PATCH 02/36] (maint) Update GRM config --- GitReleaseManager.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index 41342fd..e70d24b 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -21,9 +21,9 @@ create: footer-heading: Where to get it footer-content: > You can download this release from - [nuget](https://nuget.org/packages/Cake.StrongNameSigner/{milestone}), + [nuget](https://nuget.org/packages/Cake.DotNetVersionDetector/{milestone}), or you can just reference it in a cake build script - with `#addin nuget:?package=Cake.StrongNameSigner&version={milestone}`. + with `#addin nuget:?package=Cake.DotNetVersionDetector&version={milestone}`. footer-includes-milestone: true milestone-replace-text: "{milestone}" include-sha-section: true From 1d0e786601356d902a5e7633cc9202b13e512c08 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Tue, 16 Jul 2024 22:05:19 +0200 Subject: [PATCH 03/36] (#100) Bump Cake.Recipe to 3.1.1 and Cake in CI builds to 1.3.0 --- .config/dotnet-tools.json | 2 +- azure-pipelines.yml | 3 +-- build.ps1 | 4 ---- build.sh | 3 --- recipe.cake | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 727dfd7..4903ba5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "0.38.5", + "version": "1.3.0", "commands": [ "dotnet-cake" ] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index edc8f43..73002b3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,5 +27,4 @@ steps: script: 'recipe.cake' target: 'CI' verbosity: 'Normal' - Bootstrap: true - Version: '0.38.5' \ No newline at end of file + Version: '1.3.0' \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 0940a31..ea6b645 100644 --- a/build.ps1 +++ b/build.ps1 @@ -6,10 +6,6 @@ Write-Host "Restoring .NET Core tools" dotnet tool restore if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -Write-Host "Bootstrapping Cake" -dotnet cake $SCRIPT_NAME --bootstrap -if ($LASTEXITCODE -ne 0) { 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 ba5d0c9..9ed86f0 100755 --- a/build.sh +++ b/build.sh @@ -4,8 +4,5 @@ SCRIPT_NAME="recipe.cake" echo "Restoring .NET Core tools" dotnet tool restore -echo "Bootstrapping Cake" -dotnet cake $SCRIPT_NAME --bootstrap - echo "Running Build" dotnet cake $SCRIPT_NAME "$@" \ No newline at end of file diff --git a/recipe.cake b/recipe.cake index 477d62f..c4292e5 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Cake.Recipe&version=2.2.0 +#load nuget:?package=Cake.Recipe&version=3.1.1 Environment.SetVariableNames(); From 0c8543997b32ea597099e73b1fc8502ccc2881e2 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Thu, 18 Jul 2024 19:58:27 +0200 Subject: [PATCH 04/36] install the required .NET versions to build/release --- .appveyor.yml | 18 +++++++++++++++++- azure-pipelines.yml | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3a99359..6f44fde 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,23 @@ #---------------------------------# # Build Image # #---------------------------------# -image: Visual Studio 2019 +image: Visual Studio 2022 + +#---------------------------------# +# Install .NET # +#---------------------------------# +install: + - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" + - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null + - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" + - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 2.1 -InstallDir $env:DOTNET_INSTALL_DIR' + - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 3.1 -InstallDir $env:DOTNET_INSTALL_DIR' + - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 5.0 -InstallDir $env:DOTNET_INSTALL_DIR' + - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 6.0 -InstallDir $env:DOTNET_INSTALL_DIR' + - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 7.0 -InstallDir $env:DOTNET_INSTALL_DIR' + - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Channel 8.0 -InstallDir $env:DOTNET_INSTALL_DIR' + - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" + - ps: dotnet --info #---------------------------------# # Build Script # diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 73002b3..91b9207 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,6 +22,30 @@ steps: inputs: key: '"$(Agent.OS)" | recipe.cake' path: 'tools' +- task: UseDotNet@2 + displayName: 'Install .NETCore 2.1' + inputs: + version: '2.1.x' +- task: UseDotNet@2 + displayName: 'Install .NETCore 3.1' + inputs: + version: '3.1.x' +- task: UseDotNet@2 + displayName: 'Install .NET 5' + inputs: + version: '5.x' +- task: UseDotNet@2 + displayName: 'Install .NET 6' + inputs: + version: '6.x' +- task: UseDotNet@2 + displayName: 'Install .NET 7' + inputs: + version: '7.x' +- task: UseDotNet@2 + displayName: 'Install .NET 8' + inputs: + version: '8.x' - task: Cake@2 inputs: script: 'recipe.cake' From 9f1ee53b0710d8d203fbf20bcb279e46e60608b9 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Fri, 19 Jul 2024 21:28:17 +0200 Subject: [PATCH 05/36] (#102) add a CI pipeline on GH-Actions and switch to releasing on GH-Actions --- .github/workflows/build.yml | 84 +++++++++++++++++++++++++++++++++++++ recipe.cake | 5 ++- 2 files changed, 88 insertions(+), 1 deletion(-) 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..e95ee5e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,84 @@ +name: Build + +on: + push: + paths-ignore: + - "README.md" + pull_request: + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-2022, ubuntu-22.04, macos-12] + + env: + AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }} + AZURE_SOURCE: ${{ secrets.AZURE_SOURCE }} + AZURE_USER: ${{ secrets.AZURE_USER }} + GITHUB_PAT: ${{ secrets.GH_TOKEN }} + GPR_PASSWORD: ${{ secrets.GPR_PASSWORD }} + GPR_SOURCE: ${{ secrets.GPR_SOURCE }} + GPR_USER: ${{ secrets.GPR_USER }} + 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + + - name: Fetch all tags and branches + run: git fetch --prune --unshallow + + - name: Cache Tools + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4 + with: + path: tools + key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake', '.config/dotnet-tools.json') }} + + # install libgit2-dev on ubuntu, so libgit2sharp works + - name: Install libgit-dev + if: runner.os == 'Linux' + run: sudo apt-get install -y libgit2-dev + + - name: Setup required dotnet versions + uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1 + with: + dotnet-version: | + 2.1.818 + 3.1.x + 5.0.x + 6.0.x + 7.0.x + 8.0.x + + - name: Build project + uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0 + with: + script-path: recipe.cake + target: CI + verbosity: Normal + cake-version: tool-manifest + + - name: Upload Issues-Report + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + with: + if-no-files-found: warn + name: ${{ matrix.os }} Issues + path: BuildArtifacts/report.html + + - name: Upload Packages + if: runner.os == 'Windows' + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4 + with: + if-no-files-found: warn + name: package + path: BuildArtifacts/Packages/**/* diff --git a/recipe.cake b/recipe.cake index c4292e5..0193459 100644 --- a/recipe.cake +++ b/recipe.cake @@ -10,11 +10,14 @@ BuildParameters.SetParameters(context: Context, repositoryName: "Cake.DotNetVersionDetector", appVeyorAccountName: "cakecontrib", shouldRunDotNetCorePack: true, - preferredBuildProviderType: BuildProviderType.AzurePipelines, + preferredBuildProviderType: BuildProviderType.GitHubActions, shouldRunCodecov: false); BuildParameters.PrintParameters(Context); +ToolSettings.SetToolPreprocessorDirectives( + gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0"); + ToolSettings.SetToolSettings(context: Context, testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]*", testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*", From a6f20f4fd96739d801f3ebe31ab98da4d1eba70c Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Fri, 19 Jul 2024 23:06:35 +0200 Subject: [PATCH 06/36] added a reference to the ASoft website to the docs and how to install dotnetversions.exe. --- .gitignore | 3 ++- docs/input/docs/usage/examples.md | 11 +++++++++++ docs/input/index.cshtml | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f919d56..477b4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -345,4 +345,5 @@ BuildArtifacts/* .DS_Store # Wyam -docs/input/tasks \ No newline at end of file +docs/input/tasks +/config.wyam.* diff --git a/docs/input/docs/usage/examples.md b/docs/input/docs/usage/examples.md index 3e74769..42d82fe 100644 --- a/docs/input/docs/usage/examples.md +++ b/docs/input/docs/usage/examples.md @@ -1,6 +1,17 @@ --- Title: Examples --- +# Install the DotNetVersionDetector + +The DotNetVersionDetector (`dotnetversion.exe`) needs to be installed on your system before +Cake.DotNetVersionDetector can make use of it. + +You can download and install it manually from the [ASoft website](https://www.asoft.be/prod_netver.html). +Alternatively, you can install it by utilizing [Chocolatey](https://chocolatey.org): + +```pwsh +choco install dotnetversiondetector +``` # Basic Usage diff --git a/docs/input/index.cshtml b/docs/input/index.cshtml index 499d655..f331f7d 100644 --- a/docs/input/index.cshtml +++ b/docs/input/index.cshtml @@ -8,6 +8,6 @@ NoGutter: true

What is it?

- Cake.DotNetVersionDetector is an Addin for Cake which allows executing the DotNetVersionDetector exectuable. + Cake.DotNetVersionDetector is an Addin for Cake which allows executing the ASoft .NET Version Detector exectuable.

From 517183f014697d90d64da153c690a831467a8715 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Fri, 19 Jul 2024 23:06:59 +0200 Subject: [PATCH 07/36] (#99) created a simple README and added it to the nupkg --- README.md | 36 +++++++++++++++++++ .../Cake.DotNetVersionDetector.csproj | 5 +++ 2 files changed, 41 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..e75ce86 --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +# Cake.DotNetVersionDetector + +Cake.DotNetVersionDetector is set of aliases for [Cake][0] that help simplify using [ASoft .NET Version Detector][1]. + +[![License](http://img.shields.io/:license-mit-blue.svg)][2] + +## Information + +| |Stable|Pre-release| +|:--:|:--:|:--:| +|GitHub Release|-|[![GitHub release](https://img.shields.io/github/release/cake-contrib/Cake.DotNetVersionDetector.svg)][3]| +|NuGet|[![MyGet](https://img.shields.io/myget/cake-contrib/vpre/Cake.DotNetVersionDetector.svg)][4]|[![NuGet](https://img.shields.io/nuget/vpre/Cake.DotNetVersionDetector.svg)][5]| + +## Build Status + +|Develop|Master| +|:--:|:--:| +|[![Build status][6]][7]|[![Build status][8]][7]| + +## Quick Links + +- [API Documentation][9] +- [Usage Examples][10] + + +[0]: https://cakebuild.net/ +[1]: https://www.asoft.be/prod_netver.html +[2]: https://mit-license.org/ +[3]: https://github.com/cake-contrib/Cake.DotNetVersionDetector/releases/latest +[4]: https://www.myget.org/feed/cake-contrib/package/nuget/Cake.DotNetVersionDetector +[5]: https://www.nuget.org/packages/Cake.DotNetVersionDetector +[6]: https://github.com/cake-contrib/Cake.DotNetVersionDetector/actions/workflows/build.yml/badge.svg?branch=develop +[7]: https://github.com/cake-contrib/Cake.DotNetVersionDetector/actions/workflows/build.yml +[8]: https://github.com/cake-contrib/Cake.DotNetVersionDetector/actions/workflows/build.yml/badge.svg?branch=master +[9]: https://cakebuild.net/dsl/DotNetVersionDetector/ +[10]: https://cake-contrib.github.io/Cake.DotNetVersionDetector/docs/usage/examples diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index ee6b689..0fa6bf0 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -9,6 +9,10 @@ Cake Contributors + + + + @@ -32,6 +36,7 @@ $(PackageSourceProjectUrl).git All release notes for $(AssemblyName) can be found on our GitHub release page - $(PackageSourceProjectUrl)/releases/tag/$(Version) Development releases do not contain release notes, please see the closed issues in these cases - $(PackageSourceProjectUrl)/issues?q=milestone:$(FileVersion)+is:closed + README.md From 873783e60f4a984bc6a3b2a550cf7d427e198e1e Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 21:44:47 +0200 Subject: [PATCH 08/36] (#104) updated reference to CakeContrib.Guidelines and removed all icon related settings from csproj. --- .../Cake.DotNetVersionDetector.csproj | 4 +--- Source/Cake.DotNetVersionDetector/icon.png | Bin 15580 -> 0 bytes 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 Source/Cake.DotNetVersionDetector/icon.png diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index 0fa6bf0..77c7d3f 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -26,8 +26,6 @@ gep13;$(Company) Copyright © $(FullYear) — $(Authors.Replace(';',',')) Cake addin for executing DotNetVersionDetector (http://www.asoft.be/prod_netver.html) - icon.png - https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png MIT https://cake-contrib.github.io/Cake.DotNetVersionDetector/ Cake;Cake Script;Build;DotNetVersionDetector; @@ -40,7 +38,7 @@ - + all diff --git a/Source/Cake.DotNetVersionDetector/icon.png b/Source/Cake.DotNetVersionDetector/icon.png deleted file mode 100644 index 9881edc4e937ff34999ecf375c550249d82acc32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15580 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 From 45af51b1556c91007c2c69ca9c82e6925c567ba7 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 21:46:26 +0200 Subject: [PATCH 09/36] fixed CCG0007 - Missing suggested target net5.0 - Missing suggested target net461 --- .../Cake.DotNetVersionDetector.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index 77c7d3f..0a2db24 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -1,7 +1,7 @@ - net50;netstandard2.0 + net461;net5.0;netstandard2.0 true pdbonly en-GB From 20ee9ca863e231c14b44e9acd6cc8fc331793e73 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 21:47:10 +0200 Subject: [PATCH 10/36] fixed CCG0008 : Usage of tag 'cake-build' is recommended And 'cake-addin' and 'addin' --- .../Cake.DotNetVersionDetector.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index 0a2db24..c7542ef 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -28,7 +28,7 @@ Cake addin for executing DotNetVersionDetector (http://www.asoft.be/prod_netver.html) MIT https://cake-contrib.github.io/Cake.DotNetVersionDetector/ - Cake;Cake Script;Build;DotNetVersionDetector; + Cake;Cake Script;Build;DotNetVersionDetector;cake-build;addin;cake-addin git https://github.com/cake-contrib/Cake.DotNetVersionDetector $(PackageSourceProjectUrl).git From e81f69a22b7e64ec8e3bea2bff2418f353024e30 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 21:47:36 +0200 Subject: [PATCH 11/36] switched to https-link in description --- .../Cake.DotNetVersionDetector.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index c7542ef..bd0f98b 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -25,7 +25,7 @@ $(AssemblyTitle) gep13;$(Company) Copyright © $(FullYear) — $(Authors.Replace(';',',')) - Cake addin for executing DotNetVersionDetector (http://www.asoft.be/prod_netver.html) + Cake addin for executing DotNetVersionDetector (https://www.asoft.be/prod_netver.html) MIT https://cake-contrib.github.io/Cake.DotNetVersionDetector/ Cake;Cake Script;Build;DotNetVersionDetector;cake-build;addin;cake-addin From f7af0cb5405b4a10549f5b26fe2ea5c8c0137b50 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 22:12:03 +0200 Subject: [PATCH 12/36] (#108) added a reference to stylecop --- .editorconfig | 10 +- Source/.editorconfig | 241 ++++++++++++++++++ Source/Cake.DotNetVersionDetector.ruleset | 7 + Source/Cake.DotNetVersionDetector.sln | 6 + .../Cake.DotNetVersionDetector.csproj | 7 + Source/stylecop.json | 22 ++ 6 files changed, 289 insertions(+), 4 deletions(-) create mode 100644 Source/.editorconfig create mode 100644 Source/Cake.DotNetVersionDetector.ruleset create mode 100644 Source/stylecop.json diff --git a/.editorconfig b/.editorconfig index 1172014..0aae7a9 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,12 +5,14 @@ root = true [*] end_of_line = CRLF +trim_trailing_whitespace = true -[*.ps1] -indent_style = space -indent_size = 4 +[*.md] +trim_trailing_whitespace = false -[*.cs] +[*.{bat,ps1}] +charset = utf-8-bom +end_of_line = crlf indent_style = space indent_size = 4 diff --git a/Source/.editorconfig b/Source/.editorconfig new file mode 100644 index 0000000..be3351d --- /dev/null +++ b/Source/.editorconfig @@ -0,0 +1,241 @@ + +# This may not be needed, but kept for compatibility with VS +[*.{sln,csproj}] +end_of_line = crlf +indent_size = 2 + +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# Indentation and spacing +indent_size = 4 +indent_style = space +tab_width = 4 + +# New line preferences +end_of_line = crlf +insert_final_newline = true + +#### .NET Coding Conventions #### + +# Organize usings +dotnet_separate_import_directive_groups = true +dotnet_sort_system_directives_first = true +file_header_template = unset + +# this. and Me. preferences +dotnet_style_qualification_for_event = false:warning +dotnet_style_qualification_for_field = false:warning +dotnet_style_qualification_for_method = false:warning +dotnet_style_qualification_for_property = false:warning + +# Language keywords vs BCL types preferences +dotnet_style_predefined_type_for_locals_parameters_members = true:warning +dotnet_style_predefined_type_for_member_access = true:warning + +# Parentheses preferences +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent +dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent + +# Modifier preferences +dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning + +# Expression-level preferences +dotnet_style_coalesce_expression = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_null_propagation = true:suggestion +dotnet_style_object_initializer = true:suggestion +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true:silent +dotnet_style_prefer_compound_assignment = true:suggestion +dotnet_style_prefer_conditional_expression_over_assignment = true:silent +dotnet_style_prefer_conditional_expression_over_return = true:silent +dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion +dotnet_style_prefer_inferred_tuple_names = true:suggestion +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion +dotnet_style_prefer_simplified_boolean_expressions = true:suggestion +dotnet_style_prefer_simplified_interpolation = true:suggestion + +# Field preferences +dotnet_style_readonly_field = true:suggestion + +# Parameter preferences +dotnet_code_quality_unused_parameters = all:suggestion + +#### C# Coding Conventions #### + +# var preferences +csharp_style_var_elsewhere = false:silent +csharp_style_var_for_built_in_types = false:silent +csharp_style_var_when_type_is_apparent = false:silent + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_lambdas = true:silent +csharp_style_expression_bodied_local_functions = false:silent +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_prefer_switch_expression = true:suggestion + +# Null-checking preferences +csharp_style_conditional_delegate_call = true:suggestion + +# Modifier preferences +csharp_prefer_static_local_function = true:suggestion +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent + +# Code-block preferences +csharp_prefer_braces = true:silent +csharp_prefer_simple_using_statement = true:suggestion + +# Expression-level preferences +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_style_prefer_index_operator = true:suggestion +csharp_style_prefer_range_operator = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_unused_value_assignment_preference = discard_variable:suggestion +csharp_style_unused_value_expression_statement_preference = discard_variable:silent + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace:warning + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = false +csharp_indent_labels = flush_left +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = false + +#### Naming styles #### + +# Naming rules + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = warning +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.method_should_be_pascal_case.severity = warning +dotnet_naming_rule.method_should_be_pascal_case.symbols = method +dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.public_or_protected_field_should_be_pascal_case.severity = warning +dotnet_naming_rule.public_or_protected_field_should_be_pascal_case.symbols = public_or_protected_field +dotnet_naming_rule.public_or_protected_field_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.private_or_internal_static_field_should_be_pascal_case.severity = warning +dotnet_naming_rule.private_or_internal_static_field_should_be_pascal_case.symbols = private_or_internal_static_field +dotnet_naming_rule.private_or_internal_static_field_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.private_or_internal_field_should_be_camelcase.severity = warning +dotnet_naming_rule.private_or_internal_field_should_be_camelcase.symbols = private_or_internal_field +dotnet_naming_rule.private_or_internal_field_should_be_camelcase.style = camelcase + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Symbol specifications + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.method.applicable_kinds = method +dotnet_naming_symbols.method.applicable_accessibilities = public +dotnet_naming_symbols.method.required_modifiers = + +dotnet_naming_symbols.public_or_protected_field.applicable_kinds = field +dotnet_naming_symbols.public_or_protected_field.applicable_accessibilities = public, protected +dotnet_naming_symbols.public_or_protected_field.required_modifiers = + +dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field +dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected +dotnet_naming_symbols.private_or_internal_field.required_modifiers = + +dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field +dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected +dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case + +dotnet_naming_style.camelcase.required_prefix = +dotnet_naming_style.camelcase.required_suffix = +dotnet_naming_style.camelcase.word_separator = +dotnet_naming_style.camelcase.capitalization = camel_case \ No newline at end of file diff --git a/Source/Cake.DotNetVersionDetector.ruleset b/Source/Cake.DotNetVersionDetector.ruleset new file mode 100644 index 0000000..1f9e1cc --- /dev/null +++ b/Source/Cake.DotNetVersionDetector.ruleset @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Source/Cake.DotNetVersionDetector.sln b/Source/Cake.DotNetVersionDetector.sln index e28c2bd..ae49c1b 100644 --- a/Source/Cake.DotNetVersionDetector.sln +++ b/Source/Cake.DotNetVersionDetector.sln @@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.DotNetVersionDetector" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.DotNetVersionDetector.Tests", "Cake.DotNetVersionDetector.Tests\Cake.DotNetVersionDetector.Tests.csproj", "{78EB146D-2178-47FE-B999-1FECF1F3407B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{3D89E7D0-898E-4F5D-8CB7-E572FC56E317}" + ProjectSection(SolutionItems) = preProject + Cake.DotNetVersionDetector.ruleset = Cake.DotNetVersionDetector.ruleset + Directory.Build.targets = Directory.Build.targets + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index bd0f98b..87b1362 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -7,9 +7,12 @@ en-GB Cake DotNetVersionDetector addin Cake Contributors + $(ProjectDir)../Cake.DotNetVersionDetector.ruleset + + @@ -51,5 +54,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Source/stylecop.json b/Source/stylecop.json new file mode 100644 index 0000000..3d7a981 --- /dev/null +++ b/Source/stylecop.json @@ -0,0 +1,22 @@ +{ + "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", + "settings": { + "indentation": { + "indentationSize": 4, + "tabSize": 4, + "useTabs": false + }, + "orderingRules": { + "usingDirectivesPlacement": "outsideNamespace", + "blankLinesBetweenUsingGroups": "allow", + "systemUsingDirectivesFirst": true + }, + "documentationRules": { + "xmlHeader": false, + "documentExposedElements": true, + "documentInternalElements": false, + "documentPrivateElements": false, + "documentPrivateFields": false + } + } +} \ No newline at end of file From c20624a7cbdb84a4bd040e447f9ac087c1f951f2 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 22:14:12 +0200 Subject: [PATCH 13/36] fixed stylecop warnings regarding documentation --- .../DotNetVersionDetectorAliases.cs | 4 ++-- .../Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs | 4 ++-- .../DotNetVersionDetectorSettings.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs index 32f9e97..066dca9 100644 --- a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs +++ b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs @@ -19,7 +19,7 @@ namespace Cake.DotNetVersionDetector public static class DotNetVersionDetectorAliases { /// - /// Runs .Net Version Detector, and outputs to specified output FilePath + /// Runs .Net Version Detector, and outputs to specified output FilePath. /// /// The context. /// The output file path. @@ -35,7 +35,7 @@ public static void DotNetVersionDetector(this ICakeContext context, FilePath out } /// - /// Runs .Net Version Detector, and outputs to specified output FilePath with the specified DotNetVersionDetectorSettings + /// Runs .Net Version Detector, and outputs to specified output FilePath with the specified DotNetVersionDetectorSettings. /// /// The context. /// The output file path. diff --git a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs index 2d8129a..a6e8db0 100644 --- a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs +++ b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs @@ -7,7 +7,7 @@ namespace Cake.DotNetVersionDetector { /// - /// The .Net Version Detector Runner + /// The .Net Version Detector Runner. /// public class DotNetVersionDetectorRunner : Tool { @@ -19,7 +19,7 @@ public class DotNetVersionDetectorRunner : Tool /// The file system. /// The environment. /// The process runner. - /// The tool locator + /// The tool locator. public DotNetVersionDetectorRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator toolLocator) : base(fileSystem, environment, processRunner, toolLocator) { diff --git a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs index 9a19af3..63b39b1 100644 --- a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs +++ b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs @@ -9,7 +9,7 @@ namespace Cake.DotNetVersionDetector public sealed class DotNetVersionDetectorSettings : ToolSettings { /// - /// Gets of sets a value indicating whether or not to output extended information in reports or not. + /// Gets or sets a value indicating whether, or not to output extended information in reports or not. /// public bool Extended { get; set; } } From 1ed17c0b61fbf861bef0d43dfddda1a9af29bc00 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 22:16:43 +0200 Subject: [PATCH 14/36] fixed stylecop warnings regarding naming --- .../DotNetVersionDetectorRunner.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs index a6e8db0..6714f65 100644 --- a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs +++ b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorRunner.cs @@ -11,7 +11,7 @@ namespace Cake.DotNetVersionDetector /// public class DotNetVersionDetectorRunner : Tool { - private readonly ICakeEnvironment _environment; + private readonly ICakeEnvironment environment; /// /// Initializes a new instance of the class. @@ -23,7 +23,7 @@ public class DotNetVersionDetectorRunner : Tool public DotNetVersionDetectorRunner(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator toolLocator) : base(fileSystem, environment, processRunner, toolLocator) { - _environment = environment; + this.environment = environment; } /// @@ -65,7 +65,7 @@ private ProcessArgumentBuilder GetArguments(FilePath outputFilePath, DotNetVersi { var builder = new ProcessArgumentBuilder(); - builder.AppendQuoted(outputFilePath.MakeAbsolute(_environment).FullPath); + builder.AppendQuoted(outputFilePath.MakeAbsolute(environment).FullPath); if (settings.Extended) { From d504c8a845f0e21508152568dd0c6cbd4039e9c1 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 22:20:38 +0200 Subject: [PATCH 15/36] fixed some JetBrains warings --- .../Cake.DotNetVersionDetector.csproj | 1 + .../DotNetVersionDetectorAliases.cs | 11 +++++++---- .../DotNetVersionDetectorSettings.cs | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index 87b1362..c7d37a7 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -50,6 +50,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs index 066dca9..5a1f36d 100644 --- a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs +++ b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorAliases.cs @@ -3,10 +3,12 @@ using Cake.Core.Annotations; using Cake.Core.IO; +using JetBrains.Annotations; + namespace Cake.DotNetVersionDetector { /// - /// Contains functionality related to the .Net Version Detector tool. + /// Contains functionality related to the .Net Version Detector tool. /// /// In order to use the commands for this addin, you will need to have the .Net Version Detector tool available. This can be installed via Chocolatey. /// In addition, you will need to include the following: @@ -16,6 +18,7 @@ namespace Cake.DotNetVersionDetector /// /// [CakeAliasCategory("DotNetVersionDetector")] + [PublicAPI] public static class DotNetVersionDetectorAliases { /// @@ -34,7 +37,7 @@ public static void DotNetVersionDetector(this ICakeContext context, FilePath out DotNetVersionDetector(context, outputFilePath, new DotNetVersionDetectorSettings()); } -/// + /// /// Runs .Net Version Detector, and outputs to specified output FilePath with the specified DotNetVersionDetectorSettings. /// /// The context. @@ -53,12 +56,12 @@ public static void DotNetVersionDetector(this ICakeContext context, FilePath out { if (context == null) { - throw new ArgumentNullException("context"); + throw new ArgumentNullException(nameof(context)); } if (outputFilePath == null) { - throw new ArgumentNullException("outputFilePath"); + throw new ArgumentNullException(nameof(outputFilePath)); } var runner = new DotNetVersionDetectorRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); diff --git a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs index 63b39b1..581e22e 100644 --- a/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs +++ b/Source/Cake.DotNetVersionDetector/DotNetVersionDetectorSettings.cs @@ -1,4 +1,3 @@ -using Cake.Core.IO; using Cake.Core.Tooling; namespace Cake.DotNetVersionDetector From d1224f2607e1ad9f2f1888fa3805784372497e78 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 20:43:08 +0000 Subject: [PATCH 16/36] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..5db72dd --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ] +} From 74a30e5030277fd8f32042e2d7ed24df2d819c30 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 22:45:59 +0200 Subject: [PATCH 17/36] removed dependabot config and set renovate to cake-like defaults --- .github/dependabot.yml | 12 ------------ .github/renovate.json | 14 ++++++++++++++ renovate.json | 6 ------ 3 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 .github/dependabot.yml create mode 100644 .github/renovate.json delete mode 100644 renovate.json diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 5ceefc9..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,12 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "nuget" - directory: "/" - schedule: - interval: "daily" - ignore: - - "Cake.Core" - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" \ No newline at end of file diff --git a/.github/renovate.json b/.github/renovate.json new file mode 100644 index 0000000..8ef1836 --- /dev/null +++ b/.github/renovate.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "github>cake-contrib/renovate-presets:cake-recipe", + "github>cake-contrib/renovate-presets:github-actions" ], + "packageRules": [ + { + "description": "Updates to Cake.Core references are breaking.", + "matchPackageNames": ["Cake.Core"], + "matchUpdateTypes": ["major"], + "labels": ["Breaking Change"] + } + ] +} \ No newline at end of file diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 5db72dd..0000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ] -} From e9cdda16c8df89c7f1b34d9bb03e09f577b8002c Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 22:59:05 +0200 Subject: [PATCH 18/36] (#114) build PR only if they originate in remote repos --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e95ee5e..344465d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,7 @@ on: 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-2022, ubuntu-22.04, macos-12] From f73421e1c93b5068237e188c8271ec06a350ba13 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Sat, 20 Jul 2024 23:33:21 +0200 Subject: [PATCH 19/36] (#114) build only on selected branches --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 344465d..4dcbf9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,14 @@ name: Build on: push: + branches: + - master + - develop + - "feature/**" + - "release/**" + - "hotfix/**" + tags: + - "*" paths-ignore: - "README.md" pull_request: @@ -9,7 +17,6 @@ on: 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-2022, ubuntu-22.04, macos-12] From ed82e03aecaf82046c80c9e37d5942b33d83f891 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 21:45:12 +0000 Subject: [PATCH 20/36] Pin dependencies --- .github/workflows/release-notes.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 8fa1ace..c573940 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,34 +11,34 @@ jobs: steps: - name: Checkout the requested branch - uses: actions/checkout@v2.3.4 + uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools - uses: actions/cache@v2.1.4 + uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # 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 + uses: gittools/actions/gitversion/setup@a91d2e8b65fa493e04e072c115068cbd4a6f03f8 # 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 + uses: gittools/actions/gitversion/execute@a91d2e8b65fa493e04e072c115068cbd4a6f03f8 # 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 + uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6 # 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 + uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1 with: script-path: recipe.cake target: releasenotes From 65dce5f6854663d660a20c423156b2e076386431 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 21:51:52 +0000 Subject: [PATCH 21/36] Update dependency Cake.Addin.Analyzer to v0.1.3 --- .../Cake.DotNetVersionDetector.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index c7d37a7..624ba4d 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -44,7 +44,7 @@ all - + all runtime; build; native; contentfiles; analyzers From ca52ecef2d1e07fbad1fee80a28a0c14e7b5b561 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 21:58:32 +0000 Subject: [PATCH 22/36] Update actions/checkout action to v2.7.0 --- .github/workflows/release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index c573940..193b086 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout the requested branch - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4 + uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools From 0217e06824324eef3d526c2152b624a22e6a9a08 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 22:03:39 +0000 Subject: [PATCH 23/36] Update actions/cache action to v2.1.8 --- .github/workflows/release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 193b086..c4fa06d 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -15,7 +15,7 @@ jobs: - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools - uses: actions/cache@26968a09c0ea4f3e233fdddbafd1166051a095f6 # v2.1.4 + uses: actions/cache@2b250bc32ad02700b996b496c14ac8c2840a2991 # v2.1.8 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} From ce98bbcc349fc9f708ef654f2fb59a3c2b7e2bf2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 22:11:58 +0000 Subject: [PATCH 24/36] Update ad-m/github-push-action action to v0.8.0 --- .github/workflows/release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index c4fa06d..82a8894 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -33,7 +33,7 @@ jobs: run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }} - name: Push new branch if: ${{ steps.gitversion.outputs.majorMinorPatch }} - uses: ad-m/github-push-action@40bf560936a8022e68a3c00e7d2abefaf01305a6 # v0.6.0 + uses: ad-m/github-push-action@d91a481090679876dfc4178fef17f286781251df # v0.8.0 with: branch: "release/${{ steps.gitversion.outputs.majorMinorPatch }}" github_token: ${{ secrets.GH_TOKEN }} From cf245394ecf933f981da148fe801829484aa21da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 22:21:00 +0000 Subject: [PATCH 25/36] Update dependency Microsoft.NET.Test.Sdk to v16.11.0 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 390fe1a..1699532 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -13,7 +13,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 1b10be88a981bbacedf0d612581b340a1016cbbe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 06:01:03 +0000 Subject: [PATCH 26/36] Update actions/cache action to v4 --- .github/workflows/release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 82a8894..7ffd058 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -15,7 +15,7 @@ jobs: - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools - uses: actions/cache@2b250bc32ad02700b996b496c14ac8c2840a2991 # v2.1.8 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} From a3ac43ecd8f7fee5f28e3d14fa0121e5bacaa87b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 07:16:48 +0000 Subject: [PATCH 27/36] Update xunit-dotnet monorepo --- .../Cake.DotNetVersionDetector.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 1699532..6c15ef1 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -19,8 +19,8 @@ all - - + + From 41d483ade62b3b2928f046ceee04cfee1c3d6424 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 07:29:59 +0000 Subject: [PATCH 28/36] Update actions/checkout action to v4 --- .github/workflows/release-notes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 7ffd058..5ded180 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout the requested branch - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools From a9cc909ac0c129da3702f0a052e9ad926a091079 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 07:37:29 +0000 Subject: [PATCH 29/36] Update gittools/actions action to v0.13.6 --- .github/workflows/release-notes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index 5ded180..a3a70e5 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -21,13 +21,13 @@ jobs: 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@a91d2e8b65fa493e04e072c115068cbd4a6f03f8 # v0.9.9 + uses: gittools/actions/gitversion/setup@c368911c8982846e30b6855f79e579104849bfc3 # v0.13.6 with: versionSpec: "5.x" - name: Run git version if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }} id: gitversion - uses: gittools/actions/gitversion/execute@a91d2e8b65fa493e04e072c115068cbd4a6f03f8 # v0.9.9 + uses: gittools/actions/gitversion/execute@c368911c8982846e30b6855f79e579104849bfc3 # v0.13.6 - name: Create release branch ${{ github.event.inputs.version }} if: ${{ steps.gitversion.outputs.majorMinorPatch }} run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }} From 25eb39228a9e53b736df6de31d07f5d275dd2c6d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 07:44:30 +0000 Subject: [PATCH 30/36] Update dependency coverlet.msbuild to v3.2.0 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 6c15ef1..1dab394 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -9,7 +9,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 70d4d4057e27508cfa94a685d56eed80677f4f16 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 08:22:47 +0000 Subject: [PATCH 31/36] Update dependency NSubstitute to v4.4.0 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 1dab394..089c41f 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -18,7 +18,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + From 4375ecddacfa13df3eacfac93a529bd1293a4b65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 08:48:02 +0000 Subject: [PATCH 32/36] Update dependency Microsoft.SourceLink.GitHub to v1.1.1 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- .../Cake.DotNetVersionDetector.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 089c41f..53193f7 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -14,7 +14,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index 624ba4d..cc89b81 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -51,7 +51,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 48c306e6fe0bed95f8628f44e9526de935a662b9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 08:55:32 +0000 Subject: [PATCH 33/36] Update dependency Microsoft.SourceLink.GitHub to v8 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- .../Cake.DotNetVersionDetector.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 53193f7..065c56e 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -14,7 +14,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj index cc89b81..e74ab75 100644 --- a/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj +++ b/Source/Cake.DotNetVersionDetector/Cake.DotNetVersionDetector.csproj @@ -51,7 +51,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 394e1c81890e30371c0757b972cfc3330162bfe1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 09:01:41 +0000 Subject: [PATCH 34/36] Update dependency NSubstitute to v5 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 065c56e..0b72077 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -18,7 +18,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + From a7de82aa53c91e2477adf5f7a9e25a9f2caf11c7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 12:02:48 +0000 Subject: [PATCH 35/36] Update dependency coverlet.msbuild to v6 --- .../Cake.DotNetVersionDetector.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj index 0b72077..b04244f 100644 --- a/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj +++ b/Source/Cake.DotNetVersionDetector.Tests/Cake.DotNetVersionDetector.Tests.csproj @@ -9,7 +9,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 7010ea082337a3d017ee33cef71f0ea65d1f1eb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Jul 2024 12:08:57 +0000 Subject: [PATCH 36/36] Update gittools/actions action to v1 --- .github/workflows/release-notes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-notes.yml b/.github/workflows/release-notes.yml index a3a70e5..97ea408 100644 --- a/.github/workflows/release-notes.yml +++ b/.github/workflows/release-notes.yml @@ -21,13 +21,13 @@ jobs: 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@c368911c8982846e30b6855f79e579104849bfc3 # v0.13.6 + uses: gittools/actions/gitversion/setup@dcb17efb49ec7f20efdebce79cc397a3952c63db # v1.2.0 with: versionSpec: "5.x" - name: Run git version if: ${{ !contains(github.ref, '/hotfix/') && !contains(github.ref, '/release/') }} id: gitversion - uses: gittools/actions/gitversion/execute@c368911c8982846e30b6855f79e579104849bfc3 # v0.13.6 + uses: gittools/actions/gitversion/execute@dcb17efb49ec7f20efdebce79cc397a3952c63db # v1.2.0 - name: Create release branch ${{ github.event.inputs.version }} if: ${{ steps.gitversion.outputs.majorMinorPatch }} run: git switch -c release/${{ steps.gitversion.outputs.majorMinorPatch }}