fixes #1962

ErikEJ · Oct 14, 2023 · 8bbce2c · 8bbce2c
1 parent 20bbb5d
commit 8bbce2c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 9 deletions.
diff --git a/samples/efcpt-config.json b/samples/efcpt-config.json
@@ -52,7 +52,9 @@
      "remove-defaultsql-from-bool-properties": false,
      "soft-delete-obsolete-files": false,
      "discover-multiple-stored-procedure-resultsets-preview": false,
-     "use-alternate-stored-procedure-resultset-discovery": false
+     "use-alternate-stored-procedure-resultset-discovery": false,
+     "t4-template-path": null,
+     "use-no-navigations-preview": false
   },
   "names":
   {

diff --git a/samples/efcpt-schema.json b/samples/efcpt-schema.json
@@ -244,7 +244,6 @@
                 "use-t4",
                 "remove-defaultsql-from-bool-properties",
                 "soft-delete-obsolete-files",
-                "discover-multiple-stored-procedure-resultsets-preview",
                 "use-alternate-stored-procedure-resultset-discovery"
             ],
             "properties": {
@@ -357,6 +356,14 @@
                     "examples": [
                         false
                     ]
+                },
+                "use-no-navigations-preview": {
+                    "type": "boolean",
+                    "default": false,
+                    "title": "Remove all navigation properties from the generated code (preview)",
+                    "examples": [
+                        false
+                    ]
                 }
             },
             "examples": [{
@@ -372,7 +379,8 @@
                 "remove-defaultsql-from-bool-properties": false,
                 "soft-delete-obsolete-files": false,
                 "discover-multiple-stored-procedure-resultsets-preview": false,
-                "use-alternate-stored-procedure-resultset-discovery": false
+                "use-alternate-stored-procedure-resultset-discovery": false,
+                "use-no-navigations-preview": false
             }]
         },
         "names": {

diff --git a/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs b/src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs
@@ -71,6 +71,7 @@ public static ReverseEngineerCommandOptions ToOptions(this CliConfig config, str
                 UseHierarchyId = typeMappings.UseHierarchyId,
                 UseNodaTime = typeMappings.UseNodaTime,
                 UseBoolPropertiesWithoutDefaultSql = config.CodeGeneration.RemoveDefaultSqlFromBoolProperties,
+                UseNoNavigations = config.CodeGeneration.UseNoNavigationsPreview,
                 RunCleanup = config.CodeGeneration.SoftDeleteObsoleteFiles,
                 UseManyToManyEntity = config.CodeGeneration.UseManyToManyEntity,
                 UseMultipleSprocResultSets = config.CodeGeneration.DiscoverMultipleStoredProcedureResultsetsPreview,

diff --git a/src/GUI/RevEng.Shared/Cli/Configuration/CodeGeneration.cs b/src/GUI/RevEng.Shared/Cli/Configuration/CodeGeneration.cs
@@ -40,10 +40,15 @@ public class CodeGeneration
         [JsonPropertyName("soft-delete-obsolete-files")]
         public bool SoftDeleteObsoleteFiles { get; set; }
 
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
         [JsonPropertyName("discover-multiple-stored-procedure-resultsets-preview")]
         public bool DiscoverMultipleStoredProcedureResultsetsPreview { get; set; }
 
         [JsonPropertyName("use-alternate-stored-procedure-resultset-discovery")]
         public bool UseAlternateStoredProcedureResultsetDiscovery { get; set; }
+
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+        [JsonPropertyName("use-no-navigations-preview")]
+        public bool UseNoNavigationsPreview { get; set; }
     }
 }
diff --git a/src/GUI/efcpt.6/efcpt.6.csproj b/src/GUI/efcpt.6/efcpt.6.csproj
@@ -8,8 +8,8 @@
     <Description>Entity Framework Core Power Tools command line tool </Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
-    <PackageVersion>6.0.0-rc.11</PackageVersion>
-    <InformationalVersion>6.0.0-rc.11</InformationalVersion>
+    <PackageVersion>6.0.0-rc.12</PackageVersion>
+    <InformationalVersion>6.0.0-rc.12</InformationalVersion>
     <Version>6.0.0</Version>
     <RepositoryUrl>https://github.com/ErikEJ/EFCorePowerTools</RepositoryUrl>
     <PackageProjectUrl>https://github.com/ErikEJ/EFCorePowerTools</PackageProjectUrl>

diff --git a/src/GUI/efcpt.8/efcpt.8.csproj b/src/GUI/efcpt.8/efcpt.8.csproj
@@ -8,8 +8,8 @@
     <Description>Entity Framework Core Power Tools command line tool </Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
-    <PackageVersion>8.0.0-rc.11</PackageVersion>
-    <InformationalVersion>8.0.0-rc.11</InformationalVersion>
+    <PackageVersion>8.0.0-rc.12</PackageVersion>
+    <InformationalVersion>8.0.0-rc.12</InformationalVersion>
     <Version>8.0.0</Version>
     <RepositoryUrl>https://github.com/ErikEJ/EFCorePowerTools</RepositoryUrl>
     <PackageProjectUrl>https://github.com/ErikEJ/EFCorePowerTools</PackageProjectUrl>

diff --git a/src/GUI/efcpt/efcpt.csproj b/src/GUI/efcpt/efcpt.csproj
@@ -8,8 +8,8 @@
     <Description>Entity Framework Core Power Tools command line tool</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
-    <PackageVersion>7.0.0-rc.11</PackageVersion>
-    <InformationalVersion>7.0.0-rc.11</InformationalVersion>
+    <PackageVersion>7.0.0-rc.12</PackageVersion>
+    <InformationalVersion>7.0.0-rc.12</InformationalVersion>
     <Version>7.0.0</Version>
     <RepositoryUrl>https://github.com/ErikEJ/EFCorePowerTools</RepositoryUrl>
     <PackageProjectUrl>https://github.com/ErikEJ/EFCorePowerTools</PackageProjectUrl>