diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f62c85e0..b6295b73 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 }} @@ -44,20 +44,21 @@ jobs: steps: - name: Checkout the repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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: # codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0 dotnet-version: | - 2.1.818 - 3.1.x - 5.0.x - 6.0.x - 7.0.x + 2.1 + 3.1 + 5.0 + 6.0 + 7.0 + 8.0 - name: Cache Tools - uses: actions/cache@v3.2.4 + uses: actions/cache@v3.3.2 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} @@ -69,7 +70,7 @@ jobs: verbosity: Diagnostic cake-version: 1.3.0 - name: Upload Issues - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v3.1.3 with: if-no-files-found: warn name: ${{ matrix.os }} Issues @@ -77,7 +78,7 @@ jobs: BuildArtifacts/report.html BuildArtifacts/**/coverlet/*.xml - name: Upload Packages - uses: actions/upload-artifact@v3.1.2 + uses: actions/upload-artifact@v3.1.3 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 ab927127..a83d57f0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -17,7 +17,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -30,20 +30,21 @@ jobs: steps: - name: Checkout the repository - uses: actions/checkout@v3.3.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - 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: # codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0 dotnet-version: | - 2.1.818 - 3.1.x - 5.0.x - 6.0.x - 7.0.x + 2.1 + 3.1 + 5.0 + 6.0 + 7.0 + 8.0 - name: Cache Tools - uses: actions/cache@v3.2.4 + uses: actions/cache@v3.3.2 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml index 8cb771cb..cdc07ac1 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 the repository - uses: actions/checkout@v3.3.0 + - name: Checkout the repository + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Fetch all tags and branches run: git fetch --prune --unshallow - name: Cache Tools - uses: actions/cache@v3.2.4 + uses: actions/cache@v3.3.2 with: path: tools key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }} diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj index 43e55875..639af7a7 100644 --- a/demo/frosting/build/Build.csproj +++ b/demo/frosting/build/Build.csproj @@ -1,16 +1,16 @@ Exe - net6.0 + net8.0 $(MSBuildProjectDirectory) - - + + - - ..\..\..\src\Cake.ESLint\bin\Debug\netstandard2.0\Cake.ESLint.dll + + $(ProjectDir)../../../src/Cake.ESLint/bin/Debug/net8.0/Cake.ESLint.dll diff --git a/demo/frosting/src2/package.json b/demo/frosting/src2/package.json index 7b89884c..69a4fc00 100644 --- a/demo/frosting/src2/package.json +++ b/demo/frosting/src2/package.json @@ -9,6 +9,6 @@ "author": "", "license": "ISC", "devDependencies": { - "eslint": "8.33.0" + "eslint": "8.54.0" } } diff --git a/demo/script/.config/dotnet-tools.json b/demo/script/.config/dotnet-tools.json index 31e896e9..da200cda 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": "2.0.0", + "version": "4.0.0", "commands": [ "dotnet-cake" ] diff --git a/demo/script/build.cake b/demo/script/build.cake index 16162b90..75952662 100644 --- a/demo/script/build.cake +++ b/demo/script/build.cake @@ -1,5 +1,5 @@ -#addin nuget:?package=Cake.Npm&version=2.0.0 -#r "..\..\src\Cake.ESLint\bin\Debug\net6.0\Cake.ESLint.dll" +#addin nuget:?package=Cake.Npm&version=3.0.0 +#r "..\..\src\Cake.ESLint\bin\Debug\net8.0\Cake.ESLint.dll" /////////////////////////////////////////////////////////////////////////////// // ARGUMENTS @@ -12,11 +12,11 @@ var target = Argument("target", "Default"); /////////////////////////////////////////////////////////////////////////////// Task("ensure-eslint-tool") -.Does(() => +.Does(() => { var tools = Context.Configuration.GetToolPath(Context.Environment.WorkingDirectory, Context.Environment); CreateDirectory(tools); - var settings = new NpmInstallSettings + var settings = new NpmInstallSettings { WorkingDirectory = tools }; diff --git a/demo/script/src2/package.json b/demo/script/src2/package.json index 7b89884c..69a4fc00 100644 --- a/demo/script/src2/package.json +++ b/demo/script/src2/package.json @@ -9,6 +9,6 @@ "author": "", "license": "ISC", "devDependencies": { - "eslint": "8.33.0" + "eslint": "8.54.0" } } diff --git a/global.json b/global.json index d6201a6e..dd9e1c00 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "allowPrerelease": true, - "version": "7.0.102", + "version": "8.0.100", "rollForward": "latestFeature" } } diff --git a/recipe.cake b/recipe.cake index ff51fb96..8cea3956 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.ESLint.Tests/Cake.ESLint.Tests.csproj b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj index bcbbdf52..41fa6983 100644 --- a/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj +++ b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj @@ -8,24 +8,24 @@ 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 $(NoWarn);CS1591;SA1600 false - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Cake.ESLint/Cake.ESLint.csproj b/src/Cake.ESLint/Cake.ESLint.csproj index 0779e171..7af6d58f 100644 --- a/src/Cake.ESLint/Cake.ESLint.csproj +++ b/src/Cake.ESLint/Cake.ESLint.csproj @@ -1,6 +1,6 @@ - net6.0;net7.0; + net6.0;net7.0;net8.0 true true snupkg @@ -32,12 +32,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all