Use Polyfill package to simplify net462 support

cyanfish · Apr 2, 2024 · 9a2537c · 9a2537c
1 parent 426330e
commit 9a2537c
Show file tree

Hide file tree

Showing 37 changed files with 18 additions and 638 deletions.
diff --git a/NAPS2.App.Tests/IsExternalInit.cs b/NAPS2.App.Tests/IsExternalInit.cs
diff --git a/NAPS2.Escl.Server/CompilerAttributes.cs b/NAPS2.Escl.Server/CompilerAttributes.cs
diff --git a/NAPS2.Escl.Server/NAPS2.Escl.Server.csproj b/NAPS2.Escl.Server/NAPS2.Escl.Server.csproj
@@ -16,7 +16,6 @@
 
     <ItemGroup>
       <PackageReference Include="EmbedIO" Version="3.5.2" />
-      <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/NAPS2.Escl.Usb/CompilerAttributes.cs b/NAPS2.Escl.Usb/CompilerAttributes.cs
diff --git a/NAPS2.Escl.Usb/NAPS2.Escl.Usb.csproj b/NAPS2.Escl.Usb/NAPS2.Escl.Usb.csproj
@@ -11,6 +11,7 @@
         <ProjectReference Include="..\NAPS2.Escl\NAPS2.Escl.csproj" />
 
         <PackageReference Include="LibUsbDotNet" Version="3.0.102-alpha" />
+        <PackageReference Include="Polyfill" Version="4.2.0" />
     </ItemGroup>
 
 </Project>
diff --git a/NAPS2.Escl/CompilerAttributes.cs b/NAPS2.Escl/CompilerAttributes.cs
diff --git a/NAPS2.Escl/NAPS2.Escl.csproj b/NAPS2.Escl/NAPS2.Escl.csproj
@@ -18,8 +18,10 @@
     <ItemGroup>
         <PackageReference Include="NAPS2.Mdns" Version="1.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Polyfill" Version="4.2.0" />
         <PackageReference Include="StandardSocketsHttpHandler" Version="2.2.0.8" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/NAPS2.Images.Gdi/GdiExtensions.cs b/NAPS2.Images.Gdi/GdiExtensions.cs
@@ -3,9 +3,7 @@
 
 namespace NAPS2.Images.Gdi;
 
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 public static class GdiExtensions
 {
     public static Bitmap RenderToBitmap(this IRenderableImage image)

diff --git a/NAPS2.Images.Gdi/GdiImage.cs b/NAPS2.Images.Gdi/GdiImage.cs
@@ -7,9 +7,7 @@ namespace NAPS2.Images.Gdi;
 /// <summary>
 /// An implementation of IMemoryImage that wraps a GDI+ image (System.Drawing.Bitmap).
 /// </summary>
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 public class GdiImage : IMemoryImage
 {
     public GdiImage(Bitmap bitmap)

diff --git a/NAPS2.Images.Gdi/GdiImageContext.cs b/NAPS2.Images.Gdi/GdiImageContext.cs
@@ -4,9 +4,7 @@
 
 namespace NAPS2.Images.Gdi;
 
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 public class GdiImageContext : ImageContext
 {
     private readonly GdiImageTransformer _imageTransformer;

diff --git a/NAPS2.Images.Gdi/GdiImageLockState.cs b/NAPS2.Images.Gdi/GdiImageLockState.cs
@@ -4,9 +4,7 @@
 
 namespace NAPS2.Images.Gdi;
 
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 public class GdiImageLockState : ImageLockState
 {
     public static GdiImageLockState Create(Bitmap bitmap, LockMode lockMode, out BitwiseImageData imageData)

diff --git a/NAPS2.Images.Gdi/GdiImageTransformer.cs b/NAPS2.Images.Gdi/GdiImageTransformer.cs
@@ -4,9 +4,7 @@
 
 namespace NAPS2.Images.Gdi;
 
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 public class GdiImageTransformer : AbstractImageTransformer<GdiImage>
 {
     public GdiImageTransformer(ImageContext imageContext) : base(imageContext)

diff --git a/NAPS2.Images.Gdi/GdiPixelFormatFixer.cs b/NAPS2.Images.Gdi/GdiPixelFormatFixer.cs
@@ -7,9 +7,7 @@ namespace NAPS2.Images.Gdi;
 /// <summary>
 /// Ensures that bitmaps use a standard pixel format/palette.
 /// </summary>
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 internal static class GdiPixelFormatFixer
 {
     public static bool MaybeFixPixelFormat(ref Bitmap bitmap)

diff --git a/NAPS2.Images.Gdi/GdiTiffWriter.cs b/NAPS2.Images.Gdi/GdiTiffWriter.cs
@@ -4,9 +4,7 @@
 
 namespace NAPS2.Images.Gdi;
 
-#if NET6_0_OR_GREATER
 [System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
-#endif
 internal class GdiTiffWriter : ITiffWriter
 {
     public bool SaveTiff(IList<IMemoryImage> images, string path,

diff --git a/NAPS2.Images.Gdi/IsExternalInit.cs b/NAPS2.Images.Gdi/IsExternalInit.cs
diff --git a/NAPS2.Images/ImageContext.cs b/NAPS2.Images/ImageContext.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using System.Diagnostics.CodeAnalysis;
 using NAPS2.Util;
 
 namespace NAPS2.Images;
@@ -46,8 +47,8 @@ protected ImageContext(Type imageType)
         ImageType = imageType;
     }
 
-    // TODO: Add NotNullWhen attribute?
-    private bool MaybeRenderPdf(ImageFileStorage fileStorage, IPdfRenderer? pdfRenderer, out IMemoryImage? renderedPdf)
+    private bool MaybeRenderPdf(ImageFileStorage fileStorage, IPdfRenderer? pdfRenderer,
+        [NotNullWhen(true)] out IMemoryImage? renderedPdf)
     {
         if (Path.GetExtension(fileStorage.FullPath).ToLowerInvariant() == ".pdf")
         {
@@ -63,7 +64,8 @@ private bool MaybeRenderPdf(ImageFileStorage fileStorage, IPdfRenderer? pdfRende
         return false;
     }
 
-    private bool MaybeRenderPdf(ImageMemoryStorage memoryStorage, IPdfRenderer? pdfRenderer, out IMemoryImage? renderedPdf)
+    private bool MaybeRenderPdf(ImageMemoryStorage memoryStorage, IPdfRenderer? pdfRenderer,
+        [NotNullWhen(true)] out IMemoryImage? renderedPdf)
     {
         if (memoryStorage.TypeHint == ".pdf")
         {
@@ -250,13 +252,13 @@ private IMemoryImage RenderFromStorage(IImageStorage storage, IPdfRenderer? pdfR
             case ImageFileStorage fileStorage:
                 if (MaybeRenderPdf(fileStorage, pdfRenderer, out var renderedPdf))
                 {
-                    return renderedPdf!;
+                    return renderedPdf;
                 }
                 return Load(fileStorage.FullPath);
             case ImageMemoryStorage memoryStorage:
                 if (MaybeRenderPdf(memoryStorage, pdfRenderer, out var renderedMemoryPdf))
                 {
-                    return renderedMemoryPdf!;
+                    return renderedMemoryPdf;
                 }
                 return Load(memoryStorage.Stream);
             case IMemoryImage image:

diff --git a/NAPS2.Images/IsExternalInit.cs b/NAPS2.Images/IsExternalInit.cs
diff --git a/NAPS2.Images/NAPS2.Images.csproj b/NAPS2.Images/NAPS2.Images.csproj
@@ -18,8 +18,8 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+        <PackageReference Include="Polyfill" Version="4.2.0" />
         <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
         <PackageReference Include="ZXing.Net" Version="0.16.9" />
 
         <ProjectReference Include="..\NAPS2.Internals\NAPS2.Internals.csproj" />

diff --git a/NAPS2.Internals/NAPS2.Internals.csproj b/NAPS2.Internals/NAPS2.Internals.csproj
@@ -15,7 +15,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+        <PackageReference Include="Polyfill" Version="4.2.0" />
         <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     </ItemGroup>
 
     <Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />