diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c074c56..a71ceca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ windows-2022, ubuntu-22.04, macos-12 ] + os: [ windows-2022, ubuntu-22.04, macos-13 ] env: AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }} @@ -44,25 +44,29 @@ jobs: steps: - name: checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} - - uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 with: + # codecov needs 2.1 + # unittests needs 3.1 + # gitversion needs 5.0 + # cake 1.3 needs 6.0 + # .NET 9 to build dotnet-version: | 2.1 3.1 5.0 6.0 - 7.0 - 8.0 + 9.0 - name: Build project - uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1.4.1 + uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0 with: script-path: recipe.cake target: CI @@ -70,7 +74,7 @@ jobs: # currently, Cake.Recipe does not upload artifacts when run on gh-actions - name: Upload Issues - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 with: if-no-files-found: warn name: ${{ matrix.os }} Issues @@ -78,7 +82,7 @@ jobs: BuildArtifacts/report.html BuildArtifacts/**/coverlet/*.xml - name: Upload Packages - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4 if: runner.os == 'Windows' with: if-no-files-found: warn diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3e22144..028331f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,27 +30,27 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: fetch-depth: 0 - - uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 with: + # gitversion needs 5.0 + # cake 1.3 needs 6.0 + # .NET 9 to build dotnet-version: | - 2.1 - 3.1 5.0 6.0 - 7.0 - 8.0 + 9.0 - name: Cache Tools - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3 + uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2 + uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -58,16 +58,16 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - - uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0 with: dotnet-version: 7.0.x - name: Build project - uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1.4.1 + uses: cake-build/cake-action@1223b6fa067ad192159f43b50cd4f953679b0934 # v2.0.0 with: script-path: recipe.cake target: DotNetCore-Build cake-version: tool-manifest - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2 + uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3 diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj index bcd5e47..9ad8074 100644 --- a/demo/frosting/build/Build.csproj +++ b/demo/frosting/build/Build.csproj @@ -5,7 +5,7 @@ $(MSBuildProjectDirectory) - + diff --git a/demo/script/.config/dotnet-tools.json b/demo/script/.config/dotnet-tools.json index da200cd..1f95b27 100644 --- a/demo/script/.config/dotnet-tools.json +++ b/demo/script/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "4.0.0", + "version": "4.2.0", "commands": [ "dotnet-cake" ] diff --git a/docs/input/doc/parameters.md b/docs/input/doc/parameters.md index 53e5f8c..6885aa8 100644 --- a/docs/input/doc/parameters.md +++ b/docs/input/doc/parameters.md @@ -70,13 +70,13 @@ This corresponds to the `--global` option, and tells npm to install this package # CakeTool This parameter controls the installation location of the npm package: While the default is the current working directory (unless [global](#global) is set), -setting `caketool` will set the installation location to inside the `tools` folder and thus ensure that the installed tools are automatically found as +setting `caketools` will set the installation location to inside the `tools` folder and thus ensure that the installed tools are automatically found as tools in Cake. ### Example ``` -#tool npm:?package=yo&caketool +#tool npm:?package=yo&caketools ``` # Save diff --git a/global.json b/global.json index 7d3b56c..0d837a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.101", "rollForward": "latestFeature" } -} \ No newline at end of file +} diff --git a/recipe.cake b/recipe.cake index 08c740f..723344d 100644 --- a/recipe.cake +++ b/recipe.cake @@ -14,11 +14,14 @@ BuildParameters.SetParameters( shouldUseDeterministicBuilds: true, gitterMessage: "@/all " + standardNotificationMessage, twitterMessage: standardNotificationMessage, + shouldRunCodecov: false, preferredBuildProviderType: BuildProviderType.GitHubActions, preferredBuildAgentOperatingSystem: PlatformFamily.Linux); BuildParameters.PrintParameters(Context); ToolSettings.SetToolSettings(context: Context); +ToolSettings.SetToolPreprocessorDirectives( + gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.18.0"); Build.RunDotNetCore(); diff --git a/src/Cake.Npm.Module.Tests/Cake.Npm.Module.Tests.csproj b/src/Cake.Npm.Module.Tests/Cake.Npm.Module.Tests.csproj index 5bb3a38..58c1f5c 100644 --- a/src/Cake.Npm.Module.Tests/Cake.Npm.Module.Tests.csproj +++ b/src/Cake.Npm.Module.Tests/Cake.Npm.Module.Tests.csproj @@ -7,19 +7,19 @@ Remove this hack, if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0. --> netcoreapp3.1 - net6.0 + net8.0 - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Cake.Npm.Module/Cake.Npm.Module.csproj b/src/Cake.Npm.Module/Cake.Npm.Module.csproj index cec691e..327cd28 100644 --- a/src/Cake.Npm.Module/Cake.Npm.Module.csproj +++ b/src/Cake.Npm.Module/Cake.Npm.Module.csproj @@ -1,13 +1,13 @@  - net6.0 + net8.0 true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb true Cake.Npm.Module - 4.0.0 + 5.0.0 @@ -39,11 +39,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all