Skip to content

Commit 786e364

Browse files
committed
Merge branch 'net6.0' of https://github.com/Codebytes/DependencyInjectionDemo into net6.0
2 parents 669297b + 7442ca1 commit 786e364

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/aspnetcore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: '5.0.x'
15+
dotnet-version: '6.0.x'
1616
- name: Install dependencies
1717
run: dotnet restore
1818
- name: Build

.github/workflows/linter.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
2-
###########################
3-
###########################
4-
## Linter GitHub Actions ##
5-
###########################
6-
###########################
2+
#################################
3+
#################################
4+
## Super Linter GitHub Actions ##
5+
#################################
6+
#################################
77
name: Lint Code Base
88

99
#
1010
# Documentation:
11-
# https://help.github.com/en/articles/workflow-syntax-for-github-actions
11+
# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
1212
#
1313

1414
#############################
1515
# Start the job on all push #
1616
#############################
1717
on:
1818
push:
19-
branches-ignore: [master]
19+
branches-ignore: [master, main]
2020
# Remove the line above to run when pushing to master
2121
pull_request:
22-
branches: [master]
22+
branches: [master, main]
2323

2424
###############
2525
# Set the Job #
@@ -48,8 +48,8 @@ jobs:
4848
# Run Linter against code base #
4949
################################
5050
- name: Lint Code Base
51-
uses: github/super-linter@v3
51+
uses: github/super-linter@v4
5252
env:
5353
VALIDATE_ALL_CODEBASE: false
5454
DEFAULT_BRANCH: master
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
55+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)