From 73038bbe5ad16957d682c511bc44cf9973218577 Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Mon, 4 Jul 2022 19:31:09 +0200 Subject: [PATCH] Updated CI build for new version of code coverage definition --- .gitlab-ci.yml | 16 +++++++++++----- CHANGELOG.md | 7 ++++++- build.cmd | 3 +-- build.sh | 1 - 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9b4224..845d105 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,9 @@ variables: stages: - build - test - - publish + - deploy -build: +build_job: stage: build tags: - docker @@ -20,16 +20,22 @@ build: - artifacts/*.snupkg expire_in: 1 day -test: +test_job: stage: test tags: - docker + coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' script: - dotnet test -c Release + dependencies: + - build_job -publish: - stage: publish +deploy_job: + stage: deploy tags: - docker script: - dotnet nuget push -k $APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/*.nupkg + dependencies: + - build_job + - test_job diff --git a/CHANGELOG.md b/CHANGELOG.md index bdf514e..7e04722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased](https://git.am-wd.de/AM.WD/common/compare/v1.6.1...master) - 0000-00-00 -_nothing changed yet_ +### Changed +- `BasicAuthenticationAttribute` now respects the `IBasicAuthenticationValidator.Realm` when the own `Realm` property is not set. +- CI scripts + +### Removed +- `IBasicAuthenticationValidator.Realm` is now a read-only property (removed public set). ## [v1.6.1](https://git.am-wd.de/AM.WD/common/compare/v1.6.0...v1.6.1) - 2022-06-23 diff --git a/build.cmd b/build.cmd index d2156f3..bff55b0 100644 --- a/build.cmd +++ b/build.cmd @@ -8,7 +8,6 @@ rmdir /S /Q artifacts mkdir artifacts dotnet restore -v q -:: dotnet tool restore -v q cd "%~dp0" cd "AMWD.Common" @@ -50,4 +49,4 @@ powershell write-host -fore Blue Building AMWD.Common.Moq rmdir /S /Q bin dotnet build -c %Configuration% --nologo --no-incremental move bin\%Configuration%\*.nupkg ..\artifacts -move bin\%Configuration%\*.snupkg ..\artifacts \ No newline at end of file +move bin\%Configuration%\*.snupkg ..\artifacts diff --git a/build.sh b/build.sh index cddfbde..e11297a 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,6 @@ rm -rf artifacts mkdir artifacts dotnet restore -v q -# dotnet tool restore -v q pushd AMWD.Common rm -rf bin