diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43510328..36ab62ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ windows-2019, ubuntu-18.04, macos-10.15 ] + os: [ windows-2022, ubuntu-22.04, macos-12 ] env: AZURE_PASSWORD: ${{ secrets.AZURE_PASSWORD }} @@ -43,11 +43,11 @@ jobs: WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }} steps: - - name: Checkout the repository - uses: actions/checkout@v3 + - name: Checkout the repository + uses: actions/checkout@v4 - name: Fetch all tags and branches run: git fetch --prune --unshallow - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: dotnet-version: | 2.1.818 @@ -55,6 +55,7 @@ jobs: 5.0.x 6.0.x 7.0.x + 8.0.x - name: Cache Tools uses: actions/cache@v3 with: @@ -66,7 +67,7 @@ jobs: script-path: recipe.cake target: CI verbosity: Diagnostic - cake-version: 1.3.0 + cake-version: tool-manifest - name: Upload Issues uses: actions/upload-artifact@v3 with: @@ -81,4 +82,4 @@ jobs: with: if-no-files-found: warn name: package - path: BuildArtifacts/Packages/**/* \ No newline at end of file + path: BuildArtifacts/Packages/**/* diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index beb98f1d..44da82cf 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,7 +18,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -31,12 +31,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3.2.0 with: - dotnet-version: 7.0.x + dotnet-version: | + 5.0.x + 8.0.x - name: Cache Tools uses: actions/cache@v3 @@ -59,7 +61,7 @@ jobs: with: script-path: recipe.cake target: DotNetCore-Build - cake-version: 1.3.0 + cake-version: tool-manifest env: COMPlus_DbgEnableMiniDump: 1 COMPlus_DbgMiniDumpType: 1 diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml index 42e7d1fd..c3963c43 100644 --- a/.github/workflows/publishDocs.yml +++ b/.github/workflows/publishDocs.yml @@ -11,15 +11,15 @@ env: jobs: cake: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Fetch all tags and branches run: git fetch --prune --unshallow - + - name: Cache Tools uses: actions/cache@v3 with: @@ -32,4 +32,4 @@ jobs: script-path: recipe.cake target: Force-Publish-Documentation verbosity: Diagnostic - cake-version: 1.3.0 + cake-version: tool-manifest diff --git a/demo/cake/.config/dotnet-tools.json b/demo/cake/.config/dotnet-tools.json index 31e896e9..da200cda 100644 --- a/demo/cake/.config/dotnet-tools.json +++ b/demo/cake/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "2.0.0", + "version": "4.0.0", "commands": [ "dotnet-cake" ] diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj index a0c38084..01f3df49 100644 --- a/demo/frosting/build/Build.csproj +++ b/demo/frosting/build/Build.csproj @@ -8,7 +8,7 @@ ..\..\..\src\Cake.7zip\bin\Release\net6.0\Cake.7zip.dll - + diff --git a/demo/frosting/build/BuildSetup.cs b/demo/frosting/build/BuildSetup.cs index 4d82c297..cef147ec 100644 --- a/demo/frosting/build/BuildSetup.cs +++ b/demo/frosting/build/BuildSetup.cs @@ -1,11 +1,12 @@ using Cake.Common.Diagnostics; +using Cake.Core; using Cake.Frosting; namespace Build { public class BuildSetup : FrostingSetup { - public override void Setup(BuildContext context) + public override void Setup(BuildContext context, ISetupContext info) { var startPath = context.Environment.WorkingDirectory; context.Information($"Frosting was started from: {startPath}"); diff --git a/global.json b/global.json index cb5eb578..780e635c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.100", + "version": "8.0.100", "rollForward": "latestFeature" } } diff --git a/recipe.cake b/recipe.cake index 8f1cf976..4afae1e3 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Cake.Recipe&version=3.0.1 +#load nuget:?package=Cake.Recipe&version=3.1.1 Environment.SetVariableNames(); diff --git a/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj b/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj index 3f9e9ac9..423e7e91 100644 --- a/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj +++ b/src/Cake.7zip.Tests/Cake.7zip.Tests.csproj @@ -6,7 +6,7 @@ This is done to make Cake.Recipe avoid using OpenCover. Remove this hack if Cake.Recipe bumps the usage of Cake.Incubator to version 7.0.0 --> netcoreapp3.1 - net6.0;net7.0; + net6.0;net7.0;net8.0 ..\cake.7zip.ruleset false @@ -15,21 +15,21 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + runtime; build; native; contentfiles; analyzers all diff --git a/src/Cake.7zip/Cake.7zip.csproj b/src/Cake.7zip/Cake.7zip.csproj index f1e827b9..c5d58c6b 100644 --- a/src/Cake.7zip/Cake.7zip.csproj +++ b/src/Cake.7zip/Cake.7zip.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0; + net6.0;net7.0;net8.0 true true $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb @@ -39,9 +39,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -49,6 +49,6 @@ runtime; build; native; contentfiles; analyzers all - +