diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4f0e5cd..b69f033 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,6 +11,8 @@ jobs: build: strategy: fail-fast: false + matrix: + dotnet-version: [8.0.x] runs-on: windows-latest steps: - name: Checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 469be82..aa382b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,6 +8,8 @@ jobs: build: strategy: fail-fast: false + matrix: + dotnet-version: [8.0.x] runs-on: windows-latest steps: - name: Checkout diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/AutoMapper.Extensions.EnumMapping.Tests.csproj b/src/AutoMapper.Extensions.EnumMapping.Tests/AutoMapper.Extensions.EnumMapping.Tests.csproj index b9ce5f6..0c32be3 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/AutoMapper.Extensions.EnumMapping.Tests.csproj +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/AutoMapper.Extensions.EnumMapping.Tests.csproj @@ -6,11 +6,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingType.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingType.cs index b4be3cf..c1909b9 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingType.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingType.cs @@ -30,7 +30,7 @@ public class Default : AutoMapperSpecBase cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -57,7 +57,7 @@ public class ByName : AutoMapperSpecBase cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()); - }); + }, _loggerFactory); protected override void Because_of() { @@ -84,7 +84,7 @@ public class ByValue : AutoMapperSpecBase cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingValidation.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingValidation.cs index 541dbe2..83cf4b0 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingValidation.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumMappingValidation.cs @@ -10,6 +10,6 @@ public class Default : AutoMapperSpecBase { cfg.EnableEnumMappingValidation(); cfg.CreateMap(); - }); + }, _loggerFactory); } } diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByName.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByName.cs index 8d16bf6..30f5ca9 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByName.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByName.cs @@ -18,7 +18,7 @@ public enum Destination { Default, Bar, Foo } cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()); - }); + }, _loggerFactory); protected override void Because_of() { @@ -44,7 +44,7 @@ public enum Destination { fOObAR, DefaulT, Bar, Foo } cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName(true)); - }); + }, _loggerFactory); protected override void Because_of() { @@ -73,7 +73,7 @@ public enum Destination { Default, Foo } .ConvertUsingEnumMapping(opt => opt .MapByName() .MapValue(Source.Bar, Destination.Foo)); - }); + }, _loggerFactory); protected override void Because_of() { @@ -97,7 +97,7 @@ public enum Destination { Default, Bar } cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -118,7 +118,7 @@ public enum Destination { Default, Foo } .ConvertUsingEnumMapping(opt => opt .MapByName() .MapValue(Source.Bar, Destination.Foo)); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByValue.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByValue.cs index 1c35968..a98512e 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByValue.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingByValue.cs @@ -18,7 +18,7 @@ public enum Destination { Default, Bar, Foo } cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()); - }); + }, _loggerFactory); protected override void Because_of() { @@ -47,7 +47,7 @@ public enum Destination { Default, Bar } .ConvertUsingEnumMapping(opt => opt .MapByValue() .MapValue(Source.Bar, Destination.Bar)); - }); + }, _loggerFactory); protected override void Because_of() { @@ -71,7 +71,7 @@ public enum Destination { Default, Bar } cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -92,7 +92,7 @@ public enum Destination { Default, Bar } .ConvertUsingEnumMapping(opt => opt .MapByValue() .MapValue(Source.Bar, Destination.Bar)); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingToException.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingToException.cs index 70e67ed..3bf42d1 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingToException.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueMappingToException.cs @@ -21,7 +21,7 @@ public enum Destination { A = 2 } .MapValue(Source.A, Destination.A) .MapException(Source.B, () => new NotSupportedException($"B is not valid value")) ); - }); + }, _loggerFactory); protected override void Because_of() { @@ -49,7 +49,7 @@ public enum Destination { A = 2 } .MapValue(Source.A, Destination.A) .MapException(Source.B, () => new NotSupportedException($"B is not valid value")) ); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueWithOtherUnderlyingTypeMapping.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueWithOtherUnderlyingTypeMapping.cs index b382b1c..c257853 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueWithOtherUnderlyingTypeMapping.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/EnumValueWithOtherUnderlyingTypeMapping.cs @@ -15,7 +15,7 @@ public enum Destination : byte { Default, Bar, Foo } cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/Internal/SpecBaseBase.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/Internal/SpecBaseBase.cs index cc0b34a..229df95 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/Internal/SpecBaseBase.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/Internal/SpecBaseBase.cs @@ -1,7 +1,16 @@ -namespace AutoMapper.Extensions.EnumMapping.Tests.Internal +using Microsoft.Extensions.Logging; + +namespace AutoMapper.Extensions.EnumMapping.Tests.Internal { public abstract class SpecBaseBase { + protected static ILoggerFactory _loggerFactory; + + static SpecBaseBase() + { + _loggerFactory = new LoggerFactory(); + } + protected virtual void MainSetup() { Establish_context(); diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumExceptionMapping.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumExceptionMapping.cs index ede86a5..2b1347e 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumExceptionMapping.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumExceptionMapping.cs @@ -22,7 +22,7 @@ public enum Destination { A = 2 } .MapException(Source.B, () => new NotSupportedException($"B is not valid value")) ) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumMappingByCustom.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumMappingByCustom.cs index 77f1d0c..79de680 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumMappingByCustom.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumMappingByCustom.cs @@ -58,7 +58,7 @@ public TestEnumProfile() { cfg.EnableEnumMappingValidation(); cfg.AddMaps(typeof(ReverseCustomEnumMappingByCustom).GetTypeInfo().Assembly); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumValueMappingByValue.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumValueMappingByValue.cs index c95d4c1..b18ed81 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumValueMappingByValue.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseCustomEnumValueMappingByValue.cs @@ -21,7 +21,7 @@ public enum Destination { Default, Foo } .ConvertUsingEnumMapping(opt => opt.MapByValue() .MapValue(Source.OnlyInSource, Destination.Foo)) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -48,7 +48,7 @@ public enum Destination { Default, Foo, OnlyInDestination } cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()) .ReverseMap(); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -71,7 +71,7 @@ public enum Destination { Default, OnlyInDestination } .ConvertUsingEnumMapping(opt => opt.MapByValue() .MapValue(Source.OnlyInSource, Destination.OnlyInDestination)) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -103,7 +103,7 @@ public enum Destination { A, B, C, D, InSourceAndDestionation } .MapValue(Source.InSourceAndDestionation, Destination.D) .MapValue(Source.OnyInSource, Destination.InSourceAndDestionation)) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -144,7 +144,7 @@ public enum Destination { A, B, C, D, E, F } .MapValue(Source.E, Destination.A) ) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -187,7 +187,7 @@ public enum Destination { C = 2 } .MapValue(Source.F, Destination.C) ) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumMappingType.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumMappingType.cs index 21e7dde..43b6082 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumMappingType.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumMappingType.cs @@ -31,7 +31,7 @@ public class Default : AutoMapperSpecBase cfg.CreateMap() .ConvertUsingEnumMapping() .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -58,7 +58,7 @@ public class ByName : AutoMapperSpecBase cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()); - }); + }, _loggerFactory); protected override void Because_of() { @@ -85,7 +85,7 @@ public class ByValue : AutoMapperSpecBase cfg.EnableEnumMappingValidation(); cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByCustom.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByCustom.cs index 41d97db..6507156 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByCustom.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByCustom.cs @@ -24,7 +24,7 @@ public enum Destination { Default, Bar, Foo } .MapValue(Source.Bar, Destination.Bar) ) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -56,7 +56,7 @@ public enum Destination { Default, Bar } .MapValue(Source.Bar, Destination.Bar) ) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -85,7 +85,7 @@ public enum Destination { Default, Bar } .MapValue(Source.Bar, Destination.Bar) ) .ReverseMap(); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -109,7 +109,7 @@ public enum Destination { Default, Bar } .MapException(Source.Foo, () => new NotSupportedException($"Foo is not valid value")) .MapValue(Source.Bar, Destination.Bar)) .ReverseMap(); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -135,7 +135,7 @@ public enum Destination { Default, Foo, Bar } .MapValue(Source.Default, Destination.Default) .MapValue(Source.Bar, Destination.Bar)) .ReverseMap(optr => optr.MapByCustom().MapValue(Destination.Foo, Source.Bar)); - }); + }, _loggerFactory); protected override void Because_of() { diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByName.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByName.cs index c287c26..e9037f9 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByName.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByName.cs @@ -20,7 +20,7 @@ public enum Destination { Default, Bar, Foo } cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -54,7 +54,7 @@ public enum Destination { Default, Foo, Bar } .ConvertUsingEnumMapping(opt => opt.MapByName()) .ReverseMap(opt => opt. MapValue(Destination.Bar, Source.Foo)); - }); + }, _loggerFactory); protected override void Because_of() { @@ -83,7 +83,7 @@ public enum Destination { Default, Bar } cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()) .ReverseMap(); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -103,7 +103,7 @@ public enum Destination { Default, Foo, Bar, Error } cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByName()) .ReverseMap(opt => opt.MapValue(Destination.Bar, Source.Foo)); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => diff --git a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByValue.cs b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByValue.cs index a825451..fb1d916 100644 --- a/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByValue.cs +++ b/src/AutoMapper.Extensions.EnumMapping.Tests/ReverseEnumValueMappingByValue.cs @@ -19,7 +19,7 @@ public enum Destination { Default, Bar, Foo } cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -49,7 +49,7 @@ public enum Destination { Default, Bar } .MapByValue() .MapValue(Source.Bar, Destination.Bar)) .ReverseMap(); - }); + }, _loggerFactory); protected override void Because_of() { @@ -74,7 +74,7 @@ public enum Destination { Default, Bar } cfg.CreateMap() .ConvertUsingEnumMapping(opt => opt.MapByValue()) .ReverseMap(); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => @@ -96,7 +96,7 @@ public enum Destination { Default, Bar } .MapByValue() .MapValue(Source.Bar, Destination.Bar)) .ReverseMap(); - }); + }, _loggerFactory); [Fact] public void Should_fail_validation() => diff --git a/src/AutoMapper.Extensions.EnumMapping/AutoMapper.Extensions.EnumMapping.csproj b/src/AutoMapper.Extensions.EnumMapping/AutoMapper.Extensions.EnumMapping.csproj index f586099..415161b 100644 --- a/src/AutoMapper.Extensions.EnumMapping/AutoMapper.Extensions.EnumMapping.csproj +++ b/src/AutoMapper.Extensions.EnumMapping/AutoMapper.Extensions.EnumMapping.csproj @@ -26,7 +26,7 @@ - +