v2.0.5.7

- Added ability to select tabs or spaces for indentation in generated code (Tools/Options/Entity Framework Visual Editor/Visual Editor Options) (See #221) - Fixed an issue with changing visual grid size on design surface.
msawczyn · Oct 7, 2020 · 45ccb18 · 45ccb18
1 parent c310a3b
commit 45ccb18
Show file tree

Hide file tree

Showing 54 changed files with 3,215 additions and 929 deletions.
diff --git a/README.md b/README.md
@@ -53,10 +53,18 @@ to <a href="https://www.jetbrains.com/?from=EFDesigner"><img src="https://msawcz
 
 ### Change Log
 
-**2.0.5.6**
+**2.0.5.7**
+   - Added ability to select tabs or spaces for indentation in generated code (Tools/Options/Entity Framework Visual Editor/Visual Editor Options) (See https://github.com/msawczyn/EFDesigner/issues/221)
+   - Fixed an issue with changing visual grid size on design surface.
+
+<details>
+<summary><b>2.0.5.6</b></summary>
+
    - The project item templates for the model file had wandered away. They're back again. (See https://github.com/msawczyn/EFDesigner/issues/216)
    - Fixed a problem with existing models where class-level "AutoProperty: false" caused bad code generation. (See https://github.com/msawczyn/EFDesigner/issues/215)
 
+</details>
+
 <details>
 <summary><b>2.0.5.5</b></summary>
 

diff --git a/VSMarketplace blurb.md b/VSMarketplace blurb.md
@@ -30,6 +30,10 @@ For comprehensive documentation, please visit [the project's documentation site]
 
 **ChangeLog**
 
+**2.0.5.7**
+   - **[NEW]** Added ability to select tabs or spaces for indentation in generated code (Tools/Options/Entity Framework Visual Editor/Visual Editor Options) (See https://github.com/msawczyn/EFDesigner/issues/221)
+   - Fixed an issue with changing visual grid size on design surface.
+
 **2.0.5.6**
    - The project item templates for the model file had wandered away. They're back again. (See https://github.com/msawczyn/EFDesigner/issues/216)
    - Fixed a problem with existing models where class-level "AutoProperty: false" caused bad code generation. (See https://github.com/msawczyn/EFDesigner/issues/215)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+2.0.5.7
+   - Added ability to select tabs or spaces for indentation in generated code (Tools/Options/Entity Framework Visual Editor/Visual Editor Options) (See https://github.com/msawczyn/EFDesigner/issues/221)
+   - Fixed an issue with changing visual grid size on design surface.
+
 2.0.5.6
    - The project item templates for the model file had wandered away. They're back again. (See https://github.com/msawczyn/EFDesigner/issues/216)
    - Fixed a problem with existing models where class-level "AutoProperty: false" caused bad code generation. (See https://github.com/msawczyn/EFDesigner/issues/215)

diff --git a/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix b/dist/Sawczyn.EFDesigner.EFModel.DslPackage.vsix
diff --git a/src/Dsl/CustomCode/Partials/EFModelDiagram.cs b/src/Dsl/CustomCode/Partials/EFModelDiagram.cs
@@ -29,8 +29,6 @@ public override void OnInitialize()
          ShowGrid = modelRoot?.ShowGrid ?? true;
          GridColor = modelRoot?.GridColor ?? Color.Gainsboro;
          SnapToGrid = modelRoot?.SnapToGrid ?? true;
-         GridSize = modelRoot?.GridSize ?? 0.125;
-
       }
 
       /// <summary>

diff --git a/src/Dsl/CustomCode/Partials/ModelRoot.cs b/src/Dsl/CustomCode/Partials/ModelRoot.cs
@@ -27,6 +27,8 @@ public partial class ModelRoot: IHasStore
 
       public static Func<bool> WriteDiagramAsBinary = () => false;
 
+      public static Func<bool> UseTabs = () => false;
+
       static ModelRoot()
       {
          try
@@ -42,7 +44,7 @@ static ModelRoot()
       // ReSharper disable once UnusedMember.Global
       public string FullName => string.IsNullOrWhiteSpace(Namespace) ? $"global::{EntityContainerName}" : $"global::{Namespace}.{EntityContainerName}";
 
-      public bool IsEFCore5Plus => EntityFrameworkVersion == EFVersion.EFCore && GetEntityFrameworkPackageVersionNum() >= 5;
+      public bool IsEFCore5Plus => EntityFrameworkVersion == EFVersion.EFCore && (EntityFrameworkPackageVersion == "Latest" || GetEntityFrameworkPackageVersionNum() >= 5);
 
       [Obsolete("Use ModelRoot.Classes instead")]
       public LinkedElementCollection<ModelClass> Types => Classes;
@@ -57,6 +59,22 @@ public EFModelDiagram[] GetDiagrams()
                .ToArray();
       }
 
+      #region Filename
+
+      private string filename;
+
+      public void SetFileName(string fileName)
+      {
+         filename = fileName;
+      }
+
+      public string GetFileName()
+      {
+         return filename;
+      }
+
+      #endregion 
+
       #region OutputLocations
 
       private OutputLocations outputLocationsStorage;
@@ -271,8 +289,9 @@ public NuGetDisplay NuGetPackageVersion
       {
          get
          {
-            return NuGetHelper.NuGetPackageDisplay.FirstOrDefault(x => x.EFVersion == EntityFrameworkVersion &&
-                                                                           x.DisplayVersion == EntityFrameworkPackageVersion);
+            return NuGetHelper.NuGetPackageDisplay
+                              .FirstOrDefault(x => x.EFVersion == EntityFrameworkVersion 
+                                                && x.DisplayVersion == EntityFrameworkPackageVersion);
          }
       }
 
@@ -479,17 +498,5 @@ protected override void OnValueChanged(ModelRoot element, string oldValue, strin
       }
 
       #endregion Namespace tracking property
-
-      private string filename;
-
-      public void SetFileName(string fileName)
-      {
-         filename = fileName;
-      }
-
-      public string GetFileName()
-      {
-         return filename;
-      }
    }
 }
diff --git a/src/Dsl/CustomCode/Rules/ModelAttributeChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelAttributeChangeRules.cs
@@ -35,7 +35,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          if (Equals(e.NewValue, e.OldValue))
             return;
 
-         List<string> errorMessages = EFCoreValidator.GetErrors(element).ToList();
+         List<string> errorMessages = new List<string>();
 
          switch (e.DomainProperty.Name)
          {

diff --git a/src/Dsl/CustomCode/Rules/ModelClassChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelClassChangeRules.cs
@@ -28,7 +28,7 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
          if (Equals(e.NewValue, e.OldValue))
             return;
 
-         List<string> errorMessages = EFCoreValidator.GetErrors(element).ToList();
+         List<string> errorMessages = new List<string>();
 
          switch (e.DomainProperty.Name)
          {

diff --git a/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs b/src/Dsl/CustomCode/Rules/ModelRootChangeRules.cs
@@ -1,4 +1,5 @@
-using System.CodeDom.Compiler;
+using System;
+using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -125,14 +126,6 @@ public override void ElementPropertyChanged(ElementPropertyChangedEventArgs e)
 
                break;
 
-            case "GridSize":
-               foreach (EFModelDiagram diagram in element.GetDiagrams())
-                  diagram.GridSize = (double)e.NewValue/10.0;
-
-               redraw = true;
-
-               break;
-
             case "InheritanceStrategy":
 
                if ((element.EntityFrameworkVersion == EFVersion.EFCore) && (element.NuGetPackageVersion.MajorMinorVersionNum < 2.1))

diff --git a/src/Dsl/CustomCode/Type Descriptors/AssociationTypeDescriptor.cs b/src/Dsl/CustomCode/Type Descriptors/AssociationTypeDescriptor.cs
@@ -25,8 +25,6 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
          {
             storeDomainDataDirectory = association.Store.DomainDataDirectory;
 
-            EFCoreValidator.AdjustEFCoreProperties(propertyDescriptors, association);
-
             // show FKPropertyName only when possible and required
             if (!association.Source.ModelRoot.ExposeForeignKeys
              || (association.SourceRole != EndpointRole.Dependent && association.TargetRole != EndpointRole.Dependent))

diff --git a/src/Dsl/CustomCode/Type Descriptors/ModelClassTypeDescriptor.cs b/src/Dsl/CustomCode/Type Descriptors/ModelClassTypeDescriptor.cs
@@ -22,12 +22,8 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
 
          if (ModelElement is ModelClass modelClass)
          {
-            EFCoreValidator.AdjustEFCoreProperties(propertyDescriptors, modelClass);
-
             storeDomainDataDirectory = modelClass.Store.DomainDataDirectory;
 
-
-
             //Add the descriptors for the tracking properties 
 
             propertyDescriptors.Add(new TrackingPropertyDescriptor(modelClass

diff --git a/src/Dsl/CustomCode/Type Descriptors/ModelEnumTypeDescriptor.cs b/src/Dsl/CustomCode/Type Descriptors/ModelEnumTypeDescriptor.cs
@@ -23,8 +23,6 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
          {
             storeDomainDataDirectory = modelEnum.Store.DomainDataDirectory;
 
-            EFCoreValidator.AdjustEFCoreProperties(propertyDescriptors, modelEnum);
-
             //Add the descriptors for the tracking properties 
 
             propertyDescriptors.Add(new TrackingPropertyDescriptor(modelEnum

diff --git a/src/Dsl/CustomCode/Type Descriptors/ModelRootTypeDescriptor.cs b/src/Dsl/CustomCode/Type Descriptors/ModelRootTypeDescriptor.cs
@@ -17,6 +17,11 @@ private PropertyDescriptorCollection GetCustomProperties(Attribute[] attributes)
          {
             EFCoreValidator.AdjustEFCoreProperties(propertyDescriptors, modelRoot);
 
+            if (!modelRoot.ShowGrid)
+            {
+               propertyDescriptors.Remove("GridColor");
+            }
+
             //Add in extra custom properties here...
          }