diff --git a/Directory.Build.props b/Directory.Build.props index 9cf7dfac..65f39b2f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,8 +9,8 @@ https://github.com/ardalis/SmartEnum true MIT - net7.0;net6.0;net8.0;netstandard2.0 - true + net6.0;net7.0;net8.0;netstandard2.0 + true 8.0.0 11 diff --git a/Directory.Packages.props b/Directory.Packages.props index d8cc3b22..cb5b25c2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,34 +3,36 @@ true - + - + - + - - + + - + - + - + + + - - + + - + \ No newline at end of file diff --git a/benchmarks/SmartEnum.Benchmarks/SmartEnum.Benchmarks.csproj b/benchmarks/SmartEnum.Benchmarks/SmartEnum.Benchmarks.csproj index 02218d06..b0a72140 100644 --- a/benchmarks/SmartEnum.Benchmarks/SmartEnum.Benchmarks.csproj +++ b/benchmarks/SmartEnum.Benchmarks/SmartEnum.Benchmarks.csproj @@ -6,13 +6,22 @@ false - - - + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/src/SmartEnum.AutoFixture/SmartEnum.AutoFixture.csproj b/src/SmartEnum.AutoFixture/SmartEnum.AutoFixture.csproj index 18382a42..699bb5f0 100644 --- a/src/SmartEnum.AutoFixture/SmartEnum.AutoFixture.csproj +++ b/src/SmartEnum.AutoFixture/SmartEnum.AutoFixture.csproj @@ -16,6 +16,8 @@ + + @@ -23,4 +25,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum.Dapper/SmartEnum.Dapper.csproj b/src/SmartEnum.Dapper/SmartEnum.Dapper.csproj index c81a5de9..5764fdd4 100644 --- a/src/SmartEnum.Dapper/SmartEnum.Dapper.csproj +++ b/src/SmartEnum.Dapper/SmartEnum.Dapper.csproj @@ -23,4 +23,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj b/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj index fa87d83c..5ad72f64 100644 --- a/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj +++ b/src/SmartEnum.EFCore/SmartEnum.EFCore.csproj @@ -21,9 +21,19 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + \ No newline at end of file diff --git a/src/SmartEnum.GuardClauses/SmartEnum.GuardClauses.csproj b/src/SmartEnum.GuardClauses/SmartEnum.GuardClauses.csproj index 746deb84..fe3d7381 100644 --- a/src/SmartEnum.GuardClauses/SmartEnum.GuardClauses.csproj +++ b/src/SmartEnum.GuardClauses/SmartEnum.GuardClauses.csproj @@ -29,4 +29,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum.JsonNet/SmartEnum.JsonNet.csproj b/src/SmartEnum.JsonNet/SmartEnum.JsonNet.csproj index 3399a51b..101aed66 100644 --- a/src/SmartEnum.JsonNet/SmartEnum.JsonNet.csproj +++ b/src/SmartEnum.JsonNet/SmartEnum.JsonNet.csproj @@ -14,7 +14,7 @@ bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - + @@ -22,4 +22,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum.ModelBinding/SmartEnum.ModelBinding.csproj b/src/SmartEnum.ModelBinding/SmartEnum.ModelBinding.csproj index 5ac6d9ba..e323b777 100644 --- a/src/SmartEnum.ModelBinding/SmartEnum.ModelBinding.csproj +++ b/src/SmartEnum.ModelBinding/SmartEnum.ModelBinding.csproj @@ -12,12 +12,14 @@ - + + + - + - + diff --git a/src/SmartEnum.ProtoBufNet/SmartEnum.ProtoBufNet.csproj b/src/SmartEnum.ProtoBufNet/SmartEnum.ProtoBufNet.csproj index dd1267d5..ceac5ea7 100644 --- a/src/SmartEnum.ProtoBufNet/SmartEnum.ProtoBufNet.csproj +++ b/src/SmartEnum.ProtoBufNet/SmartEnum.ProtoBufNet.csproj @@ -22,4 +22,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum.SystemTextJson/SmartEnum.SystemTextJson.csproj b/src/SmartEnum.SystemTextJson/SmartEnum.SystemTextJson.csproj index 39ddc469..e3e2d969 100644 --- a/src/SmartEnum.SystemTextJson/SmartEnum.SystemTextJson.csproj +++ b/src/SmartEnum.SystemTextJson/SmartEnum.SystemTextJson.csproj @@ -23,4 +23,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum.Utf8Json/SmartEnum.Utf8Json.csproj b/src/SmartEnum.Utf8Json/SmartEnum.Utf8Json.csproj index f1258f4c..78abca7b 100644 --- a/src/SmartEnum.Utf8Json/SmartEnum.Utf8Json.csproj +++ b/src/SmartEnum.Utf8Json/SmartEnum.Utf8Json.csproj @@ -22,4 +22,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/src/SmartEnum/SmartEnum.csproj b/src/SmartEnum/SmartEnum.csproj index d4f7d7bb..89fceabd 100644 --- a/src/SmartEnum/SmartEnum.csproj +++ b/src/SmartEnum/SmartEnum.csproj @@ -37,4 +37,13 @@ + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj b/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj index 03fa4cd0..3acde6b6 100644 --- a/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj +++ b/test/SmartEnum.AutoFixture.UnitTests/SmartEnum.AutoFixture.UnitTests.csproj @@ -16,7 +16,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers @@ -28,4 +28,13 @@ 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..16aa225a 100644 --- a/test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj +++ b/test/SmartEnum.Dapper.IntegrationTests/SmartEnum.Dapper.IntegrationTests.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers @@ -20,4 +20,15 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/test/SmartEnum.Dapper.IntegrationTests/SmartEnumDapperTests.cs b/test/SmartEnum.Dapper.IntegrationTests/SmartEnumDapperTests.cs index daf93162..7f4cbf08 100644 --- a/test/SmartEnum.Dapper.IntegrationTests/SmartEnumDapperTests.cs +++ b/test/SmartEnum.Dapper.IntegrationTests/SmartEnumDapperTests.cs @@ -73,9 +73,9 @@ private class TestObject private class EnumA : SmartEnum { - public static readonly EnumA One = new(1); + //public static readonly EnumA One = new(1); public static readonly EnumA Two = new(2); - public static readonly EnumA Three = new(3); + //public static readonly EnumA Three = new(3); protected EnumA(int value, [CallerMemberName] string name = null) : base(name, value) { @@ -84,9 +84,9 @@ protected EnumA(int value, [CallerMemberName] string name = null) : base(name, v private class EnumB : SmartEnum { - public static readonly EnumB One = new(1); + //public static readonly EnumB One = new(1); public static readonly EnumB Two = new(2); - public static readonly EnumB Three = new(3); + //public static readonly EnumB Three = new(3); protected EnumB(int value, [CallerMemberName] string name = null) : base(name, value) { @@ -95,9 +95,9 @@ protected EnumB(int value, [CallerMemberName] string name = null) : base(name, v private class TestDapperEnumByName : DapperSmartEnumByName { - public static readonly TestDapperEnumByName One = new(1); + //public static readonly TestDapperEnumByName One = new(1); public static readonly TestDapperEnumByName Two = new(2); - public static readonly TestDapperEnumByName Three = new(3); + //public static readonly TestDapperEnumByName Three = new(3); protected TestDapperEnumByName(int value, [CallerMemberName] string name = null) : base(name, value) { @@ -106,9 +106,9 @@ protected TestDapperEnumByName(int value, [CallerMemberName] string name = null) private class TestDapperEnumByValue : DapperSmartEnumByValue { - public static readonly TestDapperEnumByValue One = new(1); + //public static readonly TestDapperEnumByValue One = new(1); public static readonly TestDapperEnumByValue Two = new(2); - public static readonly TestDapperEnumByValue Three = new(3); + //public static readonly TestDapperEnumByValue Three = new(3); protected TestDapperEnumByValue(int value, [CallerMemberName] string name = null) : base(name, value) { diff --git a/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj b/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj index 9ce67553..ccfc762a 100644 --- a/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj +++ b/test/SmartEnum.Dapper.UnitTests/SmartEnum.Dapper.UnitTests.csproj @@ -5,10 +5,10 @@ - + - + all runtime; build; native; contentfiles; analyzers @@ -19,4 +19,15 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + \ No newline at end of file diff --git a/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj b/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj index 74d7cd66..0948d53b 100644 --- a/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj +++ b/test/SmartEnum.EFCore.IntegrationTests/SmartEnum.EFCore.IntegrationTests.csproj @@ -23,4 +23,15 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/test/SmartEnum.EFCore.IntegrationTests/TestEnum.cs b/test/SmartEnum.EFCore.IntegrationTests/TestEnum.cs index 295ff98f..d8a6c568 100644 --- a/test/SmartEnum.EFCore.IntegrationTests/TestEnum.cs +++ b/test/SmartEnum.EFCore.IntegrationTests/TestEnum.cs @@ -18,7 +18,7 @@ public abstract class TestBaseEnum : SmartEnum { public static TestBaseEnum One; - internal TestBaseEnum(string name, int value) : base(name, value) + private protected TestBaseEnum(string name, int value) : base(name, value) { } } diff --git a/test/SmartEnum.GuardClauses.UnitTests/SmartEnum.GuardClauses.UnitTests.csproj b/test/SmartEnum.GuardClauses.UnitTests/SmartEnum.GuardClauses.UnitTests.csproj index c86e3348..694c56df 100644 --- a/test/SmartEnum.GuardClauses.UnitTests/SmartEnum.GuardClauses.UnitTests.csproj +++ b/test/SmartEnum.GuardClauses.UnitTests/SmartEnum.GuardClauses.UnitTests.csproj @@ -26,4 +26,15 @@ runtime; build; native; contentfiles; analyzers + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj b/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj index f4c5ec55..787de731 100644 --- a/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj +++ b/test/SmartEnum.JsonNet.UnitTests/SmartEnum.JsonNet.UnitTests.csproj @@ -10,11 +10,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers @@ -26,4 +26,15 @@ 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 9dfd7dbc..7f37c205 100644 --- a/test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj +++ b/test/SmartEnum.MessagePack.UnitTests/SmartEnum.MessagePack.UnitTests.csproj @@ -27,4 +27,13 @@ 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 41a5290d..3a7ed310 100644 --- a/test/SmartEnum.ProtoBufNet.UnitTests/SmartEnum.ProtoBufNet.UnitTests.csproj +++ b/test/SmartEnum.ProtoBufNet.UnitTests/SmartEnum.ProtoBufNet.UnitTests.csproj @@ -27,4 +27,13 @@ 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 d05df37f..8d1d95c8 100644 --- a/test/SmartEnum.SystemTextJson.UnitTests/SmartEnum.SystemTextJson.UnitTests.csproj +++ b/test/SmartEnum.SystemTextJson.UnitTests/SmartEnum.SystemTextJson.UnitTests.csproj @@ -9,11 +9,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers @@ -26,4 +26,15 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/test/SmartEnum.SystemTextJson.UnitTests/TestEnums.cs b/test/SmartEnum.SystemTextJson.UnitTests/TestEnums.cs index 739820aa..7f30514d 100644 --- a/test/SmartEnum.SystemTextJson.UnitTests/TestEnums.cs +++ b/test/SmartEnum.SystemTextJson.UnitTests/TestEnums.cs @@ -39,7 +39,7 @@ public sealed class TestEnumString : SmartEnum TestEnumString(string name, string value) : base(name, value) { } } - public sealed class TestJsonConverters + public static class TestJsonConverters { public static readonly JsonSerializerOptions NameConverterOptions = new() { @@ -63,13 +63,13 @@ public sealed class TestJsonConverters } - public sealed class TestDictInt32EnumString + public static class TestDictInt32EnumString { public static readonly IDictionary Instance = new Dictionary { { TestEnumInt32.Instance, nameof(Instance) } }; } - public sealed class TestDictStringEnumString + public static class TestDictStringEnumString { public static readonly IDictionary Instance = new Dictionary { { TestEnumString.Instance, nameof(Instance) } }; diff --git a/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj b/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj index cac944fb..0e7b4383 100644 --- a/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj +++ b/test/SmartEnum.UnitTests/SmartEnum.UnitTests.csproj @@ -24,4 +24,13 @@ runtime; build; native; contentfiles; analyzers + + + + + + all + runtime; build; native; contentfiles; analyzers + + diff --git a/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj b/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj index 985459ea..a501510f 100644 --- a/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj +++ b/test/SmartEnum.Utf8Json.UnitTests/SmartEnum.Utf8Json.UnitTests.csproj @@ -9,20 +9,29 @@ - + 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 + + diff --git a/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj b/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj index 4910da45..713f7afa 100644 --- a/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj +++ b/test/SmartFlagEnum.UnitTests/SmartFlagEnum.UnitTests.csproj @@ -5,11 +5,14 @@ - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - + all runtime; build; native; contentfiles; analyzers @@ -20,4 +23,15 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + +