Added custom tagging, moved AMWD.Common.Moq to AMWD.Common.Test
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -11,7 +11,6 @@
|
|||||||
*.userosscache
|
*.userosscache
|
||||||
*.sln.docstates
|
*.sln.docstates
|
||||||
|
|
||||||
nuget.config
|
|
||||||
build
|
build
|
||||||
coverage.json
|
coverage.json
|
||||||
|
|
||||||
|
|||||||
155
.gitlab-ci.yml
155
.gitlab-ci.yml
@@ -6,15 +6,13 @@ variables:
|
|||||||
LANG: "de"
|
LANG: "de"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
- test
|
- test
|
||||||
- deploy
|
- deploy
|
||||||
|
|
||||||
|
|
||||||
|
build-branch:
|
||||||
debug-build:
|
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
@@ -39,25 +37,20 @@ debug-build:
|
|||||||
- artifacts/*.snupkg
|
- artifacts/*.snupkg
|
||||||
expire_in: 7 days
|
expire_in: 7 days
|
||||||
|
|
||||||
debug-test:
|
test-branch:
|
||||||
stage: test
|
stage: test
|
||||||
dependencies:
|
|
||||||
- debug-build
|
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- lnx
|
- lnx
|
||||||
except:
|
except:
|
||||||
- tags
|
- tags
|
||||||
# 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
|
||||||
|
|
||||||
|
|
||||||
|
build-main:
|
||||||
|
|
||||||
release-build:
|
|
||||||
stage: build
|
stage: build
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
@@ -65,51 +58,159 @@ release-build:
|
|||||||
- amd64
|
- amd64
|
||||||
only:
|
only:
|
||||||
- tags
|
- 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/
|
||||||
- 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:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- artifacts/*.nupkg
|
- artifacts/*.nupkg
|
||||||
- artifacts/*.snupkg
|
- artifacts/*.snupkg
|
||||||
expire_in: 1 day
|
expire_in: 1 day
|
||||||
|
|
||||||
release-test:
|
build-main-asp:
|
||||||
stage: test
|
stage: build
|
||||||
dependencies:
|
|
||||||
- release-build
|
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- lnx
|
- lnx
|
||||||
- amd64
|
- amd64
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
# line-coverage
|
- changes:
|
||||||
coverage: '/Total[^|]*\|\s*([0-9.%]+)/'
|
- 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:
|
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-main:
|
||||||
release-deploy:
|
|
||||||
stage: deploy
|
stage: deploy
|
||||||
dependencies:
|
dependencies:
|
||||||
- release-build
|
- test-main
|
||||||
- release-test
|
- build-main
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- lnx
|
- lnx
|
||||||
- amd64
|
- amd64
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
|
- changes:
|
||||||
|
- AMWD.Common/*
|
||||||
script:
|
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
|
||||||
|
|||||||
@@ -15,12 +15,12 @@
|
|||||||
<Product>AM.WD Common Library for ASP.NET Core</Product>
|
<Product>AM.WD Common Library for ASP.NET Core</Product>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
|
<PropertyGroup Condition="'$(CI)' == 'true'">
|
||||||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(GITLAB_CI)' == 'true'">
|
<ItemGroup Condition="'$(CI)' == 'true'">
|
||||||
<SourceLinkGitLabHost Include="git.am-wd.de" Version="$(CI_SERVER_VERSION)" />
|
<SourceLinkGitLabHost Include="$(CI_SERVER_HOST)" Version="$(CI_SERVER_VERSION)" />
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
@@ -30,6 +30,10 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
<FrameworkReference Include="Microsoft.AspNetCore.App" />
|
||||||
|
<PackageReference Include="AMWD.NetRevisionTask" Version="1.0.0">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" />
|
<PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
26
AMWD.Common.AspNetCore/Directory.Build.props
Normal file
26
AMWD.Common.AspNetCore/Directory.Build.props
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<NrtRevisionFormat>{semvertag:main}{!:-dev}</NrtRevisionFormat>
|
||||||
|
<NrtTagMatch>asp/v[0-9]*</NrtTagMatch>
|
||||||
|
|
||||||
|
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
|
||||||
|
<CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
|
||||||
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
|
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<EmbedUntrackedSources>false</EmbedUntrackedSources>
|
||||||
|
|
||||||
|
<PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
|
||||||
|
<Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
|
||||||
|
|
||||||
|
<RepositoryType>git</RepositoryType>
|
||||||
|
<RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
|
||||||
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
|
|
||||||
|
<Company>AM.WD</Company>
|
||||||
|
<Authors>Andreas Müller</Authors>
|
||||||
|
<Copyright>© {copyright:2020-} AM.WD</Copyright>
|
||||||
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -15,12 +15,12 @@
|
|||||||
<Product>AM.WD Common Library for EntityFramework Core</Product>
|
<Product>AM.WD Common Library for EntityFramework Core</Product>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
|
<PropertyGroup Condition="'$(CI)' == 'true'">
|
||||||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(GITLAB_CI)' == 'true'">
|
<ItemGroup Condition="'$(CI)' == 'true'">
|
||||||
<SourceLinkGitLabHost Include="git.am-wd.de" Version="$(CI_SERVER_VERSION)" />
|
<SourceLinkGitLabHost Include="$(CI_SERVER_HOST)" Version="$(CI_SERVER_VERSION)" />
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
@@ -29,8 +29,12 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.20" />
|
<PackageReference Include="AMWD.NetRevisionTask" Version="1.0.0">
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.20" />
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.23" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.23" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
26
AMWD.Common.EntityFrameworkCore/Directory.Build.props
Normal file
26
AMWD.Common.EntityFrameworkCore/Directory.Build.props
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<NrtRevisionFormat>{semvertag:main}{!:-dev}</NrtRevisionFormat>
|
||||||
|
<NrtTagMatch>efc/v[0-9]*</NrtTagMatch>
|
||||||
|
|
||||||
|
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
|
||||||
|
<CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
|
||||||
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
|
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<EmbedUntrackedSources>false</EmbedUntrackedSources>
|
||||||
|
|
||||||
|
<PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
|
||||||
|
<Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
|
||||||
|
|
||||||
|
<RepositoryType>git</RepositoryType>
|
||||||
|
<RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
|
||||||
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
|
|
||||||
|
<Company>AM.WD</Company>
|
||||||
|
<Authors>Andreas Müller</Authors>
|
||||||
|
<Copyright>© {copyright:2020-} AM.WD</Copyright>
|
||||||
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<Configurations>Debug;Release;DebugLocal</Configurations>
|
|
||||||
<TargetFramework>netstandard2.0</TargetFramework>
|
|
||||||
<LangVersion>10.0</LangVersion>
|
|
||||||
|
|
||||||
<AssemblyName>AMWD.Common.Moq</AssemblyName>
|
|
||||||
<RootNamespace>AMWD.Common.Moq</RootNamespace>
|
|
||||||
|
|
||||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
|
||||||
<PackageId>AMWD.Common.Moq</PackageId>
|
|
||||||
<PackageIcon>icon.png</PackageIcon>
|
|
||||||
|
|
||||||
<Product>AM.WD Common Library for Moq</Product>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
|
|
||||||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup Condition="'$(GITLAB_CI)' == 'true'">
|
|
||||||
<SourceLinkGitLabHost Include="git.am-wd.de" Version="$(CI_SERVER_VERSION)" />
|
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<None Include="../icon.png" Pack="true" PackagePath="/" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Moq" Version="4.18.4" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
40
AMWD.Common.Test/AMWD.Common.Test.csproj
Normal file
40
AMWD.Common.Test/AMWD.Common.Test.csproj
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configurations>Debug;Release;DebugLocal</Configurations>
|
||||||
|
<TargetFramework>netstandard2.0</TargetFramework>
|
||||||
|
<LangVersion>10.0</LangVersion>
|
||||||
|
|
||||||
|
<AssemblyName>AMWD.Common.Test</AssemblyName>
|
||||||
|
<RootNamespace>AMWD.Common.Test</RootNamespace>
|
||||||
|
|
||||||
|
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||||
|
<PackageId>AMWD.Common.Test</PackageId>
|
||||||
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
|
|
||||||
|
<Product>AM.WD Common Library for Unit-Testing</Product>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(CI)' == 'true'">
|
||||||
|
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup Condition="'$(CI)' == 'true'">
|
||||||
|
<SourceLinkGitLabHost Include="$(CI_SERVER_HOST)" Version="$(CI_SERVER_VERSION)" />
|
||||||
|
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="../icon.png" Pack="true" PackagePath="/" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="AMWD.NetRevisionTask" Version="1.0.0">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Moq" Version="4.20.69" />
|
||||||
|
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
26
AMWD.Common.Test/Directory.Build.props
Normal file
26
AMWD.Common.Test/Directory.Build.props
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
<Project>
|
||||||
|
<PropertyGroup>
|
||||||
|
<NrtRevisionFormat>{semvertag:main}{!:-dev}</NrtRevisionFormat>
|
||||||
|
<NrtTagMatch>test/v[0-9]*</NrtTagMatch>
|
||||||
|
|
||||||
|
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
|
||||||
|
<CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
|
||||||
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
|
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<EmbedUntrackedSources>false</EmbedUntrackedSources>
|
||||||
|
|
||||||
|
<PackageProjectUrl>https://wiki.am-wd.de/libs/common</PackageProjectUrl>
|
||||||
|
<Description>Library with classes and extensions used frequently on AM.WD projects.</Description>
|
||||||
|
|
||||||
|
<RepositoryType>git</RepositoryType>
|
||||||
|
<RepositoryUrl>https://git.am-wd.de/AM.WD/common.git</RepositoryUrl>
|
||||||
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
|
|
||||||
|
<Company>AM.WD</Company>
|
||||||
|
<Authors>Andreas Müller</Authors>
|
||||||
|
<Copyright>© {copyright:2020-} AM.WD</Copyright>
|
||||||
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
|
|||||||
using Moq;
|
using Moq;
|
||||||
using Moq.Protected;
|
using Moq.Protected;
|
||||||
|
|
||||||
namespace AMWD.Common.Moq
|
namespace AMWD.Common.Test
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Wrapps the <see cref="Mock{HttpMessageHandler}"/> including the setup.
|
/// Wrapps the <see cref="Mock{HttpMessageHandler}"/> including the setup.
|
||||||
@@ -5,7 +5,7 @@ using System.Threading;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Moq;
|
using Moq;
|
||||||
|
|
||||||
namespace AMWD.Common.Moq
|
namespace AMWD.Common.Test
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Wrapps the <see cref="Mock{TcpClient}"/> including the setup.
|
/// Wrapps the <see cref="Mock{TcpClient}"/> including the setup.
|
||||||
@@ -15,12 +15,12 @@
|
|||||||
<Product>AM.WD Common Library</Product>
|
<Product>AM.WD Common Library</Product>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
|
<PropertyGroup Condition="'$(CI)' == 'true'">
|
||||||
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(GITLAB_CI)' == 'true'">
|
<ItemGroup Condition="'$(CI)' == 'true'">
|
||||||
<SourceLinkGitLabHost Include="git.am-wd.de" Version="$(CI_SERVER_VERSION)" />
|
<SourceLinkGitLabHost Include="$(CI_SERVER_HOST)" Version="$(CI_SERVER_VERSION)" />
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
<PackageReference Include="Microsoft.SourceLink.GitLab" Version="1.1.1" PrivateAssets="all" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
@@ -29,7 +29,11 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="MessagePack" Version="2.5.124" />
|
<PackageReference Include="AMWD.NetRevisionTask" Version="1.0.0">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="MessagePack" Version="2.5.129" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />
|
<PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" />
|
<PackageReference Include="Unclassified.DeepConvert" Version="1.4.0" />
|
||||||
|
|||||||
@@ -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
|
## [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
|
## [v2.0.0](https://git.am-wd.de/AM.WD/common/compare/v1.13.0...v2.0.0) - 2023-08-08
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2C7556A-99E
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E5DF156A-6C8B-4004-BA4C-A8DDE6FD3ECD}"
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E5DF156A-6C8B-4004-BA4C-A8DDE6FD3ECD}"
|
||||||
EndProject
|
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
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{9469D87B-126E-4338-92E3-701F762CB54D}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{9469D87B-126E-4338-92E3-701F762CB54D}"
|
||||||
EndProject
|
EndProject
|
||||||
@@ -39,6 +39,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{93EC8B16
|
|||||||
.editorconfig = .editorconfig
|
.editorconfig = .editorconfig
|
||||||
.gitignore = .gitignore
|
.gitignore = .gitignore
|
||||||
CodeMaid.config = CodeMaid.config
|
CodeMaid.config = CodeMaid.config
|
||||||
|
nuget.config = nuget.config
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
|
|||||||
@@ -22,11 +22,4 @@
|
|||||||
<Copyright>© {copyright:2020-} AM.WD</Copyright>
|
<Copyright>© {copyright:2020-} AM.WD</Copyright>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.4.3">
|
|
||||||
<PrivateAssets>all</PrivateAssets>
|
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
|
||||||
</PackageReference>
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -14,8 +14,8 @@
|
|||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="DNS" Version="7.0.0" />
|
<PackageReference Include="DNS" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
|
||||||
<PackageReference Include="Moq" Version="4.18.4" />
|
<PackageReference Include="Moq" Version="4.20.69" />
|
||||||
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
|
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
|
||||||
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
|
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
|
||||||
<PackageReference Include="ReflectionMagic" Version="5.0.0" />
|
<PackageReference Include="ReflectionMagic" Version="5.0.0" />
|
||||||
|
|||||||
8
nuget.config
Normal file
8
nuget.config
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<clear />
|
||||||
|
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
|
||||||
|
<add key="AM.WD" value="https://nuget.am-wd.de/v3/index.json" />
|
||||||
|
</packageSources>
|
||||||
|
</configuration>
|
||||||
Reference in New Issue
Block a user