Fix #49: POCO to DTO can include derived properties values

.editorconfig

@@ -0,0 +1,9 @@
+[*.cs]
+# Disable S3776: Cognitive Complexity Warning
+dotnet_diagnostic.S3776.severity = none
+
+[**/AutoGen*/*.cs]
+# Disable CS1570/CS1584/CS1658 for all codegen
+dotnet_diagnostic.CS1570.severity = none
+dotnet_diagnostic.CS1584.severity = none
+dotnet_diagnostic.CS1658.severity = none

.github/workflows/CodeQuality.yml

@@ -4,7 +4,11 @@ on:
   push:
   pull_request:
     types: [opened, synchronize, reopened]
-
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build
@@ -26,22 +30,25 @@ jobs:
 
       - name: Restore dependencies
         run: dotnet restore SysML2.NET.sln
-        
+
       - name: Sonarqube Begin
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_SCANNER_OPTS: "-Xmx4096m"
         run: |
           dotnet tool install --global dotnet-sonarscanner
-          dotnet sonarscanner begin /k:"STARIONGROUP_SysML2.NET" /o:"stariongroup" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="./CoverageResults/coverage.opencover.xml"
+          dotnet tool install --global dotnet-coverage
+          dotnet sonarscanner begin /k:"STARIONGROUP_SysML2.NET" /o:"stariongroup" /d:sonar.token="$SONAR_TOKEN" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
 
       - name: Build
-        run: dotnet build --no-restore /p:ContinuousIntegrationBuild=true
+        run: dotnet build --no-restore --no-incremental /p:ContinuousIntegrationBuild=true
 
       - name: Run Tests and Compute Coverage
-        run: dotnet test SysML2.NET.sln --filter Category!="Expected" --no-restore --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutput="../CoverageResults/" /p:MergeWith="../CoverageResults/coverage.json" /p:CoverletOutputFormat=\"opencover,json\"
+        run: dotnet-coverage collect "dotnet test SysML2.NET.sln --no-restore --no-build --verbosity normal" -f xml -o "coverage.xml" 
 
       - name: Sonarqube end
-        run: dotnet sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: dotnet sonarscanner end /d:sonar.token="$SONAR_TOKEN"

SySML2.NET.REST.Tests/RestClientTestFixture.cs

@@ -32,6 +32,7 @@ namespace SySML2.NET.REST.Tests
     /// <summary>
     /// Suite of tests for the <see cref="RestClient"/> class
     /// </summary>
+    [TestFixture]
     public class RestClientTestFixture
     {
         private string baseUri;

SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDeSerializer/AnnotatingElementDeSerializer.cs

@@ -129,7 +129,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the aliasIds Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the aliasIds Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("annotatedElement"u8, out var annotatedElementProperty))
@@ -149,7 +149,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the annotatedElement Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the annotatedElement Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("annotation"u8, out var annotationProperty))
@@ -169,7 +169,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the annotation Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the annotation Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("declaredName"u8, out var declaredNameProperty))
@@ -178,7 +178,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the declaredName Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the declaredName Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("declaredShortName"u8, out var declaredShortNameProperty))
@@ -187,7 +187,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the declaredShortName Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the declaredShortName Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("documentation"u8, out var documentationProperty))
@@ -207,7 +207,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the documentation Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the documentation Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("elementId"u8, out var elementIdProperty))
@@ -221,7 +221,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the elementId Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the elementId Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("isImpliedIncluded"u8, out var isImpliedIncludedProperty))
@@ -233,7 +233,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the isImpliedIncluded Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the isImpliedIncluded Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("isLibraryElement"u8, out var isLibraryElementProperty))
@@ -245,7 +245,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the isLibraryElement Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the isLibraryElement Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("name"u8, out var nameProperty))
@@ -254,7 +254,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the name Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the name Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("ownedAnnotatingRelationship"u8, out var ownedAnnotatingRelationshipProperty))
@@ -274,7 +274,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the ownedAnnotatingRelationship Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the ownedAnnotatingRelationship Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("ownedAnnotation"u8, out var ownedAnnotationProperty))
@@ -294,7 +294,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the ownedAnnotation Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the ownedAnnotation Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("ownedElement"u8, out var ownedElementProperty))
@@ -314,7 +314,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the ownedElement Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the ownedElement Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("ownedRelationship"u8, out var ownedRelationshipProperty))
@@ -334,7 +334,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the ownedRelationship Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the ownedRelationship Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("owner"u8, out var ownerProperty))
@@ -358,7 +358,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the owner Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the owner Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("owningAnnotatingRelationship"u8, out var owningAnnotatingRelationshipProperty))
@@ -382,7 +382,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the owningAnnotatingRelationship Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the owningAnnotatingRelationship Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("owningMembership"u8, out var owningMembershipProperty))
@@ -406,7 +406,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the owningMembership Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the owningMembership Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("owningNamespace"u8, out var owningNamespaceProperty))
@@ -430,7 +430,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the owningNamespace Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the owningNamespace Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("owningRelationship"u8, out var owningRelationshipProperty))
@@ -454,7 +454,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the owningRelationship Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the owningRelationship Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("qualifiedName"u8, out var qualifiedNameProperty))
@@ -463,7 +463,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the qualifiedName Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the qualifiedName Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("shortName"u8, out var shortNameProperty))
@@ -472,7 +472,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the shortName Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the shortName Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("textualRepresentation"u8, out var textualRepresentationProperty))
@@ -492,7 +492,7 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the textualRepresentation Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the textualRepresentation Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
         }
@@ -526,7 +526,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the aliasIds Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the aliasIds Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("declaredName"u8, out var declaredNameProperty))
@@ -535,7 +535,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the declaredName Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the declaredName Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("declaredShortName"u8, out var declaredShortNameProperty))
@@ -544,7 +544,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the declaredShortName Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the declaredShortName Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("elementId"u8, out var elementIdProperty))
@@ -558,7 +558,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the elementId Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the elementId Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("isImpliedIncluded"u8, out var isImpliedIncludedProperty))
@@ -570,7 +570,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the isImpliedIncluded Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the isImpliedIncluded Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("ownedRelationship"u8, out var ownedRelationshipProperty))
@@ -590,7 +590,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the ownedRelationship Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the ownedRelationship Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
             if (jsonElement.TryGetProperty("owningRelationship"u8, out var owningRelationshipProperty))
@@ -614,7 +614,7 @@ private static void DeserializeDtoExcludingDerivedProperties(SysML2.NET.Core.DTO
             }
             else
             {
-                logger.LogDebug("the owningRelationship Json property was not found in the AnnotatingElement: { Id }", dtoInstance.Id);
+                logger.LogDebug("the owningRelationship Json property was not found in the AnnotatingElement: {Id}", dtoInstance.Id);
             }
 
         }