Merge release candidate code

README.md

@@ -16,6 +16,7 @@
 | **Xtz.StornglyTyped.BuiltinTypes.AutoFixture** | [![NuGet](http://img.shields.io/nuget/v/Xtz.StronglyTyped.BuiltinTypes.AutoFixture.svg)](https://www.nuget.org/packages/Xtz.StronglyTyped.BuiltinTypes.AutoFixture/) |
 | **Xtz.StornglyTyped.BuiltinTypes.Bogus**       | [![NuGet](http://img.shields.io/nuget/v/Xtz.StronglyTyped.BuiltinTypes.Bogus.svg)](https://www.nuget.org/packages/Xtz.StronglyTyped.BuiltinTypes.Bogus/)             |
 | **Xtz.StornglyTyped.EntityFramework**          | [![NuGet](http://img.shields.io/nuget/v/Xtz.StronglyTyped.EntityFramework.svg)](https://www.nuget.org/packages/Xtz.StronglyTyped.EntityFramework/)                   |
+| **Xtz.StronglyTyped.NewtonsoftJson**           | [![NuGet](http://img.shields.io/nuget/v/Xtz.StronglyTyped.NewtonsoftJson.svg)](https://www.nuget.org/packages/Xtz.StronglyTyped.NewtonsoftJson/)                     |
 | **Xtz.StornglyTyped.SourceGenerator**          | [![NuGet](http://img.shields.io/nuget/v/Xtz.StronglyTyped.SourceGenerator.svg)](https://www.nuget.org/packages/Xtz.StronglyTyped.SourceGenerator/)                   |
 | **Xtz.StornglyTyped.Swashbuckle**              | [![NuGet](http://img.shields.io/nuget/v/Xtz.StronglyTyped.Swashbuckle.svg)](https://www.nuget.org/packages/Xtz.StronglyTyped.Swashbuckle/)                           |
 

src/.editorconfig

@@ -0,0 +1,4 @@
+[*.cs]
+
+# RCS1124: Inline local variable.
+dotnet_diagnostic.RCS1124.severity = none

src/Misc/Xtz.StronglyTyped.Benchmark/GlobalSuppressions.cs

@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Major Code Smell", "S1854:Unused assignments should be removed", Justification = "Vlad DX: Reviewed. It's intentional", Scope = "member", Target = "~M:Xtz.StronglyTyped.Benchmark.Program.Main()")]

src/Misc/Xtz.StronglyTyped.Benchmark/Models/IntStructId.cs

@@ -8,7 +8,7 @@ public partial struct IntStructId
         private bool IsValid(int value)
         {
             // ID must be greater than 0
-            return value <= 0;
+            return value > 0;
         }
     }
 }

src/Misc/Xtz.StronglyTyped.Benchmark/Program.cs

@@ -3,22 +3,23 @@
 
 namespace Xtz.StronglyTyped.Benchmark
 {
-    public class Program
+    public static class Program
     {
         public const int VALUE_COUNT = 1000;
 
-        public static void Main(string[] args)
+        public static void Main()
         {
+            // ReSharper disable once RedundantAssignment
             var config = DefaultConfig.Instance;
 
 #if DEBUG
             config = new DebugBuildConfig();
 #endif
 
             BenchmarkRunner.Run<SystemTextJsonSerializationEmails>(config);
-            BenchmarkRunner.Run<SystemTextJsonSerializationMacAddress>();
-            BenchmarkRunner.Run<SystemTextJsonSerializationGuidIds>();
-            BenchmarkRunner.Run<SystemTextJsonSerializationIntIds>();
+            BenchmarkRunner.Run<SystemTextJsonSerializationMacAddress>(config);
+            BenchmarkRunner.Run<SystemTextJsonSerializationGuidIds>(config);
+            BenchmarkRunner.Run<SystemTextJsonSerializationIntIds>(config);
         }
     }
 }

src/Misc/Xtz.StronglyTyped.Benchmark/SystemTextJsonSerializationEmails.cs

@@ -24,7 +24,7 @@ public SystemTextJsonSerializationEmails()
         {
             ////System.Diagnostics.Debugger.Launch();
 
-            var fakerBuilder = new InternetFakerBuilder(true);
+            var fakerBuilder = new InternetFakerBuilder();
             var faker = fakerBuilder.BuildEmailFaker();
 
             _emails = faker.Generate(Program.VALUE_COUNT).ToArray();

src/Misc/Xtz.StronglyTyped.Benchmark/SystemTextJsonSerializationGuidIds.cs

@@ -10,8 +10,6 @@ namespace Xtz.StronglyTyped.Benchmark
     [MemoryDiagnoser]
     public class SystemTextJsonSerializationGuidIds
     {
-        private readonly Faker<EmployeeGuidId> _faker;
-
         private readonly EmployeeGuidId[] _employeeGuidIds;
 
         private readonly EmployeeGuidId[] _otherEmployeeGuidIds;
@@ -22,10 +20,10 @@ public class SystemTextJsonSerializationGuidIds
 
         public SystemTextJsonSerializationGuidIds()
         {
-            _faker = new Faker<EmployeeGuidId>();
+            var faker = new Faker<EmployeeGuidId>();
 
-            _employeeGuidIds = _faker.Generate(Program.VALUE_COUNT).ToArray();
-            _otherEmployeeGuidIds = _faker.Generate(Program.VALUE_COUNT).ToArray();
+            _employeeGuidIds = faker.Generate(Program.VALUE_COUNT).ToArray();
+            _otherEmployeeGuidIds = faker.Generate(Program.VALUE_COUNT).ToArray();
             _guids = _employeeGuidIds.Select(x => x.Value).ToArray();
             _stronglyTypedGuidStructs = _employeeGuidIds.Select(x => (GuidStructId)x.Value).ToArray();
         }
@@ -38,21 +36,21 @@ public string SerializeEmailStrings()
         }
 
         [Benchmark(Description = "StronglyTyped<ValueType<Guid>>")]
-        public string SerializeStronglyTypedStringStructs()
+        public string SerializeStronglyTypedGuidStructs()
         {
             var result = JsonSerializer.Serialize(_stronglyTypedGuidStructs);
             return result;
         }
 
         [Benchmark(Description = "StronglyTyped<Guid>")]
-        public string SerializeStronglyTypedEmails()
+        public string SerializeStronglyTypedGuids()
         {
             var result = JsonSerializer.Serialize(_employeeGuidIds);
             return result;
         }
 
         [Benchmark(Description = "Other StronglyTyped<Guid>")]
-        public string SerializeOtherStronglyTypedEmails()
+        public string SerializeOtherStronglyTypedGuids()
         {
             var result = JsonSerializer.Serialize(_otherEmployeeGuidIds);
             return result;

src/Misc/Xtz.StronglyTyped.Benchmark/SystemTextJsonSerializationIntIds.cs

@@ -10,8 +10,6 @@ namespace Xtz.StronglyTyped.Benchmark
     [MemoryDiagnoser]
     public class SystemTextJsonSerializationIntIds
     {
-        private readonly Faker<CompanyIntId> _faker;
-
         private readonly CompanyIntId[] _companyIntIds;
 
         private readonly CompanyIntId[] _otherCompanyIntIds;
@@ -22,38 +20,38 @@ public class SystemTextJsonSerializationIntIds
 
         public SystemTextJsonSerializationIntIds()
         {
-            _faker = new Faker<CompanyIntId>()
+            var faker = new Faker<CompanyIntId>()
                 .CustomInstantiator(f => new CompanyIntId(Math.Abs(f.Random.Int())));
 
-            _companyIntIds = _faker.Generate(Program.VALUE_COUNT).ToArray();
-            _otherCompanyIntIds = _faker.Generate(Program.VALUE_COUNT).ToArray();
+            _companyIntIds = faker.Generate(Program.VALUE_COUNT).ToArray();
+            _otherCompanyIntIds = faker.Generate(Program.VALUE_COUNT).ToArray();
             _ints = _companyIntIds.Select(x => x.Value).ToArray();
             _stronglyTypedIntStructs = _companyIntIds.Select(x => (IntStructId)x.Value).ToArray();
         }
 
         [Benchmark(Baseline = true, Description = "int")]
-        public string SerializeEmailStrings()
+        public string SerializeInts()
         {
             var result = JsonSerializer.Serialize(_ints);
             return result;
         }
 
         [Benchmark(Description = "StronglyTyped<ValueType<int>>")]
-        public string SerializeStronglyTypedStringStructs()
+        public string SerializeStronglyTypedIntStructs()
         {
             var result = JsonSerializer.Serialize(_stronglyTypedIntStructs);
             return result;
         }
 
         [Benchmark(Description = "StronglyTyped<int>")]
-        public string SerializeStronglyTypedEmails()
+        public string SerializeStronglyTypedIntIds()
         {
             var result = JsonSerializer.Serialize(_companyIntIds);
             return result;
         }
 
         [Benchmark(Description = "Other StronglyTyped<int>")]
-        public string SerializeOtherStronglyTypedEmails()
+        public string SerializeOtherStronglyTypedIntIds()
         {
             var result = JsonSerializer.Serialize(_otherCompanyIntIds);
             return result;

src/Misc/Xtz.StronglyTyped.Benchmark/SystemTextJsonSerializationMacAddress.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Text.Json;
 using BenchmarkDotNet.Attributes;
-using Bogus;
 using Xtz.StronglyTyped.Benchmark.Models;
 using Xtz.StronglyTyped.BuiltinTypes.Bogus;
 using Xtz.StronglyTyped.BuiltinTypes.Internet;
@@ -11,10 +10,6 @@ namespace Xtz.StronglyTyped.Benchmark
     [MemoryDiagnoser]
     public class SystemTextJsonSerializationMacAddress
     {
-        private readonly InternetFakerBuilder _fakerBuilder;
-
-        private readonly Faker<MacAddress> _faker;
-
         private readonly MacAddress[] _macAddresses;
 
         private readonly MacAddress[] _otherMacAddresses;
@@ -27,11 +22,11 @@ public class SystemTextJsonSerializationMacAddress
 
         public SystemTextJsonSerializationMacAddress()
         {
-            _fakerBuilder = new InternetFakerBuilder(true);
-            _faker = _fakerBuilder.BuildMacAddressFaker();
+            var fakerBuilder = new InternetFakerBuilder();
+            var faker = fakerBuilder.BuildMacAddressFaker();
 
-            _macAddresses = _faker.Generate(Program.VALUE_COUNT).ToArray();
-            _otherMacAddresses = _faker.Generate(Program.VALUE_COUNT).ToArray();
+            _macAddresses = faker.Generate(Program.VALUE_COUNT).ToArray();
+            _otherMacAddresses = faker.Generate(Program.VALUE_COUNT).ToArray();
             _strings = _macAddresses.Select(x => x.ToString()).ToArray();
             _stronglyTypedStrings = _strings.Select(x => (StronglyTypedString)x).ToArray();
             _stronglyTypedStructs = _strings.Select(x => (StronglyTypedStringStruct)x).ToArray();
@@ -40,7 +35,7 @@ public SystemTextJsonSerializationMacAddress()
         }
 
         [Benchmark(Baseline = true, Description = "string")]
-        public string SerializeEmailStrings()
+        public string SerializeMacAddressStrings()
         {
             var result = JsonSerializer.Serialize(_strings);
             return result;
@@ -60,15 +55,15 @@ public string SerializeStronglyTypedStringStructs()
             return result;
         }
 
-        [Benchmark(Description = "StronglyTyped<MailAddress>")]
-        public string SerializeStronglyTypedEmails()
+        [Benchmark(Description = "StronglyTyped<PhysicalAddress>")]
+        public string SerializeStronglyTypedMacAddresses()
         {
             var result = JsonSerializer.Serialize(_macAddresses);
             return result;
         }
 
-        [Benchmark(Description = "Other StronglyTyped<MailAddress>")]
-        public string SerializeOtherStronglyTypedEmails()
+        [Benchmark(Description = "Other StronglyTyped<PhysicalAddress>")]
+        public string SerializeOtherStronglyTypedMacAddresses()
         {
             var result = JsonSerializer.Serialize(_otherMacAddresses);
             return result;

src/Misc/Xtz.StronglyTyped.Benchmark/Xtz.StronglyTyped.Benchmark.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -12,21 +12,24 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\Xtz.StronglyTyped.SourceGenerator\Xtz.StronglyTyped.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
-    <ProjectReference Include="..\..\Xtz.StronglyTyped.BuiltinTypes.Bogus\Xtz.StronglyTyped.BuiltinTypes.Bogus.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.1">
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.26.0.34506">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Xtz.StronglyTyped.SourceGenerator\Xtz.StronglyTyped.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+    <ProjectReference Include="..\..\Xtz.StronglyTyped.BuiltinTypes.Bogus\Xtz.StronglyTyped.BuiltinTypes.Bogus.csproj" />
   </ItemGroup>
 
 </Project>

src/Misc/Xtz.StronglyTyped.Playground/Program.cs

@@ -5,7 +5,7 @@ namespace Xtz.StronglyTyped.Playground
 {
     // NOTE: Just a simple console app for demo purposes
 
-    public class Program
+    public static class Program
     {
         public static void Main()
         {
@@ -25,7 +25,7 @@ public static void Main()
 
         private static void RunAddressFakers()
         {
-            var fakerBuilder = new AddressFakerBuilder(true);
+            var fakerBuilder = new AddressFakerBuilder();
 
             var city = fakerBuilder.BuildCityFaker().Generate();
             Console.WriteLine(city);
@@ -72,7 +72,7 @@ private static void RunAddressFakers()
 
         private static void RunInternetFakers()
         {
-            var fakerBuilder = new InternetFakerBuilder(true);
+            var fakerBuilder = new InternetFakerBuilder();
 
             var absoluteUri = fakerBuilder.BuildAbsoluteUriFaker().Generate();
             Console.WriteLine(absoluteUri);

src/Misc/Xtz.StronglyTyped.Playground/Xtz.StronglyTyped.Playground.csproj

@@ -16,26 +16,27 @@
     </Content>
   </ItemGroup>
 
-  <PropertyGroup>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-  </PropertyGroup>
-
   <PropertyGroup>
     <EmitCompilerGeneratedFiles>True</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
   </PropertyGroup>
 
-  <!--<ItemGroup>
-    --><!-- Don't include the output from a previous source generator execution into future runs; the */** trick here ensures that there's
-  at least one subdirectory, which is our key that it's coming from a source generator as opposed to something that is coming from
-  some other tool. --><!--
-    <Compile Remove="$(CompilerGeneratedFilesOutputPath)/*/**/*.cs" />
-  </ItemGroup>-->
-
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.26.0.34506">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -44,11 +45,4 @@
     <ProjectReference Include="..\..\Xtz.StronglyTyped\Xtz.StronglyTyped.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.8.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
 </Project>

src/Tests/Xtz.StronglyTyped.Api_3_1.IntegrationTests/GlobalSuppressions.cs

@@ -0,0 +1,12 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Minor Code Smell", "S1481:Unused local variables should be removed", Justification = "Vlad DX: Reviewed (unit tests)", Scope = "member", Target = "~M:Xtz.StronglyTyped.Api_3_1.IntegrationTests.WebApiTests.ShouldDeserialize_ForStandardEndpoint_WhenNewtonsoftUsed~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Minor Code Smell", "S1481:Unused local variables should be removed", Justification = "Vlad DX: Reviewed (unit tests)", Scope = "member", Target = "~M:Xtz.StronglyTyped.Api_3_1.IntegrationTests.WebApiTests.ShouldDeserialize_ForStandardEndpoint_WhenSystemTextJsonUsed~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Minor Code Smell", "S1481:Unused local variables should be removed", Justification = "Vlad DX: Reviewed (unit tests)", Scope = "member", Target = "~M:Xtz.StronglyTyped.Api_3_1.IntegrationTests.WebApiTests.ShouldDeserialize_ForStronglyTypedEndpoint_WhenNewtonsoftUsed~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Minor Code Smell", "S1481:Unused local variables should be removed", Justification = "Vlad DX: Reviewed (unit tests)", Scope = "member", Target = "~M:Xtz.StronglyTyped.Api_3_1.IntegrationTests.WebApiTests.ShouldDeserialize_ForStronglyTypedEndpoint_WhenSystemTextJsonUsed~System.Threading.Tasks.Task")]
+[assembly: SuppressMessage("Style", "IDE0059:Unnecessary assignment of a value", Justification = "Vlad DX: Reviewed (unit tests)", Scope = "member", Target = "~M:Xtz.StronglyTyped.Api_3_1.IntegrationTests.WebApiTests.ShouldDeserialize_ForStandardEndpoint_WhenNewtonsoftUsed~System.Threading.Tasks.Task")]

src/Xtz.StronglyTyped.Api_3_1.IntegrationTests/WebApi/Startup.cs → src/Tests/Xtz.StronglyTyped.Api_3_1.IntegrationTests/WebApi/Startup.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Xtz.StronglyTyped.NewtonsoftJson;
 
 namespace Xtz.StronglyTyped.Api_3_1.IntegrationTests.WebApi
 {

src/Xtz.StronglyTyped.Api_3_1.IntegrationTests/WebApi/StronglyTypedWeatherForecast.cs → src/Tests/Xtz.StronglyTyped.Api_3_1.IntegrationTests/WebApi/StronglyTypedWeatherForecast.cs

@@ -7,6 +7,8 @@ public class StronglyTypedWeatherForecast
     {
         public City City { get; set; }
 
+        public Country NullValue { get; set; }
+
         public DateTime Date { get; set; }
 
         public DegreesCelsius TemperatureC { get; set; }