Support JSON in .NET Core 3

Author: moh-hassan

.gitignore

@@ -11,7 +11,7 @@ build/
 tools/
 Experiment/
 Plugins/
-
+.vscode
 
 # User-specific files
 *.suo

OData2Poco.CommandLine.Test/ParserTest.cs

@@ -39,7 +39,7 @@ public async Task Arg_contains_version_Test()
             //Act
             var result = await RunCommand(args);
             //Assert
-            Assert.That(result.Item2.Split('\n').Length, Is.EqualTo(1));
+            Assert.That(result.Item2.Split('\n').Length, Is.EqualTo(2)); //commandlinee v2.8 add newline
 
         }
 

OData2Poco.CommandLine.Test/ProgramTests.cs

@@ -184,10 +184,12 @@ public async Task NullableDatatypeTest(string url, string version, int n)
 
         [Test]
         [TestCaseSource(typeof(TestSample), nameof(TestSample.FileCases))]
+        [Category("json")]
         public async Task PocoSettingWithJsonAttributeTest(string url, string version, int n)
         {
             //Arrange
-            var a = $"-r {url}  -j -v";
+            //  var a = $"-r {url}  -j -v"; //obsolete
+            var a = $"-r {url}  -a json -v";
             //Act
             var tuble = await RunCommand(a);
             var output = tuble.Item2;
@@ -201,6 +203,25 @@ public async Task PocoSettingWithJsonAttributeTest(string url, string version, i
             Assert.IsTrue(output.Contains("CategoryName"));
         }
 
+        [Test]
+        [TestCaseSource(typeof(TestSample), nameof(TestSample.FileCases))]
+        [Category("json3")]
+        public async Task PocoSettingWithJsonAttributeNetCore3Test(string url, string version, int n)
+        {
+            //Arrange           
+            var a = $"-r {url}  -a json3 -v";
+            //Act
+            var tuble = await RunCommand(a);
+            var output = tuble.Item2;
+
+            //Assert
+            Assert.AreEqual(0, tuble.Item1); //exit code
+            Assert.IsTrue(output.Contains("public partial class Category"));
+            Assert.IsTrue(output.Contains("[JsonPropertyName(\"CategoryID\")]"));
+            Assert.IsTrue(output.Contains("Category"));
+            Assert.IsTrue(output.Contains(" [JsonPropertyName(\"CategoryName\")]"));
+            Assert.IsTrue(output.Contains("CategoryName"));
+        }
         [Test]
         [TestCaseSource(typeof(TestSample), nameof(TestSample.FileCases))]
         public async Task PocoSettingWithJsonAttributeAndCamelCaseTest(string url, string version, int n)

OData2Poco.CommandLine/OData2Poco.CommandLine.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.5.0">
+    <PackageReference Include="CommandLineParser" Version="2.8.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

OData2Poco.Core/Options.cs

@@ -82,7 +82,7 @@ public class Options
         public string EntityNameCase { get; set; }
 
         [Option('a', "attribute",
-            HelpText = "Attributes, Allowed values: key, req, json,tab,dm,proto,db,display")]
+            HelpText = "Attributes, Allowed values: key, req, json, json3, tab, dm, proto, db, display")]
         public IEnumerable<string> Attributes { get; set; }
 
        // [Option("lang", Default = "cs", HelpText = "Type cs for CSharp, vb for VB.NET")]

OData2Poco.dotnet.o2pgen/OData2Poco.dotnet.o2pgen.csproj

@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.5.0" />
+    <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

OData2PocoLib/AssemplyManager.cs

@@ -58,6 +58,7 @@ public void AddAssemply(params string[] list)
             {"Req" ,"System.ComponentModel.DataAnnotations"},
             {"Table" ,"System.ComponentModel.DataAnnotations.Schema"},
             {"json","Newtonsoft.Json"}, //extrnal type can be installed from nuget
+            {"json3","System.Text.Json.Serialization"},  //netcore 3+
             //assemplies for Geographic data type
             {"Geometry","Microsoft.Spatial"}, //extrnal type can be installed from nuget
             {"Geography", "Microsoft.Spatial"} ,//extrnal type can be installed from nuget
@@ -92,8 +93,9 @@ private void AddAssemplyReferenceList()
             if (_pocoSetting.AddTableAttribute) AddAssemplyByKey("table");
             if (_pocoSetting.Attributes.Contains("tab")) AddAssemplyByKey("table");
 
-            if (_pocoSetting.AddJsonAttribute) AddAssemplyByKey("json");
+            if (_pocoSetting.AddJsonAttribute) AddAssemplyByKey("json"); //obsolete
             if (_pocoSetting.Attributes.Contains("json")) AddAssemplyByKey("json");
+             if (_pocoSetting.Attributes.Contains("json3")) AddAssemplyByKey("json3"); //netcore 3
             if (_pocoSetting.Attributes.Contains("dm")) AddAssemplyByKey("DataMember");
             if (_pocoSetting.Attributes.Contains("proto")) AddAssemplyByKey("proto");
             AddAssempliesOfDataType();//add assemplies of datatype

OData2PocoLib/CustAttributes/NamedAtributes/Json3Attribute.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using OData2Poco.Extensions;
+
+namespace OData2Poco.CustAttributes.NamedAtributes
+{
+  public  class Json3Attribute : INamedAttribute
+    {
+        public string Name { get;  } = "json3";
+        public List<string> GetAttributes(PropertyTemplate property) => 
+           string.IsNullOrEmpty(property.OriginalName) || property.OriginalName == property.PropName
+        ? new List<string> { $"[JsonPropertyName({property.PropName.Quote()})]" }
+        : new List<string>();
+
+        public List<string> GetAttributes(ClassTemplate property) => new List<string>();
+    }
+}

ReleaseNotes.md

@@ -3,10 +3,12 @@
 # OData2Poco.CommandLine 
 
 ##   (Console: o2pgen / .Net Core: dotnet-o2pgen) 
-##  Version 3.4  
-**Release Date:**  Oct 2, 2020 
 
-**What is new in 3.4:**
+##  Version 3.4.1
+**Release Date:**  Oct 3, 2020 
+
+**What is new in 3.4.1:**
+- Support JSON in .NET Core 3, PR [#32](https://github.com/moh-hassan/odata2poco/pull/31) fix issue #30
 - Update namespace of OData EDM types by @LarsBauer, PR [#31](https://github.com/moh-hassan/odata2poco/pull/31) that fix issue [#30](https://github.com/moh-hassan/odata2poco/issues/30).
 - Support nullable reference types in C# 8 in OData2Poco project library.
 - Add support to symbolic package snupkg and SourceLink.