diff --git a/.gitignore b/.gitignore index 28690ca..e140a18 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ *.userosscache *.sln.docstates -nuget.config build coverage.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e23646..59021a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,15 +6,13 @@ variables: LANG: "de" - stages: - build - test - deploy - -debug-build: +build-branch: stage: build tags: - docker @@ -39,25 +37,20 @@ debug-build: - artifacts/*.snupkg expire_in: 7 days -debug-test: +test-branch: stage: test - dependencies: - - debug-build tags: - docker - lnx except: - tags - # branch-coverage coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' script: - dotnet restore --no-cache --force - dotnet test -c Debug --nologo --no-restore - - -release-build: +build-main: stage: build tags: - docker @@ -65,51 +58,159 @@ release-build: - amd64 only: - tags + - changes: + - AMWD.Common/* script: - dotnet restore --no-cache --force - dotnet build -c Release --nologo --no-restore --no-incremental - mkdir ./artifacts - mv ./AMWD.Common/bin/Release/*.nupkg ./artifacts/ - mv ./AMWD.Common/bin/Release/*.snupkg ./artifacts/ - - mv ./AMWD.Common.AspNetCore/bin/Release/*.nupkg ./artifacts/ - - mv ./AMWD.Common.AspNetCore/bin/Release/*.snupkg ./artifacts/ - - mv ./AMWD.Common.EntityFrameworkCore/bin/Release/*.nupkg ./artifacts/ - - mv ./AMWD.Common.EntityFrameworkCore/bin/Release/*.snupkg ./artifacts/ - - mv ./AMWD.Common.Moq/bin/Release/*.nupkg ./artifacts/ - - mv ./AMWD.Common.Moq/bin/Release/*.snupkg ./artifacts/ artifacts: paths: - artifacts/*.nupkg - artifacts/*.snupkg expire_in: 1 day -release-test: - stage: test - dependencies: - - release-build +build-main-asp: + stage: build tags: - docker - lnx - amd64 only: - tags - # line-coverage - coverage: '/Total[^|]*\|\s*([0-9.%]+)/' + - changes: + - AMWD.Common.AspNetCore/* + script: + - dotnet restore --no-cache --force + - dotnet build -c Release --nologo --no-restore --no-incremental + - mkdir ./artifacts + - mv ./AMWD.Common.AspNetCore/bin/Release/*.nupkg ./artifacts/ + - mv ./AMWD.Common.AspNetCore/bin/Release/*.snupkg ./artifacts/ + artifacts: + paths: + - artifacts/*.nupkg + - artifacts/*.snupkg + expire_in: 1 day + +build-main-efc: + stage: build + tags: + - docker + - lnx + - amd64 + only: + - tags + - changes: + - AMWD.Common.EntityFrameworkCore/* + script: + - dotnet restore --no-cache --force + - dotnet build -c Release --nologo --no-restore --no-incremental + - mkdir ./artifacts + - mv ./AMWD.Common.EntityFrameworkCore/bin/Release/*.nupkg ./artifacts/ + - mv ./AMWD.Common.EntityFrameworkCore/bin/Release/*.snupkg ./artifacts/ + artifacts: + paths: + - artifacts/*.nupkg + - artifacts/*.snupkg + expire_in: 1 day + +build-main-test: + stage: build + tags: + - docker + - lnx + - amd64 + only: + - tags + - changes: + - AMWD.Common.Test/* + script: + - dotnet restore --no-cache --force + - dotnet build -c Release --nologo --no-restore --no-incremental + - mkdir ./artifacts + - mv ./AMWD.Common.Test/bin/Release/*.nupkg ./artifacts/ + - mv ./AMWD.Common.Test/bin/Release/*.snupkg ./artifacts/ + artifacts: + paths: + - artifacts/*.nupkg + - artifacts/*.snupkg + expire_in: 1 day + +test-main: + stage: test + tags: + - docker + - lnx + - amd64 + only: + - tags + coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' script: - dotnet restore --no-cache --force - dotnet test -c Release --nologo --no-restore - -release-deploy: +deploy-main: stage: deploy dependencies: - - release-build - - release-test + - test-main + - build-main tags: - docker - lnx - amd64 only: - tags + - changes: + - AMWD.Common/* script: - - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/*.nupkg + - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.*.nupkg + +deploy-main-asp: + stage: deploy + dependencies: + - test-main + - build-main-asp + tags: + - docker + - lnx + - amd64 + only: + - tags + - changes: + - AMWD.Common.AspNetCore/* + script: + - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.AspNetCore.*.nupkg + +deploy-main-efc: + stage: deploy + dependencies: + - test-main + - build-main-efc + tags: + - docker + - lnx + - amd64 + only: + - tags + - changes: + - AMWD.Common.EntityFrameworkCore/* + script: + - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.EntityFrameworkCore.*.nupkg + +deploy-main-test: + stage: deploy + dependencies: + - test-main + - build-main-test + tags: + - docker + - lnx + - amd64 + only: + - tags + - changes: + - AMWD.Common.Test/* + script: + - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.Test.*.nupkg diff --git a/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj b/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj index 34fa151..bddb4da 100644 --- a/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj +++ b/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj @@ -15,12 +15,12 @@ AM.WD Common Library for ASP.NET Core - + true - - + + @@ -30,6 +30,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/AMWD.Common.AspNetCore/Directory.Build.props b/AMWD.Common.AspNetCore/Directory.Build.props new file mode 100644 index 0000000..533dc68 --- /dev/null +++ b/AMWD.Common.AspNetCore/Directory.Build.props @@ -0,0 +1,26 @@ + + + {semvertag:main}{!:-dev} + asp/v[0-9]* + + true + false + true + + true + snupkg + false + + https://wiki.am-wd.de/libs/common + Library with classes and extensions used frequently on AM.WD projects. + + git + https://git.am-wd.de/AM.WD/common.git + true + + AM.WD + Andreas Müller + © {copyright:2020-} AM.WD + MIT + + diff --git a/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj b/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj index abe3b58..c5d2a5b 100644 --- a/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj +++ b/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj @@ -15,12 +15,12 @@ AM.WD Common Library for EntityFramework Core - + true - - + + @@ -29,8 +29,12 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/AMWD.Common.EntityFrameworkCore/Directory.Build.props b/AMWD.Common.EntityFrameworkCore/Directory.Build.props new file mode 100644 index 0000000..c971528 --- /dev/null +++ b/AMWD.Common.EntityFrameworkCore/Directory.Build.props @@ -0,0 +1,26 @@ + + + {semvertag:main}{!:-dev} + efc/v[0-9]* + + true + false + true + + true + snupkg + false + + https://wiki.am-wd.de/libs/common + Library with classes and extensions used frequently on AM.WD projects. + + git + https://git.am-wd.de/AM.WD/common.git + true + + AM.WD + Andreas Müller + © {copyright:2020-} AM.WD + MIT + + diff --git a/AMWD.Common.Moq/AMWD.Common.Moq.csproj b/AMWD.Common.Moq/AMWD.Common.Moq.csproj deleted file mode 100644 index a57cd5d..0000000 --- a/AMWD.Common.Moq/AMWD.Common.Moq.csproj +++ /dev/null @@ -1,35 +0,0 @@ - - - - Debug;Release;DebugLocal - netstandard2.0 - 10.0 - - AMWD.Common.Moq - AMWD.Common.Moq - - true - AMWD.Common.Moq - icon.png - - AM.WD Common Library for Moq - - - - true - - - - - - - - - - - - - - - - diff --git a/AMWD.Common.Test/AMWD.Common.Test.csproj b/AMWD.Common.Test/AMWD.Common.Test.csproj new file mode 100644 index 0000000..d435b03 --- /dev/null +++ b/AMWD.Common.Test/AMWD.Common.Test.csproj @@ -0,0 +1,40 @@ + + + + Debug;Release;DebugLocal + netstandard2.0 + 10.0 + + AMWD.Common.Test + AMWD.Common.Test + + true + AMWD.Common.Test + icon.png + + AM.WD Common Library for Unit-Testing + + + + true + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/AMWD.Common.Test/Directory.Build.props b/AMWD.Common.Test/Directory.Build.props new file mode 100644 index 0000000..dfc7af5 --- /dev/null +++ b/AMWD.Common.Test/Directory.Build.props @@ -0,0 +1,26 @@ + + + {semvertag:main}{!:-dev} + test/v[0-9]* + + true + false + true + + true + snupkg + false + + https://wiki.am-wd.de/libs/common + Library with classes and extensions used frequently on AM.WD projects. + + git + https://git.am-wd.de/AM.WD/common.git + true + + AM.WD + Andreas Müller + © {copyright:2020-} AM.WD + MIT + + diff --git a/AMWD.Common.Moq/HttpMessageHandlerMoq.cs b/AMWD.Common.Test/HttpMessageHandlerMoq.cs similarity index 95% rename from AMWD.Common.Moq/HttpMessageHandlerMoq.cs rename to AMWD.Common.Test/HttpMessageHandlerMoq.cs index d5b18dd..1b2ef25 100644 --- a/AMWD.Common.Moq/HttpMessageHandlerMoq.cs +++ b/AMWD.Common.Test/HttpMessageHandlerMoq.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Moq; using Moq.Protected; -namespace AMWD.Common.Moq +namespace AMWD.Common.Test { /// /// Wrapps the including the setup. diff --git a/AMWD.Common.Moq/TcpClientMoq.cs b/AMWD.Common.Test/TcpClientMoq.cs similarity index 96% rename from AMWD.Common.Moq/TcpClientMoq.cs rename to AMWD.Common.Test/TcpClientMoq.cs index cc1eced..c736cd7 100644 --- a/AMWD.Common.Moq/TcpClientMoq.cs +++ b/AMWD.Common.Test/TcpClientMoq.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Moq; -namespace AMWD.Common.Moq +namespace AMWD.Common.Test { /// /// Wrapps the including the setup. diff --git a/AMWD.Common/AMWD.Common.csproj b/AMWD.Common/AMWD.Common.csproj index 07eca69..e304550 100644 --- a/AMWD.Common/AMWD.Common.csproj +++ b/AMWD.Common/AMWD.Common.csproj @@ -15,12 +15,12 @@ AM.WD Common Library - + true - - + + @@ -29,7 +29,11 @@ - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 537fb80..5b4645a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Upcoming](https://git.am-wd.de/AM.WD/common/compare/v2.0.0...main) - 0000-00-00 -_no changes yet_ +### Changed + +- Moved `AMWD.Common.Moq` to `AMWD.Common.Test` ## [v2.0.0](https://git.am-wd.de/AM.WD/common/compare/v1.13.0...v2.0.0) - 2023-08-08 diff --git a/Common.sln b/Common.sln index c5364e9..7b53082 100644 --- a/Common.sln +++ b/Common.sln @@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2C7556A-99E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E5DF156A-6C8B-4004-BA4C-A8DDE6FD3ECD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AMWD.Common.Moq", "AMWD.Common.Moq\AMWD.Common.Moq.csproj", "{6EBA2792-0B66-4C90-89A1-4E1D26D16443}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AMWD.Common.Test", "AMWD.Common.Test\AMWD.Common.Test.csproj", "{6EBA2792-0B66-4C90-89A1-4E1D26D16443}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{9469D87B-126E-4338-92E3-701F762CB54D}" EndProject @@ -39,6 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{93EC8B16 .editorconfig = .editorconfig .gitignore = .gitignore CodeMaid.config = CodeMaid.config + nuget.config = nuget.config EndProjectSection EndProject Global diff --git a/Directory.Build.props b/Directory.Build.props index 325a8a7..e903063 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,11 +22,4 @@ © {copyright:2020-} AM.WD MIT - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 1c14201..3474b8e 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -14,8 +14,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..d007eba --- /dev/null +++ b/nuget.config @@ -0,0 +1,8 @@ + + + + + + + +