Fix compilation VS2019, undo bogus null-check-removal in XGraphcs

Author: OfficeDevUnofficial

PdfSharpCore/Drawing/XGraphics.cs

@@ -123,6 +123,9 @@ public sealed class XGraphics : IDisposable
         }
         XGraphics(XSize size, XGraphicsUnit pageUnit, XPageDirection pageDirection)
         {
+            if (size == null)
+                throw new ArgumentNullException("size");
+
             _gsStack = new GraphicsStateStack(this);
             _pageSizePoints = new XSize(size.Width, size.Height);
             switch (pageUnit)

PdfSharpCore/Pdf.AcroForms/PdfAcroField.cs

@@ -300,6 +300,11 @@ public sealed class PdfAcroFieldCollection : PdfArray
                 : base(array)
             { }
 
+            PdfAcroFieldCollection(PdfDocument document)
+              : base(document)
+            { }
+
+
             /// <summary>
             /// Gets the names of all fields in the collection.
             /// </summary>
@@ -553,6 +558,30 @@ public class Keys : KeysBase
             [KeyInfo(KeyType.Integer | KeyType.Optional)]
             public const string Q = "/Q";
 
+            /// <summary>
+            /// (Optional) The type of PDF object that this dictionary describes; if present,
+            /// must be Sig for a signature dictionary.
+            /// </summary>
+            [KeyInfo(KeyType.Name | KeyType.Optional)]
+            public const string Type = "/Type";
+
+            /// <summary>
+            /// 
+            /// </summary>
+            [KeyInfo(KeyType.Name | KeyType.Required)]
+            public const string Subtype = "/Subtype";
+
+
+            /// <summary>
+            /// 
+            /// </summary>
+            [KeyInfo(KeyType.Rectangle | KeyType.Required)]
+            public const string Rect = "/Rect";
+
+
+            [KeyInfo(KeyType.Rectangle | KeyType.Required)]
+            public const string P = "/P";
+
             // ReSharper restore InconsistentNaming
         }
     }

SampleApp/Program.cs

@@ -1,36 +1,58 @@
-using PdfSharpCore.Drawing;
-using PdfSharpCore.Pdf;
-
-string GetOutFilePath(string name)
+
+namespace SampleApp 
 {
-    var OutputDirName = @".";
-    return Path.Combine(OutputDirName, name);
-}
 
-void SaveDocument(PdfDocument document, string name)
-{
-    var outFilePath = GetOutFilePath(name);
-    var dir = Path.GetDirectoryName(outFilePath);
-    if (dir is not null && !Directory.Exists(dir))
+
+    public class Program
     {
-        Directory.CreateDirectory(dir);
-    }
+        
+
+        private static string GetOutFilePath(string name)
+        {
+            string OutputDirName = @".";
+            return System.IO.Path.Combine(OutputDirName, name);
+        }
+
+
+        private static void SaveDocument(PdfSharpCore.Pdf.PdfDocument document, string name)
+        {
+            string outFilePath = GetOutFilePath(name);
+            string? dir = System.IO.Path.GetDirectoryName(outFilePath);
+            if (dir != null && !System.IO.Directory.Exists(dir))
+            {
+                System.IO.Directory.CreateDirectory(dir);
+            }
+
+            document.Save(outFilePath);
+        }
+
+
+        public static void Main(string[] args)
+        {
+            System.Console.WriteLine("Starting...");
+
+            const string outName = "test1.pdf";
+
+            PdfSharpCore.Pdf.PdfDocument? document = new PdfSharpCore.Pdf.PdfDocument();
 
-    document.Save(outFilePath);
-}
+            PdfSharpCore.Pdf.PdfPage? pageNewRenderer = document.AddPage();
 
-Console.WriteLine("Starting...");
+            PdfSharpCore.Drawing.XGraphics? renderer = PdfSharpCore.Drawing.XGraphics.FromPdfPage(pageNewRenderer);
 
-const string outName = "test1.pdf";
+            renderer.DrawString(
+                  "Testy Test Test"
+                , new PdfSharpCore.Drawing.XFont("Arial", 12)
+                , PdfSharpCore.Drawing.XBrushes.Black
+                , new PdfSharpCore.Drawing.XPoint(12, 12)
+            );
 
-var document = new PdfDocument();
+            SaveDocument(document, outName);
 
-var pageNewRenderer = document.AddPage();
+            System.Console.WriteLine("Done!");
+        } // End Sub Main 
 
-var renderer = XGraphics.FromPdfPage(pageNewRenderer);
 
-renderer.DrawString("Testy Test Test", new XFont("Arial", 12), XBrushes.Black, new XPoint(12, 12));
+    } // End Class Program 
 
-SaveDocument(document, outName);
 
-Console.WriteLine("Done!");
+} // End Namespace SampleApp 

SampleApp/SampleApp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
 	<IsTrimmable>true</IsTrimmable>
 	<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-	<LangVersion>10</LangVersion>
+	<ImplicitUsings>disable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>