Skip to content

Update next from master #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 22 additions & 14 deletions .github/workflows/dotnet-test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
name: .NET Test & Coverage

permissions:
checks: write
contents: read
issues: write

on:
push:
branches: [master, add-unit-tests]
branches: [master, next, add-unit-tests]
pull_request:
branches: [master, add-unit-tests]
branches: [master, next, add-unit-tests]

jobs:
build-test-coverage:
Expand Down Expand Up @@ -33,9 +38,8 @@ jobs:
--no-build --configuration Release \
--logger "trx;LogFileName=test-results.trx" \
--results-directory ./TestResults \
/p:CollectCoverage=true \
/p:CoverletOutput=./TestResults/coverage/ \
/p:CoverletOutputFormat=cobertura
--collect:"XPlat Code Coverage" \
--collect:"Code Coverage"

- name: Upload Test Results
uses: actions/upload-artifact@v4
Expand All @@ -47,39 +51,43 @@ jobs:
uses: EnricoMi/publish-unit-test-result-action@v2
with:
files: ./TestResults/*.trx
comment_mode: off

- name: Check if coverage file exists
run: |
if [ -f "./TestResults/coverage/coverage.cobertura.xml" ]; then
echo "Coverage file found, proceeding with report generation"
COVERAGE_FILE=$(find ./TestResults -name "coverage.cobertura.xml" -type f | head -1)
if [ -n "$COVERAGE_FILE" ]; then
echo "Coverage file found at: $COVERAGE_FILE"
echo "COVERAGE_FILE_PATH=$COVERAGE_FILE" >> $GITHUB_ENV
else
echo "Coverage file not found, skipping report generation"
exit 0
fi

- name: Upload Coverage Report
uses: actions/upload-artifact@v4
if: hashFiles('./TestResults/coverage/coverage.cobertura.xml') != ''
if: env.COVERAGE_FILE_PATH != ''
with:
name: coverage-report
path: ./TestResults/coverage/coverage.cobertura.xml
path: ${{ env.COVERAGE_FILE_PATH }}

- name: Generate Coverage Report
uses: danielpalme/[email protected]
if: hashFiles('./TestResults/coverage/coverage.cobertura.xml') != ''
if: env.COVERAGE_FILE_PATH != ''
with:
reports: './TestResults/coverage/coverage.cobertura.xml'
reports: '${{ env.COVERAGE_FILE_PATH }}'
targetdir: './TestResults/coverage/report'
reporttypes: 'MarkdownSummary;Html'
verbosity: 'Info'

- name: Upload HTML Coverage Report
- name: Upload HTML Coverage Report as Artifact
uses: actions/upload-artifact@v4
if: hashFiles('./TestResults/coverage/coverage.cobertura.xml') != ''
if: env.COVERAGE_FILE_PATH != ''
with:
name: html-coverage-report
path: ./TestResults/coverage/report

- name: Display Coverage Summary
if: hashFiles('./TestResults/coverage/coverage.cobertura.xml') != ''
if: env.COVERAGE_FILE_PATH != ''
run: |
cat ./TestResults/coverage/report/Summary.md || echo 'No coverage summary found.'
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private async Task DeleteExpiredCacheItems()
_logger.LogDebug($"Task Delay interval will sleep for {_expiredItemsDeletionInterval}s");
await Task
.Delay(_expiredItemsDeletionInterval, _cancellationTokenSource.Token)
.ConfigureAwait(true);
.ConfigureAwait(false);
_logger.LogDebug($"Task Delay interval resumed after {_expiredItemsDeletionInterval}s");
}
catch (TaskCanceledException)
Expand Down
43 changes: 13 additions & 30 deletions WebSample/ClientApp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion WebSample/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"bootstrap": "^4.1.3",
"bootstrap": "^5.0.0",
"http-proxy-middleware": "^2.0.6",
"jquery": "^3.6.4",
"merge": "^2.1.1",
Expand Down
Loading