Skip to content

Commit

Permalink
Merge pull request #307 from nils-a/release/2.1.0
Browse files Browse the repository at this point in the history
Release/2.1.0
  • Loading branch information
nils-a authored Feb 1, 2023
2 parents 26c37b6 + 93c21c2 commit a0fb780
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 22 deletions.
13 changes: 12 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,23 @@
"contributions": [
"code"
]
},
{
"login": "pascalberger",
"name": "Pascal Berger",
"avatar_url": "https://avatars.githubusercontent.com/u/2190718?v=4",
"profile": "https://github.com/pascalberger",
"contributions": [
"code",
"doc"
]
}
],
"contributorsPerLine": 7,
"projectName": "Cake.ESLint",
"projectOwner": "cake-contrib",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
"skipCi": true,
"commitConvention": "angular"
}
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3.1.0
uses: actions/checkout@v3.3.0
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- uses: actions/setup-dotnet@v3.0.3
Expand All @@ -57,7 +57,7 @@ jobs:
6.0.x
7.0.x
- name: Cache Tools
uses: actions/cache@v3.0.11
uses: actions/cache@v3.2.4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
Expand All @@ -69,15 +69,15 @@ jobs:
verbosity: Diagnostic
cake-version: 1.3.0
- name: Upload Issues
uses: actions/upload-artifact@v3.1.1
uses: actions/upload-artifact@v3.1.2
with:
if-no-files-found: warn
name: ${{ matrix.os }} Issues
path: |
BuildArtifacts/report.html
BuildArtifacts/**/coverlet/*.xml
- name: Upload Packages
uses: actions/upload-artifact@v3.1.1
uses: actions/upload-artifact@v3.1.2
if: runner.os == 'Windows'
with:
if-no-files-found: warn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3.1.0
uses: actions/checkout@v3.3.0
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- uses: actions/setup-dotnet@v3.0.3
Expand All @@ -43,7 +43,7 @@ jobs:
6.0.x
7.0.x
- name: Cache Tools
uses: actions/cache@v3.0.11
uses: actions/cache@v3.2.4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publishDocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:

steps:
- name: Checkout the repository
uses: actions/checkout@v3.1.0
uses: actions/checkout@v3.3.0
- name: Fetch all tags and branches
run: git fetch --prune --unshallow
- name: Cache Tools
uses: actions/cache@v3.0.11
uses: actions/cache@v3.2.4
with:
path: tools
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
Expand Down
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,13 @@ Thanks goes to these wonderful people ([emoji key][emoji-key]):
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="https://github.com/nils-a"><img src="https://avatars.githubusercontent.com/u/349188?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.ESLint/commits?author=nils-a" title="Code">💻</a> <a href="#maintenance-nils-a" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/SimonCropp"><img src="https://avatars.githubusercontent.com/u/122666?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Simon Cropp</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.ESLint/commits?author=SimonCropp" title="Code">💻</a></td>
</tr>
<tbody>
<tr>
<td align="center"><a href="https://github.com/nils-a"><img src="https://avatars.githubusercontent.com/u/349188?v=4?s=100" width="100px;" alt="Nils Andresen"/><br /><sub><b>Nils Andresen</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.ESLint/commits?author=nils-a" title="Code">💻</a> <a href="#maintenance-nils-a" title="Maintenance">🚧</a></td>
<td align="center"><a href="https://github.com/SimonCropp"><img src="https://avatars.githubusercontent.com/u/122666?v=4?s=100" width="100px;" alt="Simon Cropp"/><br /><sub><b>Simon Cropp</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.ESLint/commits?author=SimonCropp" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/pascalberger"><img src="https://avatars.githubusercontent.com/u/2190718?v=4?s=100" width="100px;" alt="Pascal Berger"/><br /><sub><b>Pascal Berger</b></sub></a><br /><a href="https://github.com/cake-contrib/Cake.ESLint/commits?author=pascalberger" title="Code">💻</a> <a href="https://github.com/cake-contrib/Cake.ESLint/commits?author=pascalberger" title="Documentation">📖</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
Expand Down
2 changes: 1 addition & 1 deletion demo/frosting/src2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"author": "",
"license": "ISC",
"devDependencies": {
"eslint": "8.27.0"
"eslint": "8.33.0"
}
}
2 changes: 1 addition & 1 deletion demo/script/src2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"author": "",
"license": "ISC",
"devDependencies": {
"eslint": "8.27.0"
"eslint": "8.33.0"
}
}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
"version": "7.0.100",
"version": "7.0.102",
"rollForward": "latestFeature"
}
}
6 changes: 3 additions & 3 deletions src/Cake.ESLint.Tests/Cake.ESLint.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="Moq" Version="4.18.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Shouldly" Version="4.1.0" />
<PackageReference Include="Verify.Xunit" Version="19.1.0" />
<PackageReference Include="Verify.Xunit" Version="19.8.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PrivateAssets>all</PrivateAssets>
Expand Down
6 changes: 3 additions & 3 deletions src/Cake.ESLint/ESLintCacheStrategy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ private ESLintCacheStrategy(string name)
}

/// <summary>
/// Gets the fix-type: Problem.
/// Gets the cache strategy "metadata".
/// </summary>
public static ESLintCacheStrategy Metadata { get; } = new ESLintCacheStrategy("metadata");

/// <summary>
/// Gets the fix-type: Suggestion.
/// Gets the cache strategy "content".
/// </summary>
public static ESLintCacheStrategy Content { get; } = new ESLintCacheStrategy("content");

/// <summary>
/// Gets the name of the problem.
/// Gets the name of the cache strategy.
/// </summary>
public string Name { get; }
}
Expand Down
2 changes: 2 additions & 0 deletions src/Cake.ESLint/ESLintRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,15 @@ private void RegisterLocalLintTool(ToolSettings settings)
// instead of any other version.
if (settings.NoWorkingDirectory || settings.WorkingDirectory == null)
{
log.Verbose($"No working directory set.");
return;
}

var nodeBin =
fileSystem.GetDirectory(settings.WorkingDirectory.Combine("node_modules/.bin"));
if (!nodeBin.Exists)
{
log.Warning($"node_modules/.bin does not exist in {settings.WorkingDirectory.FullPath}.");
return;
}

Expand Down

0 comments on commit a0fb780

Please sign in to comment.