Merge pull request #57 from synercoder/features/implicit-usings

Added implicit usings, removed netstandard2.1, upgraded imagesharp

Author: synercoder

Directory.Build.props

@@ -45,12 +45,7 @@
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Features>strict</Features>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net5.0'))">
-    <DefineConstants>$(DefineConstants);SUPPORTS_MEMBERNOTNULL</DefineConstants>
-    <DefineConstants>$(DefineConstants);SUPPORTS_INIT</DefineConstants>
-    <DefineConstants>$(DefineConstants);SUPPORTS_TYPED_ENUM_ISDEFINED</DefineConstants>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 </Project>

Directory.Build.targets

@@ -7,8 +7,22 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="SixLabors.ImageSharp" Version="2.1.*" />
-    <PackageReference Update="Synercoding.Primitives" Version="1.0.0-rc09" />
+    <PackageReference Update="SixLabors.ImageSharp" Version="3.0.*" />
+  </ItemGroup>
+
+  <!-- Disable auto imports/usings from ImageSharp -->
+  <ItemGroup>
+    <Using Remove="SixLabors.ImageSharp" />
+    <Using Remove="SixLabors.ImageSharp.PixelFormats" />
+    <Using Remove="SixLabors.ImageSharp.Processing" />
+  </ItemGroup>
+  
+  <!-- For ease of use -->
+  <ItemGroup>
+    <PackageReference Include="Synercoding.Primitives" Version="1.0.0-rc09" />
+    <Using Static="true" Include="Synercoding.Primitives.ValueCreator" />
+    <Using Include="Synercoding.Primitives" />
+    <Using Include="Synercoding.Primitives.Extensions" />
   </ItemGroup>
 
 </Project>

samples/Synercoding.FileFormats.Pdf.ConsoleTester/Program.cs

@@ -2,11 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
-using System.IO;
-using static Synercoding.Primitives.ValueCreator;
 
 namespace Synercoding.FileFormats.Pdf.ConsoleTester;
 

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
     <SynercodingProjectCategory>src</SynercodingProjectCategory>
   </PropertyGroup>

src/Synercoding.FileFormats.Pdf/DocumentInformation.cs

@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
-using System;
-using System.Collections.Generic;
 
 namespace Synercoding.FileFormats.Pdf;
 

src/Synercoding.FileFormats.Pdf/Extensions/IContentContextExtensions.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Threading.Tasks;
-
 namespace Synercoding.FileFormats.Pdf.Extensions;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/Extensions/IPageContentContextExtensions.cs

@@ -1,11 +1,6 @@
 using Synercoding.FileFormats.Pdf.Internals;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Extensions;
 

src/Synercoding.FileFormats.Pdf/Extensions/IShapeContextExtensions.cs

@@ -1,6 +1,3 @@
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-
 namespace Synercoding.FileFormats.Pdf.Extensions;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/Extensions/PrimitiveExtensions.cs

@@ -1,5 +1,3 @@
-using Synercoding.Primitives;
-
 namespace Synercoding.FileFormats.Pdf.Extensions;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/GraphicState.cs

@@ -1,7 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf;
 

src/Synercoding.FileFormats.Pdf/IContentContext.cs

@@ -1,8 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf;
 

src/Synercoding.FileFormats.Pdf/IPageContentContext.cs

@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf;
 

src/Synercoding.FileFormats.Pdf/Image.cs

@@ -1,8 +1,6 @@
 using SixLabors.ImageSharp;
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
-using System.IO;
 
 namespace Synercoding.FileFormats.Pdf;
 
@@ -21,7 +19,7 @@ internal Image(PdfReference id, SixLabors.ImageSharp.Image image)
         image.SaveAsJpeg(ms, new SixLabors.ImageSharp.Formats.Jpeg.JpegEncoder()
         {
             Quality = 100,
-            ColorType = SixLabors.ImageSharp.Formats.Jpeg.JpegColorType.YCbCrRatio444
+            ColorType = SixLabors.ImageSharp.Formats.Jpeg.JpegEncodingColor.YCbCrRatio444
         });
         Width = image.Width;
         Height = image.Height;

src/Synercoding.FileFormats.Pdf/Internals/ByteSizes.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Globalization;
 
 namespace Synercoding.FileFormats.Pdf.Internals;

src/Synercoding.FileFormats.Pdf/Internals/Map.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

src/Synercoding.FileFormats.Pdf/Internals/PageContentContext.cs

@@ -1,8 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

src/Synercoding.FileFormats.Pdf/Internals/ShapesContentContext.cs

@@ -1,8 +1,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

src/Synercoding.FileFormats.Pdf/Internals/SpanHelper.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.Internals;
 
 internal static class SpanHelper

src/Synercoding.FileFormats.Pdf/Internals/StringHelper.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Text;
 
 namespace Synercoding.FileFormats.Pdf.Internals;

src/Synercoding.FileFormats.Pdf/Internals/TextContentContext.cs

@@ -2,8 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors;
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using System;
-using System.Threading.Tasks;
 
 namespace Synercoding.FileFormats.Pdf.Internals;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/CmykColor.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/Color.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/ColorSpace.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceCMYK.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceGray.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/DeviceRGB.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/ColorSpaces/Separation.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/GrayColor.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/RgbColor.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Colors/SpotColor.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Colors;
 

src/Synercoding.FileFormats.Pdf/LowLevel/ContentStream.cs

@@ -4,11 +4,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 using Synercoding.FileFormats.Pdf.LowLevel.Internal;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
-using System.IO;
-using System.Linq;
 using Color = Synercoding.FileFormats.Pdf.LowLevel.Colors.Color;
 using Point = Synercoding.Primitives.Point;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Extensions/PdfStreamExtensions.cs

@@ -1,7 +1,3 @@
-using Synercoding.Primitives;
-using System;
-using System.IO;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Extensions;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Extensions/StreamFilterExtensions.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Extensions;
 
 internal static class StreamFilterExtensions

src/Synercoding.FileFormats.Pdf/LowLevel/Graphics/Dash.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Graphics;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Internal/PageResources.cs

@@ -2,9 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Colors.ColorSpaces;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
 using Synercoding.FileFormats.Pdf.LowLevel.XRef;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.Internal;
 

src/Synercoding.FileFormats.Pdf/LowLevel/Internal/PageTree.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Internal;
 
 internal class PageTree

src/Synercoding.FileFormats.Pdf/LowLevel/ObjectStream.cs

@@ -3,9 +3,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Internal;
 using Synercoding.FileFormats.Pdf.LowLevel.Text;
 using Synercoding.FileFormats.Pdf.LowLevel.XRef;
-using System;
-using System.IO;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;
 

src/Synercoding.FileFormats.Pdf/LowLevel/PdfDictionary.cs

@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Extensions;
-using Synercoding.Primitives;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;
 

src/Synercoding.FileFormats.Pdf/LowLevel/PdfName.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;

src/Synercoding.FileFormats.Pdf/LowLevel/PdfStream.cs

@@ -1,7 +1,5 @@
 using Synercoding.FileFormats.Pdf.Internals;
-using System;
 using System.Globalization;
-using System.IO;
 using System.Text;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel;

src/Synercoding.FileFormats.Pdf/LowLevel/Text/Font.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Text;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/Text/Type1StandardFont.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.Text;
 
 /// <summary>

src/Synercoding.FileFormats.Pdf/LowLevel/XRef/Entry.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.XRef;
 
 internal readonly struct Entry

src/Synercoding.FileFormats.Pdf/LowLevel/XRef/Section.cs

@@ -1,5 +1,4 @@
 using Synercoding.FileFormats.Pdf.Internals;
-using System;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.XRef;
 

src/Synercoding.FileFormats.Pdf/LowLevel/XRef/Table.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Synercoding.FileFormats.Pdf.LowLevel.XRef;
 
 internal class Table

src/Synercoding.FileFormats.Pdf/LowLevel/XRef/TableBuilder.cs

@@ -1,6 +1,4 @@
 using Synercoding.FileFormats.Pdf.LowLevel.Internal;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Synercoding.FileFormats.Pdf.LowLevel.XRef;
 

src/Synercoding.FileFormats.Pdf/Matrix.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.CompilerServices;
 
 namespace Synercoding.FileFormats.Pdf;

src/Synercoding.FileFormats.Pdf/PdfPage.cs

@@ -2,9 +2,6 @@
 using Synercoding.FileFormats.Pdf.LowLevel;
 using Synercoding.FileFormats.Pdf.LowLevel.Internal;
 using Synercoding.FileFormats.Pdf.LowLevel.XRef;
-using Synercoding.Primitives;
-using Synercoding.Primitives.Extensions;
-using System;
 
 namespace Synercoding.FileFormats.Pdf;
 
@@ -61,13 +58,8 @@ public PageRotation? Rotation
         set
         {
             const string ARGUMENT_OUT_OF_RANGE_MESSAGE = "The provided value can only be increments of 90.";
-#if SUPPORTS_TYPED_ENUM_ISDEFINED
             if (value is not null && !Enum.IsDefined(value.Value))
                 throw new ArgumentOutOfRangeException(nameof(Rotation), value, ARGUMENT_OUT_OF_RANGE_MESSAGE);
-#else
-            if (value is not null && !Enum.IsDefined(typeof(PageRotation), value.Value))
-                throw new ArgumentOutOfRangeException(nameof(Rotation), value, ARGUMENT_OUT_OF_RANGE_MESSAGE);
-#endif
 
             _rotation = value;
         }