am-wd/common
1
0
Fork 0
Code Actions Activity

Fixing CI build

Browse Source
This commit is contained in:
Andreas Müller
2023-10-15 07:20:55 +02:00
parent 5bd5e4b802
commit 18b9627ea4
5 changed files with 146 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
.gitlab-ci.yml
View File

@@ -1,10 +1,9 @@
# The image has to use the same version as the .NET UnitTest project # The image should use the same version as the UnitTests are
image: mcr.microsoft.com/dotnet/sdk:6.0 image: mcr.microsoft.com/dotnet/sdk:6.0
variables: variables:
TZ: "Europe/Berlin" TZ: Europe/Berlin
LANG: "de" LANG: de
stages: stages:
- build - build
@@ -12,24 +11,25 @@ stages:
- deploy - deploy
branch build:
build-debug:
stage: build stage: build
tags: tags:
- docker - docker
- lnx - lnx
except: rules:
- tags - if: $CI_COMMIT_TAG == null
script: script:
- dotnet restore --no-cache --force - dotnet restore --no-cache --force
- dotnet build -c Debug --nologo --no-restore --no-incremental - dotnet build -c Debug --nologo --no-restore --no-incremental
- mkdir ./artifacts - mkdir ./artifacts
- mv ./AMWD.Common/bin/Debug/*.nupkg ./artifacts/ - mv ./AMWD.Common/bin/Debug/*.nupkg ./artifacts/
- mv ./AMWD.Common/bin/Debug/*.snupkg ./artifacts/ - mv ./AMWD.Common/bin/Debug/*.snupkg ./artifacts/
- mv ./AMWD.Common.AspNetCore/bin/Debug/*.nupkg ./artifacts/ - mv ./AMWD.Common.AspNetCore/bin/Debug/*.nupkg ./artifacts/
- mv ./AMWD.Common.AspNetCore/bin/Debug/*.snupkg ./artifacts/ - mv ./AMWD.Common.AspNetCore/bin/Debug/*.snupkg ./artifacts/
- mv ./AMWD.Common.EntityFrameworkCore/bin/Debug/*.nupkg ./artifacts/ - mv ./AMWD.Common.EntityFrameworkCore/bin/Debug/*.nupkg ./artifacts/
- mv ./AMWD.Common.EntityFrameworkCore/bin/Debug/*.snupkg ./artifacts/ - mv ./AMWD.Common.EntityFrameworkCore/bin/Debug/*.snupkg ./artifacts/
- mv ./AMWD.Common.Test/bin/Debug/*.nupkg ./artifacts/ - mv ./AMWD.Common.Test/bin/Debug/*.nupkg ./artifacts/
- mv ./AMWD.Common.Test/bin/Debug/*.snupkg ./artifacts/ - mv ./AMWD.Common.Test/bin/Debug/*.snupkg ./artifacts/
artifacts: artifacts:
paths: paths:
@@ -37,189 +37,111 @@ branch build:
- artifacts/*.snupkg - artifacts/*.snupkg
expire_in: 7 days expire_in: 7 days
branch test: test-debug:
stage: test stage: test
dependencies:
- build-debug
tags: tags:
- docker - docker
- lnx - lnx
except: rules:
- tags - if: $CI_COMMIT_TAG == null
# line-coverage
#coverage: '/Total[^|]*\|\s*([0-9.%]+)/'
# branch-coverage
coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/'
script: script:
- dotnet restore --no-cache --force - dotnet restore --no-cache --force
- dotnet test -c Debug --nologo --no-restore - dotnet test -c Debug --nologo --no-restore
main build common:
build-release:
stage: build stage: build
tags: tags:
- docker - docker
- lnx - lnx
- amd64 rules:
only: - if: $CI_COMMIT_TAG != null
refs:
- tags
changes:
- AMWD.Common/**
script: script:
- dotnet restore --no-cache --force - dotnet restore --no-cache --force
- dotnet build -c Release --nologo --no-restore --no-incremental - dotnet build -c Release --nologo --no-restore --no-incremental
- mkdir ./artifacts - mkdir ./artifacts
- mv ./AMWD.Common/bin/Release/*.nupkg ./artifacts/ - mv ./AMWD.Common/bin/Release/*.nupkg ./artifacts/
- mv ./AMWD.Common/bin/Release/*.snupkg ./artifacts/ - mv ./AMWD.Common/bin/Release/*.snupkg ./artifacts/
artifacts: - mv ./AMWD.Common.AspNetCore/bin/Release/*.nupkg ./artifacts/
paths:
- artifacts/*.nupkg
- artifacts/*.snupkg
expire_in: 1 day
main build aspnet:
stage: build
tags:
- docker
- lnx
- amd64
only:
refs:
- tags
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/ - mv ./AMWD.Common.AspNetCore/bin/Release/*.snupkg ./artifacts/
artifacts: - mv ./AMWD.Common.EntityFrameworkCore/bin/Release/*.nupkg ./artifacts/
paths:
- artifacts/*.nupkg
- artifacts/*.snupkg
expire_in: 1 day
main build entityframework:
stage: build
tags:
- docker
- lnx
- amd64
only:
refs:
- 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/ - mv ./AMWD.Common.EntityFrameworkCore/bin/Release/*.snupkg ./artifacts/
artifacts: - mv ./AMWD.Common.Test/bin/Release/*.nupkg ./artifacts/
paths:
- artifacts/*.nupkg
- artifacts/*.snupkg
expire_in: 1 day
main build test:
stage: build
tags:
- docker
- lnx
- amd64
only:
refs:
- tags
changes:
- AMWD.Common.AspNetCore/**
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/ - mv ./AMWD.Common.Test/bin/Release/*.snupkg ./artifacts/
artifacts: artifacts:
paths: paths:
- artifacts/*.nupkg - artifacts/*.nupkg
- artifacts/*.snupkg - artifacts/*.snupkg
expire_in: 1 day expire_in: 1 days
main test all: test-release:
stage: test stage: test
dependencies:
- build-release
tags: tags:
- docker - docker
- lnx - lnx
- amd64 rules:
only: - if: $CI_COMMIT_TAG != null
refs: # line-coverage
- tags #coverage: '/Total[^|]*\|\s*([0-9.%]+)/'
# branch-coverage
coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/' coverage: '/Total[^|]*\|[^|]*\|\s*([0-9.%]+)/'
script: script:
- dotnet restore --no-cache --force - dotnet restore --no-cache --force
- dotnet test -c Release --nologo --no-restore - dotnet test -c Release --nologo --no-restore
deploy common: deploy-common:
stage: deploy stage: deploy
dependencies: dependencies:
- main test all - test-release
- main build common
tags: tags:
- docker - docker
- lnx - lnx
- amd64 rules:
only: - if: $CI_COMMIT_TAG =~ /^v[0-9.]+/
refs:
- tags
changes:
- AMWD.Common/**
script: script:
- dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.*.nupkg - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.[0-9]*.nupkg
deploy aspnet: deploy-aspnet:
stage: deploy stage: deploy
dependencies: dependencies:
- main test all - test-release
- main build aspnet
tags: tags:
- docker - docker
- lnx - lnx
- amd64 rules:
only: - if: $CI_COMMIT_TAG =~ /^asp\/v[0-9.]+/
refs:
- tags
changes:
- AMWD.Common.AspNetCore/**
script: script:
- dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.AspNetCore.*.nupkg - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.AspNetCore.*.nupkg
deploy entityframework: deploy-entityframework:
stage: deploy stage: deploy
dependencies: dependencies:
- main test all - test-release
- main build entityframework
tags: tags:
- docker - docker
- lnx - lnx
- amd64 rules:
only: - if: $CI_COMMIT_TAG =~ /^efc\/v[0-9.]+/
refs:
- tags
changes:
- AMWD.Common.EntityFrameworkCore/**
script: script:
- dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.EntityFrameworkCore.*.nupkg - 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: deploy-test:
stage: deploy stage: deploy
dependencies: dependencies:
- main test all - test-release
- main build test
tags: tags:
- docker - docker
- lnx - lnx
- amd64 rules:
only: - if: $CI_COMMIT_TAG =~ /^test\/v[0-9.]+/
refs:
- tags
changes:
- AMWD.Common.Test/**
script: script:
- dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.Test.*.nupkg - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/AMWD.Common.Test.*.nupkg

4
AMWD.Common.AspNetCore/Extensions/HttpContextExtensions.cs
View File

@@ -49,7 +49,9 @@ namespace Microsoft.AspNetCore.Http
{ {
string forwardedForAddress = null; string forwardedForAddress = null;
var headerNames = string.IsNullOrWhiteSpace(ipHeaderName) ? defaultIpHeaderNames : new[] { ipHeaderName }.Concat(defaultIpHeaderNames); var headerNames = string.IsNullOrWhiteSpace(ipHeaderName)
? defaultIpHeaderNames
: new[] { ipHeaderName }.Concat(defaultIpHeaderNames);
foreach (string headerName in headerNames) foreach (string headerName in headerNames)
{ {
if (!httpContext.Request.Headers.ContainsKey(headerName)) if (!httpContext.Request.Headers.ContainsKey(headerName))

2
AMWD.Common.AspNetCore/Security/PathProtection/ProtectedPathExtensions.cs
View File

@@ -3,7 +3,7 @@
namespace AMWD.Common.AspNetCore.Security.PathProtection namespace AMWD.Common.AspNetCore.Security.PathProtection
{ {
/// <summary> /// <summary>
/// Extnsion for <see cref="IApplicationBuilder"/> to enable folder protection. /// Extension for <see cref="IApplicationBuilder"/> to enable folder protection.
/// </summary> /// </summary>
[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public static class ProtectedPathExtensions public static class ProtectedPathExtensions

9
Directory.Build.targets
View File

@@ -1,9 +0,0 @@
<Project>
<Target Condition="'$(Configuration)' == 'DebugLocal'" Name="CopyPackageToLocal" AfterTargets="Pack">
<Delete Files="D:\NuGetLocal\$(PackageId).$(PackageVersion).nupkg" />
<Delete Files="D:\NuGetLocal\$(PackageId).$(PackageVersion).snupkg" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="D:\NuGetLocal" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(Configuration)\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="D:\NuGetLocal" />
</Target>
</Project>

8
README.md
View File

@@ -8,7 +8,7 @@ To save time, they are all packed to NuGet packages.
| AMWD.Common | ![https://nuget.am-wd.de/packages/amwd.common/](https://services.am-wd.de/nuget.php?package=AMWD.Common) | | AMWD.Common | ![https://nuget.am-wd.de/packages/amwd.common/](https://services.am-wd.de/nuget.php?package=AMWD.Common) |
| AMWD.Common.AspNetCore | ![https://nuget.am-wd.de/packages/amwd.common.aspnetcore/](https://services.am-wd.de/nuget.php?package=AMWD.Common.AspNetCore) | | AMWD.Common.AspNetCore | ![https://nuget.am-wd.de/packages/amwd.common.aspnetcore/](https://services.am-wd.de/nuget.php?package=AMWD.Common.AspNetCore) |
| AMWD.Common.EntityFrameworkCore | ![https://nuget.am-wd.de/packages/amwd.common.entityframeworkcore/](https://services.am-wd.de/nuget.php?package=AMWD.Common.EntityFrameworkCore) | | AMWD.Common.EntityFrameworkCore | ![https://nuget.am-wd.de/packages/amwd.common.entityframeworkcore/](https://services.am-wd.de/nuget.php?package=AMWD.Common.EntityFrameworkCore) |
| AMWD.Common.Moq | ![https://nuget.am-wd.de/packages/amwd.common.moq/](https://services.am-wd.de/nuget.php?package=AMWD.Common.Moq) | | AMWD.Common.Test | ![https://nuget.am-wd.de/packages/amwd.common.test/](https://services.am-wd.de/nuget.php?package=AMWD.Common.Test) |
| CI / CD | ![https://git.am-wd.de/AM.WD/common/-/pipelines](https://git.am-wd.de/AM.WD/common/badges/main/pipeline.svg?style=flat-square) ![https://git.am-wd.de/AM.WD/common/-/tree/main](https://git.am-wd.de/AM.WD/common/badges/main/coverage.svg?style=flat-square) | | CI / CD | ![https://git.am-wd.de/AM.WD/common/-/pipelines](https://git.am-wd.de/AM.WD/common/badges/main/pipeline.svg?style=flat-square) ![https://git.am-wd.de/AM.WD/common/-/tree/main](https://git.am-wd.de/AM.WD/common/badges/main/coverage.svg?style=flat-square) |
## Documentation ## Documentation
@@ -22,8 +22,8 @@ Create a `nuget.config` file in your root project folder (where the `.sln` file
```xml ```xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="AM.WD" value="https://nuget.am-wd.de/v3/index.json" /> <add key="AM.WD" value="https://nuget.am-wd.de/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>
``` ```