Update

Author: Shane32

QRCoder/Base64QRCode.cs

@@ -62,7 +62,7 @@ public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor,
                 return Convert.ToBase64String(pngData, Base64FormattingOptions.None);
             }
 
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if SYSTEM_DRAWING
 #pragma warning disable CA1416 // Validate platform compatibility
             var qr = new QRCode(QrCodeData);
             var base64 = string.Empty;
@@ -77,7 +77,7 @@ public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor,
 #endif
         }
 
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if SYSTEM_DRAWING
 #if NET6_0_OR_GREATER
         [System.Runtime.Versioning.SupportedOSPlatform("windows")]
 #endif
@@ -93,7 +93,7 @@ public string GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor,
         }
 #endif
 
-#if NETFRAMEWORK || NETSTANDARD2_0 || NET5_0 || NET6_0_WINDOWS
+#if SYSTEM_DRAWING
 #if NET6_0_OR_GREATER
         [System.Runtime.Versioning.SupportedOSPlatform("windows")]
 #endif

QRCoder/PayloadGenerator.cs

@@ -2516,14 +2516,10 @@ public override string ToString()
                 var cp = characterSet.ToString().Replace("_", "-");
                 var bytes = ToBytes();
 
-#if !NET35_OR_GREATER && !NETSTANDARD1_3_OR_GREATER
+#if NETCOREAPP
                 System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
 #endif
-#if NETSTANDARD1_3              
-                return Encoding.GetEncoding(cp).GetString(bytes,0,bytes.Length);
-#else
-                return Encoding.GetEncoding(cp).GetString(bytes);
-#endif
+                return Encoding.GetEncoding(cp).GetString(bytes, 0, bytes.Length);
             }
 
             /// <summary>
@@ -2536,7 +2532,7 @@ public byte[] ToBytes()
             {
                 //Setup byte encoder
                 //Encode return string as byte[] with correct CharacterSet
-#if !NET35_OR_GREATER
+#if !NETFRAMEWORK   // -- why different ifdef than line 2519? --
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif
                 var cp = this.characterSet.ToString().Replace("_", "-");

QRCoderTests/Base64QRCodeRendererTests.cs

@@ -55,7 +55,7 @@ public void can_render_base64_qrcode_transparent()
             base64QRCode.ShouldBe(Convert.ToBase64String(pngCodeGfx));
         }
 
-#if NETFRAMEWORK || NETCOREAPP2_0 || NET5_0 || NET6_0_WINDOWS
+#if SYSTEM_DRAWING
         [Fact]
         [Category("QRRenderer/Base64QRCode")]
         public void can_render_base64_qrcode_jpeg()