diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59021a0..5e5d0ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,8 +29,8 @@ build-branch: - mv ./AMWD.Common.AspNetCore/bin/Debug/*.snupkg ./artifacts/ - mv ./AMWD.Common.EntityFrameworkCore/bin/Debug/*.nupkg ./artifacts/ - mv ./AMWD.Common.EntityFrameworkCore/bin/Debug/*.snupkg ./artifacts/ - - mv ./AMWD.Common.Moq/bin/Debug/*.nupkg ./artifacts/ - - mv ./AMWD.Common.Moq/bin/Debug/*.snupkg ./artifacts/ + - mv ./AMWD.Common.Test/bin/Debug/*.nupkg ./artifacts/ + - mv ./AMWD.Common.Test/bin/Debug/*.snupkg ./artifacts/ artifacts: paths: - artifacts/*.nupkg diff --git a/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj b/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj index bddb4da..0d8d14a 100644 --- a/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj +++ b/AMWD.Common.AspNetCore/AMWD.Common.AspNetCore.csproj @@ -1,39 +1,28 @@  - Debug;Release;DebugLocal net6.0 10.0 + asp/v[0-9]* AMWD.Common.AspNetCore AMWD.Common.AspNetCore true AMWD.Common.AspNetCore icon.png + README.md AM.WD Common Library for ASP.NET Core - - true - - - - - - - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/AMWD.Common.AspNetCore/Directory.Build.props b/AMWD.Common.AspNetCore/Directory.Build.props deleted file mode 100644 index 533dc68..0000000 --- a/AMWD.Common.AspNetCore/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - {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 c5d2a5b..68f4343 100644 --- a/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj +++ b/AMWD.Common.EntityFrameworkCore/AMWD.Common.EntityFrameworkCore.csproj @@ -1,38 +1,27 @@  - Debug;Release;DebugLocal net6.0 10.0 + efc/v[0-9]* AMWD.Common.EntityFrameworkCore AMWD.Common.EntityFrameworkCore true AMWD.Common.EntityFrameworkCore icon.png + README.md AM.WD Common Library for EntityFramework Core - - true - - - - - - - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/AMWD.Common.EntityFrameworkCore/Directory.Build.props b/AMWD.Common.EntityFrameworkCore/Directory.Build.props deleted file mode 100644 index c971528..0000000 --- a/AMWD.Common.EntityFrameworkCore/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - {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.Test/AMWD.Common.Test.csproj b/AMWD.Common.Test/AMWD.Common.Test.csproj index d435b03..f68fc70 100644 --- a/AMWD.Common.Test/AMWD.Common.Test.csproj +++ b/AMWD.Common.Test/AMWD.Common.Test.csproj @@ -1,38 +1,27 @@  - Debug;Release;DebugLocal netstandard2.0 10.0 + test/v[0-9]* AMWD.Common.Test AMWD.Common.Test true AMWD.Common.Test icon.png + README.md 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 deleted file mode 100644 index dfc7af5..0000000 --- a/AMWD.Common.Test/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - {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/AMWD.Common.csproj b/AMWD.Common/AMWD.Common.csproj index e304550..e2a49d9 100644 --- a/AMWD.Common/AMWD.Common.csproj +++ b/AMWD.Common/AMWD.Common.csproj @@ -1,7 +1,6 @@ - + - Debug;Release;DebugLocal netstandard2.0 10.0 @@ -11,28 +10,17 @@ true AMWD.Common icon.png + README.md AM.WD Common Library - - true - - - - - - - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/Common.sln b/Common.sln index 7b53082..f5bfa05 100644 --- a/Common.sln +++ b/Common.sln @@ -31,7 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7196DA2B ProjectSection(SolutionItems) = preProject .gitlab-ci.yml = .gitlab-ci.yml directory.build.props = directory.build.props - directory.build.targets = directory.build.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{93EC8B16-7DEF-4E39-B590-E804DEF7C607}" @@ -45,38 +44,27 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - DebugLocal|Any CPU = DebugLocal|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {F512C474-B670-4E47-911E-7C0674AA8E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F512C474-B670-4E47-911E-7C0674AA8E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F512C474-B670-4E47-911E-7C0674AA8E7E}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU - {F512C474-B670-4E47-911E-7C0674AA8E7E}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU {F512C474-B670-4E47-911E-7C0674AA8E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU {F512C474-B670-4E47-911E-7C0674AA8E7E}.Release|Any CPU.Build.0 = Release|Any CPU {725F40C9-8172-487F-B3D0-D7E38B4DB197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {725F40C9-8172-487F-B3D0-D7E38B4DB197}.Debug|Any CPU.Build.0 = Debug|Any CPU - {725F40C9-8172-487F-B3D0-D7E38B4DB197}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU - {725F40C9-8172-487F-B3D0-D7E38B4DB197}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU {725F40C9-8172-487F-B3D0-D7E38B4DB197}.Release|Any CPU.ActiveCfg = Release|Any CPU {725F40C9-8172-487F-B3D0-D7E38B4DB197}.Release|Any CPU.Build.0 = Release|Any CPU {7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7091CECF-C981-4FB9-9CC6-91C4E65A6356}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU - {7091CECF-C981-4FB9-9CC6-91C4E65A6356}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU {7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Release|Any CPU.ActiveCfg = Release|Any CPU {7091CECF-C981-4FB9-9CC6-91C4E65A6356}.Release|Any CPU.Build.0 = Release|Any CPU {6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EBA2792-0B66-4C90-89A1-4E1D26D16443}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU - {6EBA2792-0B66-4C90-89A1-4E1D26D16443}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU {6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Release|Any CPU.ActiveCfg = Release|Any CPU {6EBA2792-0B66-4C90-89A1-4E1D26D16443}.Release|Any CPU.Build.0 = Release|Any CPU {9469D87B-126E-4338-92E3-701F762CB54D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9469D87B-126E-4338-92E3-701F762CB54D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9469D87B-126E-4338-92E3-701F762CB54D}.DebugLocal|Any CPU.ActiveCfg = DebugLocal|Any CPU - {9469D87B-126E-4338-92E3-701F762CB54D}.DebugLocal|Any CPU.Build.0 = DebugLocal|Any CPU {9469D87B-126E-4338-92E3-701F762CB54D}.Release|Any CPU.ActiveCfg = Release|Any CPU {9469D87B-126E-4338-92E3-701F762CB54D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/Directory.Build.props b/Directory.Build.props index e903063..d3239c9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,4 +22,20 @@ © {copyright:2020-} AM.WD MIT + + + true + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 3474b8e..dadeaf5 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -5,7 +5,6 @@ false true false - Debug;Release;DebugLocal