diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 727dfd76..4903ba5f 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/.github/renovate.json b/.github/renovate.json
index 392c3ce5..ef816382 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,6 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
- "extends": [ "github>nils-a/renovate-config" ],
+ "extends": [ "github>nils-a/renovate-config:testing" ],
"packageRules": [
{
"matchPackageNames": ["cake.tool", "Cake.Core"],
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3723875..35cf7eda 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,11 +43,11 @@ jobs:
WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
steps:
- - name: Checkout the repository
- uses: actions/checkout@v2.4.0
+ - name: Checkout the repository
+ uses: actions/checkout@v3.1.0
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- - uses: actions/setup-dotnet@v1.9.0
+ - uses: actions/setup-dotnet@v3.0.3
with:
# codecov needs 2.1, unittests needs 3.1, gitversion needs 5.0
dotnet-version: |
@@ -55,21 +55,21 @@ jobs:
3.1.x
5.0.x
6.0.x
+ 7.0.x
- name: Cache Tools
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.11
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
- name: Build project
- uses: cake-build/cake-action@v1.4.0
+ uses: cake-build/cake-action@v1.4.1
with:
script-path: recipe.cake
target: CI
verbosity: Diagnostic
- cake-version: 0.38.5
- cake-bootstrap: true
+ cake-version: 1.3.0
- name: Upload Issues
- uses: actions/upload-artifact@v2.2.4
+ uses: actions/upload-artifact@v3.1.1
with:
if-no-files-found: warn
name: ${{ matrix.os }} Issues
@@ -77,9 +77,9 @@ jobs:
BuildArtifacts/report.html
BuildArtifacts/**/coverlet/*.xml
- name: Upload Packages
- uses: actions/upload-artifact@v2.2.4
+ uses: actions/upload-artifact@v3.1.1
if: runner.os == 'Windows'
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 b93ce25b..070972d5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -29,41 +29,41 @@ jobs:
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
steps:
- - name: Checkout the repository
- uses: actions/checkout@v2.4.0
+ - name: Checkout the repository
+ uses: actions/checkout@v3.1.0
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- - uses: actions/setup-dotnet@v1.9.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
+ - uses: actions/setup-dotnet@v3.0.3
+ 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
- name: Cache Tools
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.11
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
+ # By default, queries listed here will override any specified in a config file.
# 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
- name: Build project
- uses: cake-build/cake-action@v1.4.0
+ uses: cake-build/cake-action@v1.4.1
with:
script-path: recipe.cake
target: DotNetCore-Build
- cake-version: 0.38.5
- cake-bootstrap: true
+ cake-version: 1.3.0
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/publishDocs.yml b/.github/workflows/publishDocs.yml
index b81e7bad..a218a341 100644
--- a/.github/workflows/publishDocs.yml
+++ b/.github/workflows/publishDocs.yml
@@ -15,19 +15,18 @@ jobs:
steps:
- name: Checkout the repository
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3.1.0
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Cache Tools
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3.0.11
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
- name: Publishing documentaiton
- uses: cake-build/cake-action@v1.4.0
+ uses: cake-build/cake-action@v1.4.1
with:
script-path: recipe.cake
target: Force-Publish-Documentation
verbosity: Diagnostic
- cake-version: 0.38.5
- cake-bootstrap: true
+ cake-version: 1.3.0
diff --git a/demo/frosting/build/Build.csproj b/demo/frosting/build/Build.csproj
index 28c61538..43e55875 100644
--- a/demo/frosting/build/Build.csproj
+++ b/demo/frosting/build/Build.csproj
@@ -5,8 +5,8 @@
$(MSBuildProjectDirectory)
-
-
+
+
diff --git a/demo/frosting/src2/package.json b/demo/frosting/src2/package.json
index f98200d1..9ae1bd29 100644
--- a/demo/frosting/src2/package.json
+++ b/demo/frosting/src2/package.json
@@ -9,6 +9,6 @@
"author": "",
"license": "ISC",
"devDependencies": {
- "eslint": "8.4.0"
+ "eslint": "8.27.0"
}
}
diff --git a/demo/script/build.cake b/demo/script/build.cake
index 6463fee1..16162b90 100644
--- a/demo/script/build.cake
+++ b/demo/script/build.cake
@@ -1,4 +1,4 @@
-#addin nuget:?package=Cake.Npm&version=1.0.0
+#addin nuget:?package=Cake.Npm&version=2.0.0
#r "..\..\src\Cake.ESLint\bin\Debug\net6.0\Cake.ESLint.dll"
///////////////////////////////////////////////////////////////////////////////
diff --git a/demo/script/src2/package.json b/demo/script/src2/package.json
index f98200d1..9ae1bd29 100644
--- a/demo/script/src2/package.json
+++ b/demo/script/src2/package.json
@@ -9,6 +9,6 @@
"author": "",
"license": "ISC",
"devDependencies": {
- "eslint": "8.4.0"
+ "eslint": "8.27.0"
}
}
diff --git a/global.json b/global.json
index e5b7df50..7ed6e578 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
- "version": "6.0.100-rc.2",
+ "version": "7.0.100",
"rollForward": "latestFeature"
}
-}
\ No newline at end of file
+}
diff --git a/recipe.cake b/recipe.cake
index b4163294..ff51fb96 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -1,7 +1,4 @@
-#load nuget:?package=Cake.Recipe&version=2.2.1
-
-// Workaround for https://github.com/cake-contrib/Cake.Recipe/issues/854
-#tool nuget:?package=NuGet.CommandLine&version=5.8.1
+#load nuget:?package=Cake.Recipe&version=3.0.1
Environment.SetVariableNames();
@@ -19,11 +16,6 @@ BuildParameters.SetParameters(
BuildParameters.PrintParameters(Context);
-
-// workaround for https://github.com/cake-contrib/Cake.Recipe/issues/862
-ToolSettings.SetToolPreprocessorDirectives(
- reSharperTools: "#tool nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2021.2.0");
-
ToolSettings.SetToolSettings(context: Context);
Build.RunDotNetCore();
diff --git a/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
index df6e34f4..e74ac7c0 100644
--- a/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
+++ b/src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
@@ -1,24 +1,31 @@
- netcoreapp3.1;net5.0;net6.0
+
+ netcoreapp3.1
+ net6.0;net7.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.Tests/ESLintAliasesTests.Runs_tool_with_given_action.verified.txt b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_action.verified.txt
index e0644b01..47a1242a 100644
--- a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_action.verified.txt
+++ b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_action.verified.txt
@@ -4,7 +4,11 @@
Arguments: [
{}
],
- WorkingDirectory: /Working
+ WorkingDirectory: /Working,
+ NoWorkingDirectory: false,
+ RedirectStandardError: false,
+ RedirectStandardOutput: false,
+ Silent: false
},
Args: "**/*"
-}
\ No newline at end of file
+}
diff --git a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_settings.verified.txt b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_settings.verified.txt
index 41f485f6..611893b3 100644
--- a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_settings.verified.txt
+++ b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_given_settings.verified.txt
@@ -1,7 +1,11 @@
{
Path: /Working/tools/eslint,
Process: {
- WorkingDirectory: /Working
+ WorkingDirectory: /Working,
+ NoWorkingDirectory: false,
+ RedirectStandardError: false,
+ RedirectStandardOutput: false,
+ Silent: false
},
Args:
-}
\ No newline at end of file
+}
diff --git a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_no_settings.verified.txt b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_no_settings.verified.txt
index 41f485f6..611893b3 100644
--- a/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_no_settings.verified.txt
+++ b/src/Cake.ESLint.Tests/ESLintAliasesTests.Runs_tool_with_no_settings.verified.txt
@@ -1,7 +1,11 @@
{
Path: /Working/tools/eslint,
Process: {
- WorkingDirectory: /Working
+ WorkingDirectory: /Working,
+ NoWorkingDirectory: false,
+ RedirectStandardError: false,
+ RedirectStandardOutput: false,
+ Silent: false
},
Args:
-}
\ No newline at end of file
+}
diff --git a/src/Cake.ESLint/Cake.ESLint.csproj b/src/Cake.ESLint/Cake.ESLint.csproj
index 1ea34def..0779e171 100644
--- a/src/Cake.ESLint/Cake.ESLint.csproj
+++ b/src/Cake.ESLint/Cake.ESLint.csproj
@@ -1,6 +1,6 @@
- netcoreapp3.1;net5.0;net6.0
+ net6.0;net7.0;
true
true
snupkg
@@ -32,8 +32,8 @@
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive