From d4e4e850c9866dea4390065f1c3a41754bccb73d Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 16 Jan 2024 12:26:49 -0500 Subject: [PATCH 1/3] Configure multi-targeting --- Directory.Build.props | 5 +- Directory.Packages.props | 1 + src/SmartEnum.EFCore/SmartEnum.EFCore.csproj | 1 + src/SmartEnum/SmartEnum.csproj | 3 ++ .../SmartEnum.EFCore.IntegrationTests.csproj | 1 + .../SmartEnum.Utf8Json.UnitTests.csproj | 53 ++++++++++--------- 6 files changed, 36 insertions(+), 28 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 9254923c..73a9ecaa 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,9 +9,10 @@ https://github.com/ardalis/SmartEnum true MIT - net7.0 + net7.0;net6.0;net8.0;netstandard2.1 true - 7.0.0 + 8.0.0 + 11 strict diff --git a/Directory.Packages.props b/Directory.Packages.props index f0dad616..bfc6a056 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,6 +23,7 @@ + diff --git a/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj b/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj index 2c6f8868..fa87d83c 100644 --- a/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj +++ b/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj @@ -1,6 +1,7 @@ + net6;net7;net8 Ardalis.SmartEnum.EFCore Ardalis.SmartEnum.EFCore EFCore support for Ardalis.SmartEnum. diff --git a/src/SmartEnum/SmartEnum.csproj b/src/SmartEnum/SmartEnum.csproj index 3810730e..da9dd30a 100644 --- a/src/SmartEnum/SmartEnum.csproj +++ b/src/SmartEnum/SmartEnum.csproj @@ -30,4 +30,7 @@ + + + diff --git a/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj b/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj index 74d7cd66..3bff7e4d 100644 --- a/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj +++ b/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj @@ -1,6 +1,7 @@ + net6;net7;net8 false diff --git a/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj b/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj index ee5f7a16..c875485c 100644 --- a/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj +++ b/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj @@ -1,28 +1,29 @@ - - false - 7.3 - strict - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + false + 7.3 + strict + net6;net7;net8 + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + From f810df181b146694539cfe3c7e45c2535838e4e2 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 16 Jan 2024 14:26:29 -0500 Subject: [PATCH 2/3] Update target frameworks for tests --- .../SmartEnum.AutoFixture.UnitTests.csproj | 57 ++++++++++--------- .../SmartEnum.Dapper.IntegrationTests.csproj | 1 + .../SmartEnum.Dapper.UnitTests.csproj | 1 + .../SmartEnum.JsonNet.UnitTests.csproj | 51 +++++++++-------- .../SmartEnum.MessagePack.UnitTests.csproj | 57 ++++++++++--------- .../SmartEnum.ProtoBufNet.UnitTests.csproj | 57 ++++++++++--------- .../SmartEnum.SystemTextJson.UnitTests.csproj | 45 ++++++++------- .../SmartEnum.UnitTests.csproj | 51 +++++++++-------- .../SmartFlagEnum.UnitTests.csproj | 1 + 9 files changed, 167 insertions(+), 154 deletions(-) diff --git a/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj b/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj index 344d4866..8592fa93 100644 --- a/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj +++ b/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj @@ -1,31 +1,32 @@ - - false - 7.3 - strict - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + false + 7.3 + strict + net6;net7;net8 + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj b/test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj index 79aa5b6c..cc276303 100644 --- a/test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj +++ b/test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj @@ -3,6 +3,7 @@ false Ardalis.SmartEnum.Dapper.IntegrationTests + net6;net7;net8 diff --git a/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj b/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj index 9ce67553..b5d5c0eb 100644 --- a/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj +++ b/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj @@ -2,6 +2,7 @@ false Ardalis.SmartEnum.Dapper.UnitTests + net6;net7;net8 diff --git a/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj b/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj index 5c7bcbb4..85f79c99 100644 --- a/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj +++ b/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj @@ -1,29 +1,30 @@ - - false - 7.3 - strict - + + false + 7.3 + strict + net6;net7;net8 + - - - + + + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj b/test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj index 07f48265..f4fb1f55 100644 --- a/test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj +++ b/test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj @@ -1,30 +1,31 @@ - - false - 7.3 - strict - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + false + 7.3 + strict + net6;net7;net8 + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/test/SmartEnum.ProtoBufNet.UnitTests/SmartEnum.ProtoBufNet.UnitTests.csproj b/test/SmartEnum.ProtoBufNet.UnitTests/SmartEnum.ProtoBufNet.UnitTests.csproj index 962a7f17..a86bb6f0 100644 --- a/test/SmartEnum.ProtoBufNet.UnitTests/SmartEnum.ProtoBufNet.UnitTests.csproj +++ b/test/SmartEnum.ProtoBufNet.UnitTests/SmartEnum.ProtoBufNet.UnitTests.csproj @@ -1,30 +1,31 @@ - - false - 7.3 - strict - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + false + 7.3 + strict + net6;net7;net8 + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartEnum.SystemTextJson.UnitTests/SmartEnum.SystemTextJson.UnitTests.csproj b/test/SmartEnum.SystemTextJson.UnitTests/SmartEnum.SystemTextJson.UnitTests.csproj index 71be89b6..498ab3ef 100644 --- a/test/SmartEnum.SystemTextJson.UnitTests/SmartEnum.SystemTextJson.UnitTests.csproj +++ b/test/SmartEnum.SystemTextJson.UnitTests/SmartEnum.SystemTextJson.UnitTests.csproj @@ -1,25 +1,30 @@ + + false + strict + net6;net7;net8 + - - - + + + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj b/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj index 71d62475..6541192c 100644 --- a/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj +++ b/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj @@ -1,27 +1,28 @@ - - false - 7.3 - strict - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers - - - - - - all - runtime; build; native; contentfiles; analyzers - - + + false + 7.3 + strict + net6;net7;net8 + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj b/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj index 4910da45..682d6ce9 100644 --- a/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj +++ b/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj @@ -2,6 +2,7 @@ false + net6;net7;net8 From 70d3ea497abe6a72f4d9f5304ae208fb1e7b8dc3 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 16 Jan 2024 14:48:45 -0500 Subject: [PATCH 3/3] adding release notes --- src/SmartEnum/SmartEnum.csproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/SmartEnum/SmartEnum.csproj b/src/SmartEnum/SmartEnum.csproj index da9dd30a..43c176a6 100644 --- a/src/SmartEnum/SmartEnum.csproj +++ b/src/SmartEnum/SmartEnum.csproj @@ -7,7 +7,11 @@ Classes to help produce strongly typed smarter enums in .NET. enum;smartenum;ardalis icon.png - Updating to net7. + + Adding multi-targeting. + Add SmartEnumNameAttribute, a DataAnnotations ValidationAttribute by @sdepouw in #447 + Support SmartEnums as dictionary keys by @Steve-OH in #458 + Ardalis.SmartEnum README.md