Merge pull request #226 from jafin/refactor/conditionals

Drop stale conditionals (WPF, GPI, CORE, true, NETCOREAPP1_1; PORTABLE)

Author: ststeiger

.github/workflows/build.yml

@@ -9,6 +9,7 @@ jobs:
     strategy:
       matrix:
         options:
+          - framework: net6.0
           - framework: net5.0
           - framework: netcoreapp3.1
     steps:

MigraDocCore.DocumentObjectModel/MigraDoc/MigraDoc.DocumentObjectModel/Color.backup.cs

@@ -269,23 +269,6 @@ public bool Subscript
         //    .Animation = wdAnimationNone
         #endregion
 
-#if !PORTABLE
-        /// <summary>
-        /// Gets a value indicating whether the specified font exists.
-        /// </summary>
-        public static bool Exists(string fontName)
-        {
-            System.Drawing.FontFamily[] families = System.Drawing.FontFamily.Families;
-            foreach (System.Drawing.FontFamily family in families)
-            {
-                if (String.Compare(family.Name, fontName, true) == 0)
-                    return true;
-            }
-            return false;
-        }
-#endif
-
-
         #region Internal
         /// <summary>
         /// Get a bitmask of all non-null properties.
@@ -394,7 +377,6 @@ internal void Serialize(Serializer serializer, Font font)
             {
                 int pos = serializer.BeginContent("Font");
 
-#if true
                 // Don't write null values if font is null.
                 // Do write null values if font is not null!
                 if ((!name.IsNull && Name != String.Empty && font == null) ||
@@ -425,31 +407,7 @@ internal void Serialize(Serializer serializer, Font font)
 
                 if (!color.IsNull && (font == null || this.Color.Argb != font.Color.Argb))// && this.Color.RGB != Color.Transparent.RGB)
                     serializer.WriteSimpleAttribute("Color", this.Color);
-#else
-        if ((!this.name.IsNull && this.Name != String.Empty) && (font == null || this.Name != font.Name))
-          serializer.WriteSimpleAttribute("Name", this.Name);
-
-        if (!this.size.IsNull && (font == null || this.Size != font.Size))
-          serializer.WriteSimpleAttribute("Size", this.Size);
-        //NBool and NEnum have to be compared directly to check whether the value Null is
-        if (!this.bold.IsNull && (font == null || this.Bold != font.Bold))
-          serializer.WriteSimpleAttribute("Bold", this.Bold);
-
-        if (!this.italic.IsNull && (font == null || this.Italic != font.Italic))
-          serializer.WriteSimpleAttribute("Italic", this.Italic);
-
-        if (!this.underline.IsNull && (font == null || this.Underline != font.Underline))
-          serializer.WriteSimpleAttribute("Underline", this.Underline);
 
-        if (!this.superscript.IsNull && (font == null || this.Superscript != font.Superscript))
-          serializer.WriteSimpleAttribute("Superscript", this.Superscript);
-
-        if (!this.subscript.IsNull && (font == null || this.Subscript != font.Subscript))
-          serializer.WriteSimpleAttribute("Subscript", this.Subscript);
-
-        if (!this.color.IsNull && (font == null || this.Color.Argb != font.Color.Argb))// && this.Color.RGB != Color.Transparent.RGB)
-          serializer.WriteSimpleAttribute("Color", this.Color);
-#endif
                 serializer.EndContent(pos);
             }
         }