diff --git a/Directory.Build.props b/Directory.Build.props
index 08cd893e..bca0b89e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,6 +14,7 @@
1.6.1
12
false
+ enable
Raffael Herrmann, Shane Krueger
@@ -47,4 +48,12 @@
+
+
+
+
+
+
+
+
diff --git a/Directory.Build.targets b/Directory.Build.targets
index d35e78b1..39cf9750 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -17,4 +17,9 @@
true
+
+
+
+
+
diff --git a/QRCoder.Xaml/XamlQRCode.cs b/QRCoder.Xaml/XamlQRCode.cs
index a94ce002..1cc3ec70 100644
--- a/QRCoder.Xaml/XamlQRCode.cs
+++ b/QRCoder.Xaml/XamlQRCode.cs
@@ -1,4 +1,3 @@
-using System;
using System.Windows;
using System.Windows.Media;
using static QRCoder.QRCodeGenerator;
diff --git a/QRCoder/ASCIIQRCode.cs b/QRCoder/ASCIIQRCode.cs
index c84fab8f..6a98a848 100644
--- a/QRCoder/ASCIIQRCode.cs
+++ b/QRCoder/ASCIIQRCode.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
using static QRCoder.QRCodeGenerator;
namespace QRCoder;
diff --git a/QRCoder/ArtQRCode.cs b/QRCoder/ArtQRCode.cs
index 09b8ad06..91a5f8f3 100644
--- a/QRCoder/ArtQRCode.cs
+++ b/QRCoder/ArtQRCode.cs
@@ -1,6 +1,5 @@
#if SYSTEM_DRAWING
-using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using static QRCoder.ArtQRCode;
diff --git a/QRCoder/Base64QRCode.cs b/QRCoder/Base64QRCode.cs
index b6619b03..84e33883 100644
--- a/QRCoder/Base64QRCode.cs
+++ b/QRCoder/Base64QRCode.cs
@@ -1,8 +1,6 @@
#if !NETSTANDARD1_3
-using System;
using System.Drawing;
using System.Drawing.Imaging;
-using System.IO;
using System.Runtime.InteropServices;
using static QRCoder.Base64QRCode;
using static QRCoder.QRCodeGenerator;
diff --git a/QRCoder/BitmapByteQRCode.cs b/QRCoder/BitmapByteQRCode.cs
index 27b3b34f..46d3d584 100644
--- a/QRCoder/BitmapByteQRCode.cs
+++ b/QRCoder/BitmapByteQRCode.cs
@@ -1,4 +1,3 @@
-using System;
using static QRCoder.QRCodeGenerator;
namespace QRCoder;
diff --git a/QRCoder/Exceptions/DataTooLongException.cs b/QRCoder/Exceptions/DataTooLongException.cs
index 5cc510b5..f0c43b31 100644
--- a/QRCoder/Exceptions/DataTooLongException.cs
+++ b/QRCoder/Exceptions/DataTooLongException.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder.Exceptions;
///
diff --git a/QRCoder/Extensions/BitArrayExtensions.cs b/QRCoder/Extensions/BitArrayExtensions.cs
index 4070de18..1baf039e 100644
--- a/QRCoder/Extensions/BitArrayExtensions.cs
+++ b/QRCoder/Extensions/BitArrayExtensions.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-
namespace QRCoder;
///
diff --git a/QRCoder/Extensions/StringValueAttribute.cs b/QRCoder/Extensions/StringValueAttribute.cs
index cf1f581a..dcb9b731 100644
--- a/QRCoder/Extensions/StringValueAttribute.cs
+++ b/QRCoder/Extensions/StringValueAttribute.cs
@@ -1,4 +1,3 @@
-using System;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
diff --git a/QRCoder/PayloadGenerator.cs b/QRCoder/PayloadGenerator.cs
index a54efe31..acc9d45d 100644
--- a/QRCoder/PayloadGenerator.cs
+++ b/QRCoder/PayloadGenerator.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
#if NETSTANDARD1_3
using System.Reflection;
#endif
diff --git a/QRCoder/PayloadGenerator/BezahlCode.cs b/QRCoder/PayloadGenerator/BezahlCode.cs
index df9f17f6..ef654a6b 100644
--- a/QRCoder/PayloadGenerator/BezahlCode.cs
+++ b/QRCoder/PayloadGenerator/BezahlCode.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Text.RegularExpressions;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs b/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs
index 81889334..f2c5cf3f 100644
--- a/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs
+++ b/QRCoder/PayloadGenerator/BitcoinLikeCryptoCurrencyAddress.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/CalendarEvent.cs b/QRCoder/PayloadGenerator/CalendarEvent.cs
index 9e633a90..8a33dfc5 100644
--- a/QRCoder/PayloadGenerator/CalendarEvent.cs
+++ b/QRCoder/PayloadGenerator/CalendarEvent.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/ContactData.cs b/QRCoder/PayloadGenerator/ContactData.cs
index 8ca3dfd4..f31d7e0d 100644
--- a/QRCoder/PayloadGenerator/ContactData.cs
+++ b/QRCoder/PayloadGenerator/ContactData.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/Girocode.cs b/QRCoder/PayloadGenerator/Girocode.cs
index 94c8b997..66d4a7a7 100644
--- a/QRCoder/PayloadGenerator/Girocode.cs
+++ b/QRCoder/PayloadGenerator/Girocode.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/MMS.cs b/QRCoder/PayloadGenerator/MMS.cs
index f4ccdfb7..4d5475dd 100644
--- a/QRCoder/PayloadGenerator/MMS.cs
+++ b/QRCoder/PayloadGenerator/MMS.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/Mail.cs b/QRCoder/PayloadGenerator/Mail.cs
index 82bcaa92..375467a9 100644
--- a/QRCoder/PayloadGenerator/Mail.cs
+++ b/QRCoder/PayloadGenerator/Mail.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/MoneroTransaction.cs b/QRCoder/PayloadGenerator/MoneroTransaction.cs
index 8befa4f9..7628d08c 100644
--- a/QRCoder/PayloadGenerator/MoneroTransaction.cs
+++ b/QRCoder/PayloadGenerator/MoneroTransaction.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/OneTimePassword.cs b/QRCoder/PayloadGenerator/OneTimePassword.cs
index b942b0c8..9397c468 100644
--- a/QRCoder/PayloadGenerator/OneTimePassword.cs
+++ b/QRCoder/PayloadGenerator/OneTimePassword.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Text;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/RussiaPaymentOrder.cs b/QRCoder/PayloadGenerator/RussiaPaymentOrder.cs
index a6b1e1b8..cd3830ee 100644
--- a/QRCoder/PayloadGenerator/RussiaPaymentOrder.cs
+++ b/QRCoder/PayloadGenerator/RussiaPaymentOrder.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
#if NETSTANDARD1_3
using System.Reflection;
#endif
diff --git a/QRCoder/PayloadGenerator/SMS.cs b/QRCoder/PayloadGenerator/SMS.cs
index 62af2849..6d167c22 100644
--- a/QRCoder/PayloadGenerator/SMS.cs
+++ b/QRCoder/PayloadGenerator/SMS.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/ShadowSocksConfig.cs b/QRCoder/PayloadGenerator/ShadowSocksConfig.cs
index 67b2821f..f21e9db9 100644
--- a/QRCoder/PayloadGenerator/ShadowSocksConfig.cs
+++ b/QRCoder/PayloadGenerator/ShadowSocksConfig.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/SlovenianUpnQr.cs b/QRCoder/PayloadGenerator/SlovenianUpnQr.cs
index b34700bc..cdf4776b 100644
--- a/QRCoder/PayloadGenerator/SlovenianUpnQr.cs
+++ b/QRCoder/PayloadGenerator/SlovenianUpnQr.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Text;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/SwissQrCode.cs b/QRCoder/PayloadGenerator/SwissQrCode.cs
index 6c1bb80e..e20a4647 100644
--- a/QRCoder/PayloadGenerator/SwissQrCode.cs
+++ b/QRCoder/PayloadGenerator/SwissQrCode.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/Url.cs b/QRCoder/PayloadGenerator/Url.cs
index 80a25d11..08cd43a3 100644
--- a/QRCoder/PayloadGenerator/Url.cs
+++ b/QRCoder/PayloadGenerator/Url.cs
@@ -1,5 +1,3 @@
-using System;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PayloadGenerator/WhatsAppMessage.cs b/QRCoder/PayloadGenerator/WhatsAppMessage.cs
index 30126275..8f538ba0 100644
--- a/QRCoder/PayloadGenerator/WhatsAppMessage.cs
+++ b/QRCoder/PayloadGenerator/WhatsAppMessage.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Text.RegularExpressions;
-
namespace QRCoder;
public static partial class PayloadGenerator
diff --git a/QRCoder/PdfByteQRCode.cs b/QRCoder/PdfByteQRCode.cs
index 84df07e6..be66fbf0 100644
--- a/QRCoder/PdfByteQRCode.cs
+++ b/QRCoder/PdfByteQRCode.cs
@@ -1,10 +1,5 @@
#if SYSTEM_DRAWING
-using System;
-using System.Collections.Generic;
using System.Drawing.Imaging;
-using System.Globalization;
-using System.IO;
-using System.Linq;
using static QRCoder.QRCodeGenerator;
/* This renderer is inspired by RemusVasii: https://github.com/Shane32/QRCoder/issues/223 */
@@ -88,7 +83,7 @@ public byte[] GetGraphic(int pixelsPerModule, string darkColorHtmlHex, string li
var jpgImageCodecInfo = ImageCodecInfo.GetImageEncoders().First(x => x.MimeType == "image/jpeg");
var jpgEncoderParameters = new EncoderParameters(1)
{
- Param = new EncoderParameter[] { new EncoderParameter(Encoder.Quality, jpgQuality) }
+ Param = new EncoderParameter[] { new EncoderParameter(System.Drawing.Imaging.Encoder.Quality, jpgQuality) }
};
img.Save(msJpeg, jpgImageCodecInfo, jpgEncoderParameters);
jpgArray = msJpeg.ToArray();
diff --git a/QRCoder/PngByteQRCode.cs b/QRCoder/PngByteQRCode.cs
index 297712e5..3b118cd9 100644
--- a/QRCoder/PngByteQRCode.cs
+++ b/QRCoder/PngByteQRCode.cs
@@ -1,8 +1,6 @@
#if HAS_SPAN
using System.Buffers;
#endif
-using System;
-using System.IO;
using System.IO.Compression;
using static QRCoder.QRCodeGenerator;
diff --git a/QRCoder/PostscriptQRCode.cs b/QRCoder/PostscriptQRCode.cs
index 2e36bc76..2653bb02 100644
--- a/QRCoder/PostscriptQRCode.cs
+++ b/QRCoder/PostscriptQRCode.cs
@@ -1,6 +1,4 @@
-
#if !NETSTANDARD1_3
-using System;
using System.Drawing;
using static QRCoder.QRCodeGenerator;
diff --git a/QRCoder/QRCode.cs b/QRCoder/QRCode.cs
index 8b312746..7ab86a3c 100644
--- a/QRCoder/QRCode.cs
+++ b/QRCoder/QRCode.cs
@@ -1,5 +1,4 @@
#if SYSTEM_DRAWING
-using System;
using System.Drawing;
using System.Drawing.Drawing2D;
using static QRCoder.QRCodeGenerator;
diff --git a/QRCoder/QRCodeData.cs b/QRCoder/QRCodeData.cs
index 10a7a67b..d1d3611f 100644
--- a/QRCoder/QRCodeData.cs
+++ b/QRCoder/QRCodeData.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
using System.IO.Compression;
namespace QRCoder;
diff --git a/QRCoder/QRCodeGenerator.cs b/QRCoder/QRCodeGenerator.cs
index 40890d5e..020d7302 100644
--- a/QRCoder/QRCodeGenerator.cs
+++ b/QRCoder/QRCodeGenerator.cs
@@ -1,14 +1,8 @@
-using System;
#if HAS_SPAN
using System.Buffers;
#endif
-using System.Collections;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Globalization;
-using System.Linq;
using System.Runtime.CompilerServices;
-using System.Text;
namespace QRCoder;
diff --git a/QRCoder/QRCodeGenerator/AlignmentPattern.cs b/QRCoder/QRCodeGenerator/AlignmentPattern.cs
index 77a707d7..cc795367 100644
--- a/QRCoder/QRCodeGenerator/AlignmentPattern.cs
+++ b/QRCoder/QRCodeGenerator/AlignmentPattern.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/AlignmentPatterns.cs b/QRCoder/QRCodeGenerator/AlignmentPatterns.cs
index deb1abb5..8b09a1a5 100644
--- a/QRCoder/QRCodeGenerator/AlignmentPatterns.cs
+++ b/QRCoder/QRCodeGenerator/AlignmentPatterns.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/AlphanumericEncoder.cs b/QRCoder/QRCodeGenerator/AlphanumericEncoder.cs
index b0e46aca..47f2009b 100644
--- a/QRCoder/QRCodeGenerator/AlphanumericEncoder.cs
+++ b/QRCoder/QRCodeGenerator/AlphanumericEncoder.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/CapacityTables.cs b/QRCoder/QRCodeGenerator/CapacityTables.cs
index c62a2f26..f4c6b94c 100644
--- a/QRCoder/QRCodeGenerator/CapacityTables.cs
+++ b/QRCoder/QRCodeGenerator/CapacityTables.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/CodewordBlock.cs b/QRCoder/QRCodeGenerator/CodewordBlock.cs
index 7cf78577..58e3f43c 100644
--- a/QRCoder/QRCodeGenerator/CodewordBlock.cs
+++ b/QRCoder/QRCodeGenerator/CodewordBlock.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
#if HAS_SPAN
using System.Buffers;
#endif
diff --git a/QRCoder/QRCodeGenerator/GaloisField.cs b/QRCoder/QRCodeGenerator/GaloisField.cs
index 23e79457..094cf217 100644
--- a/QRCoder/QRCodeGenerator/GaloisField.cs
+++ b/QRCoder/QRCodeGenerator/GaloisField.cs
@@ -1,4 +1,3 @@
-using System;
using System.Diagnostics;
namespace QRCoder;
diff --git a/QRCoder/QRCodeGenerator/ModulePlacer.BlockedModules.cs b/QRCoder/QRCodeGenerator/ModulePlacer.BlockedModules.cs
index 3a79ed5c..720db606 100644
--- a/QRCoder/QRCodeGenerator/ModulePlacer.BlockedModules.cs
+++ b/QRCoder/QRCodeGenerator/ModulePlacer.BlockedModules.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections;
-using System.Threading;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/ModulePlacer.MaskPattern.cs b/QRCoder/QRCodeGenerator/ModulePlacer.MaskPattern.cs
index 3df023a3..b702e6e2 100644
--- a/QRCoder/QRCodeGenerator/ModulePlacer.MaskPattern.cs
+++ b/QRCoder/QRCodeGenerator/ModulePlacer.MaskPattern.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/ModulePlacer.cs b/QRCoder/QRCodeGenerator/ModulePlacer.cs
index 774d13aa..584dd8e6 100644
--- a/QRCoder/QRCodeGenerator/ModulePlacer.cs
+++ b/QRCoder/QRCodeGenerator/ModulePlacer.cs
@@ -1,6 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/Point.cs b/QRCoder/QRCodeGenerator/Point.cs
index fc573e45..36255b46 100644
--- a/QRCoder/QRCodeGenerator/Point.cs
+++ b/QRCoder/QRCodeGenerator/Point.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
using System.Reflection;
namespace QRCoder;
diff --git a/QRCoder/QRCodeGenerator/Polynom.cs b/QRCoder/QRCodeGenerator/Polynom.cs
index cc904c7f..1e6e9a57 100644
--- a/QRCoder/QRCodeGenerator/Polynom.cs
+++ b/QRCoder/QRCodeGenerator/Polynom.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
using System.Diagnostics;
-using System.Text;
namespace QRCoder;
diff --git a/QRCoder/QRCodeGenerator/VersionInfo.cs b/QRCoder/QRCodeGenerator/VersionInfo.cs
index 0618bfda..053daf6f 100644
--- a/QRCoder/QRCodeGenerator/VersionInfo.cs
+++ b/QRCoder/QRCodeGenerator/VersionInfo.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/QRCodeGenerator/VersionInfoDetails.cs b/QRCoder/QRCodeGenerator/VersionInfoDetails.cs
index f4e315df..95b66d76 100644
--- a/QRCoder/QRCodeGenerator/VersionInfoDetails.cs
+++ b/QRCoder/QRCodeGenerator/VersionInfoDetails.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
namespace QRCoder;
public partial class QRCodeGenerator
diff --git a/QRCoder/SvgQRCode.cs b/QRCoder/SvgQRCode.cs
index af668fb8..fffc65f8 100644
--- a/QRCoder/SvgQRCode.cs
+++ b/QRCoder/SvgQRCode.cs
@@ -1,7 +1,5 @@
#if !NETSTANDARD1_3
-using System;
using System.Drawing;
-using System.Text;
using QRCoder.Extensions;
using static QRCoder.QRCodeGenerator;
using static QRCoder.SvgQRCode;
diff --git a/QRCoderApiTests/ApiApprovalTests.cs b/QRCoderApiTests/ApiApprovalTests.cs
index aeb7d316..e9dff5b9 100644
--- a/QRCoderApiTests/ApiApprovalTests.cs
+++ b/QRCoderApiTests/ApiApprovalTests.cs
@@ -1,7 +1,4 @@
-using System;
using System.Diagnostics;
-using System.IO;
-using System.Linq;
using System.Reflection;
using System.Xml.Linq;
using PublicApiGenerator;
diff --git a/QRCoderConsole/Program.cs b/QRCoderConsole/Program.cs
index 810abad2..8c7adba5 100644
--- a/QRCoderConsole/Program.cs
+++ b/QRCoderConsole/Program.cs
@@ -1,7 +1,5 @@
-using System;
using System.Drawing.Imaging;
using System.IO;
-using System.Text;
using System.Windows.Markup;
using NDesk.Options;
using QRCoder;
diff --git a/QRCoderDemo/Form1.cs b/QRCoderDemo/Form1.cs
index 57edab5f..00e6d9d9 100644
--- a/QRCoderDemo/Form1.cs
+++ b/QRCoderDemo/Form1.cs
@@ -1,4 +1,3 @@
-using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Forms;
diff --git a/QRCoderDemo/Program.cs b/QRCoderDemo/Program.cs
index 6edeabb8..92cc9aa2 100644
--- a/QRCoderDemo/Program.cs
+++ b/QRCoderDemo/Program.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
using System.Windows.Forms;
namespace QRCoderDemo;
diff --git a/QRCoderDemoUWP/App.xaml.cs b/QRCoderDemoUWP/App.xaml.cs
index 91a29799..b722346f 100644
--- a/QRCoderDemoUWP/App.xaml.cs
+++ b/QRCoderDemoUWP/App.xaml.cs
@@ -1,19 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
namespace QRCoderDemoUWP;
diff --git a/QRCoderDemoUWP/MainPage.xaml.cs b/QRCoderDemoUWP/MainPage.xaml.cs
index 6c58f3eb..29775a36 100644
--- a/QRCoderDemoUWP/MainPage.xaml.cs
+++ b/QRCoderDemoUWP/MainPage.xaml.cs
@@ -2,10 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using QRCoder;
-using Windows.Storage.Streams;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Imaging;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
diff --git a/QRCoderTests/ArtQRCodeRendererTests.cs b/QRCoderTests/ArtQRCodeRendererTests.cs
index 0792c2de..349f3bb7 100644
--- a/QRCoderTests/ArtQRCodeRendererTests.cs
+++ b/QRCoderTests/ArtQRCodeRendererTests.cs
@@ -1,11 +1,5 @@
#if SYSTEM_DRAWING
-using System.Drawing;
-using QRCoder;
-using QRCoderTests.Helpers;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
public class ArtQRCodeRendererTests
diff --git a/QRCoderTests/AsciiQRCodeRendererTests.cs b/QRCoderTests/AsciiQRCodeRendererTests.cs
index d4b55dbd..e6c52c2c 100644
--- a/QRCoderTests/AsciiQRCodeRendererTests.cs
+++ b/QRCoderTests/AsciiQRCodeRendererTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
public class AsciiQRCodeRendererTests
diff --git a/QRCoderTests/Base64QRCodeRendererTests.cs b/QRCoderTests/Base64QRCodeRendererTests.cs
index 74d83718..e65552d0 100644
--- a/QRCoderTests/Base64QRCodeRendererTests.cs
+++ b/QRCoderTests/Base64QRCodeRendererTests.cs
@@ -1,9 +1,3 @@
-using System;
-using System.Drawing;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
public class Base64QRCodeRendererTests
diff --git a/QRCoderTests/BitmapByteQRCodeRendererTests.cs b/QRCoderTests/BitmapByteQRCodeRendererTests.cs
index 763db05e..c7d529ea 100644
--- a/QRCoderTests/BitmapByteQRCodeRendererTests.cs
+++ b/QRCoderTests/BitmapByteQRCodeRendererTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
public class BitmapByteQRCodeRendererTests
diff --git a/QRCoderTests/Helpers/HelperFunctions.cs b/QRCoderTests/Helpers/HelperFunctions.cs
index 1d4efb2a..73b76880 100644
--- a/QRCoderTests/Helpers/HelperFunctions.cs
+++ b/QRCoderTests/Helpers/HelperFunctions.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Text;
using System.IO;
using System.Security.Cryptography;
using System.Reflection;
-using System.Drawing;
#if TEST_XAML
using SW = System.Windows;
using System.Windows.Media;
diff --git a/QRCoderTests/Helpers/ShouldMatchApprovedBinaryExtensions.cs b/QRCoderTests/Helpers/ShouldMatchApprovedBinaryExtensions.cs
index bc9cc274..d6f6ee66 100644
--- a/QRCoderTests/Helpers/ShouldMatchApprovedBinaryExtensions.cs
+++ b/QRCoderTests/Helpers/ShouldMatchApprovedBinaryExtensions.cs
@@ -1,11 +1,8 @@
#nullable enable
-using System;
using System.ComponentModel;
using System.Diagnostics;
-using System.Drawing;
using System.IO;
-using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using KGySoft.Drawing;
diff --git a/QRCoderTests/PayloadGeneratorTests/BezahlCodeTests.cs b/QRCoderTests/PayloadGeneratorTests/BezahlCodeTests.cs
index e2587b25..7109dda0 100644
--- a/QRCoderTests/PayloadGeneratorTests/BezahlCodeTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/BezahlCodeTests.cs
@@ -1,7 +1,3 @@
-using System;
-using QRCoder;
-using Shouldly;
-using Xunit;
using static QRCoder.PayloadGenerator.BezahlCode;
namespace QRCoderTests.PayloadGeneratorTests;
diff --git a/QRCoderTests/PayloadGeneratorTests/BitcoinAddressTests.cs b/QRCoderTests/PayloadGeneratorTests/BitcoinAddressTests.cs
index dbd2e731..0527d8b6 100644
--- a/QRCoderTests/PayloadGeneratorTests/BitcoinAddressTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/BitcoinAddressTests.cs
@@ -1,9 +1,3 @@
-using System.Globalization;
-using System.Threading;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class BitcoinAddressTests
diff --git a/QRCoderTests/PayloadGeneratorTests/BitcoinCashAddressTests.cs b/QRCoderTests/PayloadGeneratorTests/BitcoinCashAddressTests.cs
index a120dede..46b3b2dc 100644
--- a/QRCoderTests/PayloadGeneratorTests/BitcoinCashAddressTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/BitcoinCashAddressTests.cs
@@ -1,9 +1,3 @@
-using System.Globalization;
-using System.Threading;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class BitcoinCashAddressTests
diff --git a/QRCoderTests/PayloadGeneratorTests/BookmarkTests.cs b/QRCoderTests/PayloadGeneratorTests/BookmarkTests.cs
index 97759605..75f97549 100644
--- a/QRCoderTests/PayloadGeneratorTests/BookmarkTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/BookmarkTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class BookmarkTests
diff --git a/QRCoderTests/PayloadGeneratorTests/CalendarEventTests.cs b/QRCoderTests/PayloadGeneratorTests/CalendarEventTests.cs
index 3784794c..ba3c7a5f 100644
--- a/QRCoderTests/PayloadGeneratorTests/CalendarEventTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/CalendarEventTests.cs
@@ -1,8 +1,3 @@
-using System;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class CalendarEventTests
diff --git a/QRCoderTests/PayloadGeneratorTests/ContactDataTests.cs b/QRCoderTests/PayloadGeneratorTests/ContactDataTests.cs
index fa58b74b..47b273ae 100644
--- a/QRCoderTests/PayloadGeneratorTests/ContactDataTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/ContactDataTests.cs
@@ -1,8 +1,3 @@
-using System;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class ContactDataTests
diff --git a/QRCoderTests/PayloadGeneratorTests/GeolocationTests.cs b/QRCoderTests/PayloadGeneratorTests/GeolocationTests.cs
index af136c58..e7aa354b 100644
--- a/QRCoderTests/PayloadGeneratorTests/GeolocationTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/GeolocationTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class GeolocationTests
diff --git a/QRCoderTests/PayloadGeneratorTests/GirocodeTests.cs b/QRCoderTests/PayloadGeneratorTests/GirocodeTests.cs
index 57e0d469..82df3eac 100644
--- a/QRCoderTests/PayloadGeneratorTests/GirocodeTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/GirocodeTests.cs
@@ -1,6 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
using static QRCoder.QRCodeGenerator;
namespace QRCoderTests.PayloadGeneratorTests;
diff --git a/QRCoderTests/PayloadGeneratorTests/IbanTests.cs b/QRCoderTests/PayloadGeneratorTests/IbanTests.cs
index efd4a3a5..6629426f 100644
--- a/QRCoderTests/PayloadGeneratorTests/IbanTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/IbanTests.cs
@@ -1,14 +1,4 @@
-using System;
-using System.Globalization;
using System.Reflection;
-using System.Threading;
-using QRCoder;
-using Shouldly;
-using Xunit;
-using static QRCoder.PayloadGenerator.BezahlCode;
-using static QRCoder.PayloadGenerator.SwissQrCode.AdditionalInformation;
-using static QRCoder.PayloadGenerator.SwissQrCode.Reference;
-using static QRCoder.QRCodeGenerator;
namespace QRCoderTests.PayloadGeneratorTests;
diff --git a/QRCoderTests/PayloadGeneratorTests/LitecoinAddressTests.cs b/QRCoderTests/PayloadGeneratorTests/LitecoinAddressTests.cs
index 3feb84a9..c31ad491 100644
--- a/QRCoderTests/PayloadGeneratorTests/LitecoinAddressTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/LitecoinAddressTests.cs
@@ -1,9 +1,3 @@
-using System.Globalization;
-using System.Threading;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class LitecoinAddressTests
diff --git a/QRCoderTests/PayloadGeneratorTests/MMSTests.cs b/QRCoderTests/PayloadGeneratorTests/MMSTests.cs
index 8810ceb5..83fcd233 100644
--- a/QRCoderTests/PayloadGeneratorTests/MMSTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/MMSTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class MMSTests
diff --git a/QRCoderTests/PayloadGeneratorTests/MailTests.cs b/QRCoderTests/PayloadGeneratorTests/MailTests.cs
index 33018cd8..11357476 100644
--- a/QRCoderTests/PayloadGeneratorTests/MailTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/MailTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class MailTests
diff --git a/QRCoderTests/PayloadGeneratorTests/MoneroTransactionTests.cs b/QRCoderTests/PayloadGeneratorTests/MoneroTransactionTests.cs
index fab131de..cf9272d2 100644
--- a/QRCoderTests/PayloadGeneratorTests/MoneroTransactionTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/MoneroTransactionTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class MoneroTransactionTests
diff --git a/QRCoderTests/PayloadGeneratorTests/OneTimePasswordTests.cs b/QRCoderTests/PayloadGeneratorTests/OneTimePasswordTests.cs
index 9ef9521f..d0d909db 100644
--- a/QRCoderTests/PayloadGeneratorTests/OneTimePasswordTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/OneTimePasswordTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class OneTimePasswordTests
diff --git a/QRCoderTests/PayloadGeneratorTests/PhoneNumberTests.cs b/QRCoderTests/PayloadGeneratorTests/PhoneNumberTests.cs
index 69eb1237..57861ab6 100644
--- a/QRCoderTests/PayloadGeneratorTests/PhoneNumberTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/PhoneNumberTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class PhoneNumberTests
diff --git a/QRCoderTests/PayloadGeneratorTests/RussiaPaymentOrderTests.cs b/QRCoderTests/PayloadGeneratorTests/RussiaPaymentOrderTests.cs
index c05092c8..f09ccddd 100644
--- a/QRCoderTests/PayloadGeneratorTests/RussiaPaymentOrderTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/RussiaPaymentOrderTests.cs
@@ -1,8 +1,3 @@
-using System;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class RussiaPaymentOrderTests
diff --git a/QRCoderTests/PayloadGeneratorTests/SMSTests.cs b/QRCoderTests/PayloadGeneratorTests/SMSTests.cs
index 3500a1c2..bb59e10c 100644
--- a/QRCoderTests/PayloadGeneratorTests/SMSTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/SMSTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class SMSTests
diff --git a/QRCoderTests/PayloadGeneratorTests/ShadowSocksConfigTests.cs b/QRCoderTests/PayloadGeneratorTests/ShadowSocksConfigTests.cs
index 62690b25..7ccba564 100644
--- a/QRCoderTests/PayloadGeneratorTests/ShadowSocksConfigTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/ShadowSocksConfigTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class ShadowSocksConfigTests
diff --git a/QRCoderTests/PayloadGeneratorTests/SkypeCallTests.cs b/QRCoderTests/PayloadGeneratorTests/SkypeCallTests.cs
index 9df0a4ca..8cde5b81 100644
--- a/QRCoderTests/PayloadGeneratorTests/SkypeCallTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/SkypeCallTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class SkypeCallTests
diff --git a/QRCoderTests/PayloadGeneratorTests/SwissQrCodeTests.cs b/QRCoderTests/PayloadGeneratorTests/SwissQrCodeTests.cs
index 387ecd77..5ac3a2d3 100644
--- a/QRCoderTests/PayloadGeneratorTests/SwissQrCodeTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/SwissQrCodeTests.cs
@@ -1,7 +1,3 @@
-using System;
-using QRCoder;
-using Shouldly;
-using Xunit;
using static QRCoder.PayloadGenerator.SwissQrCode.AdditionalInformation;
using static QRCoder.PayloadGenerator.SwissQrCode.Reference;
using static QRCoder.QRCodeGenerator;
diff --git a/QRCoderTests/PayloadGeneratorTests/UrlTests.cs b/QRCoderTests/PayloadGeneratorTests/UrlTests.cs
index 924d90f8..fa0db4ea 100644
--- a/QRCoderTests/PayloadGeneratorTests/UrlTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/UrlTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class UrlTests
diff --git a/QRCoderTests/PayloadGeneratorTests/WhatsAppMessageTests.cs b/QRCoderTests/PayloadGeneratorTests/WhatsAppMessageTests.cs
index e2ced33c..72621c32 100644
--- a/QRCoderTests/PayloadGeneratorTests/WhatsAppMessageTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/WhatsAppMessageTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class WhatsAppMessageTests
diff --git a/QRCoderTests/PayloadGeneratorTests/WiFiTests.cs b/QRCoderTests/PayloadGeneratorTests/WiFiTests.cs
index 6308a67a..21337ca1 100644
--- a/QRCoderTests/PayloadGeneratorTests/WiFiTests.cs
+++ b/QRCoderTests/PayloadGeneratorTests/WiFiTests.cs
@@ -1,7 +1,3 @@
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests.PayloadGeneratorTests;
public class WiFiTests
diff --git a/QRCoderTests/PngByteQRCodeRendererTests.cs b/QRCoderTests/PngByteQRCodeRendererTests.cs
index 269bbed2..416d6baa 100644
--- a/QRCoderTests/PngByteQRCodeRendererTests.cs
+++ b/QRCoderTests/PngByteQRCodeRendererTests.cs
@@ -1,8 +1,3 @@
-using System.Drawing;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
/****************************************************************************************************
diff --git a/QRCoderTests/PostscriptQRCodeRendererTests.cs b/QRCoderTests/PostscriptQRCodeRendererTests.cs
index 8560b08a..03c2a759 100644
--- a/QRCoderTests/PostscriptQRCodeRendererTests.cs
+++ b/QRCoderTests/PostscriptQRCodeRendererTests.cs
@@ -1,9 +1,3 @@
-using System.Drawing;
-using System.Text.RegularExpressions;
-using QRCoder;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
public class PostscriptQRCodeRendererTests
diff --git a/QRCoderTests/QRCodeRendererTests.cs b/QRCoderTests/QRCodeRendererTests.cs
index 7803b3b8..98db5fb2 100644
--- a/QRCoderTests/QRCodeRendererTests.cs
+++ b/QRCoderTests/QRCodeRendererTests.cs
@@ -1,9 +1,4 @@
#if SYSTEM_DRAWING
-using System.Drawing;
-using QRCoder;
-using QRCoderTests.Helpers;
-using Shouldly;
-using Xunit;
namespace QRCoderTests;
diff --git a/QRCoderTests/QRCoderTests.csproj b/QRCoderTests/QRCoderTests.csproj
index 4e0e036e..bc4aed9a 100644
--- a/QRCoderTests/QRCoderTests.csproj
+++ b/QRCoderTests/QRCoderTests.csproj
@@ -56,5 +56,13 @@
$([System.String]::Copy('%(Filename)').Split('.')[0]).cs
-
+
+
+
+
+
+
+
+
+
diff --git a/QRCoderTests/QRGeneratorTests.cs b/QRCoderTests/QRGeneratorTests.cs
index 350a2d3a..853fc623 100644
--- a/QRCoderTests/QRGeneratorTests.cs
+++ b/QRCoderTests/QRGeneratorTests.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
using System.Reflection;
-using System.Text;
-using QRCoder;
-using Shouldly;
-using Xunit;
using ECCLevel = QRCoder.QRCodeGenerator.ECCLevel;
diff --git a/QRCoderTests/SvgQRCodeRendererTests.cs b/QRCoderTests/SvgQRCodeRendererTests.cs
index b1642a1b..43346cf3 100644
--- a/QRCoderTests/SvgQRCodeRendererTests.cs
+++ b/QRCoderTests/SvgQRCodeRendererTests.cs
@@ -1,11 +1,3 @@
-using System;
-using System.Drawing;
-using System.Text.RegularExpressions;
-using QRCoder;
-using QRCoderTests.Helpers;
-using Shouldly;
-using Xunit;
-
namespace QRCoderTests;
public class SvgQRCodeRendererTests
diff --git a/QRCoderTests/XamlQRCodeRendererTests.cs b/QRCoderTests/XamlQRCodeRendererTests.cs
index 1ea00eaa..7c91f2c9 100644
--- a/QRCoderTests/XamlQRCodeRendererTests.cs
+++ b/QRCoderTests/XamlQRCodeRendererTests.cs
@@ -1,9 +1,5 @@
#if TEST_XAML
-using QRCoder;
using QRCoder.Xaml;
-using QRCoderTests.Helpers;
-using Shouldly;
-using Xunit;
namespace QRCoderTests;