Fixed references (especially net5.0 stuff) in QRCoderConsole

Note: net6.0 isn't added as target for QRCoderConsole because QRCoderConsole heavily relies on System.Drawing which isn't available on net6.0 any longer.

Author: codebude

QRCoder.Xaml/QRCoder.Xaml.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFrameworks>net35;net40;net5.0-windows;net6.0-windows</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWindowsForms>
-    <UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWPF>
+    <!-- <UseWindowsForms Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWindowsForms> -->
+	<UseWPF Condition="'$(TargetFramework)' == 'net5.0-windows' or '$(TargetFramework)' == 'net6.0-windows'">true</UseWPF>
     <DefineConstants Condition="'$(TargetFramework)' == 'net5.0-windows'">$(DefineConstants);NET5_0_WINDOWS</DefineConstants>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>

QRCoderConsole/SupportedImageFormat.cs renamed to QRCoderConsole/DataObjects/SupportedImageFormat.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace QRCoderConsole
+namespace QRCoderConsole.DataObjects
 {
     public enum SupportedImageFormat
     {
@@ -14,7 +8,9 @@ public enum SupportedImageFormat
         Bmp,
         Tiff,
         Svg,
+#if !NET5_0 || NET5_0_WINDOWS
         Xaml,
+#endif
         Ps,
         Eps,
     }

QRCoderConsole/Program.cs

@@ -1,9 +1,8 @@
 using System;
-using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using NDesk.Options;
-using System.Reflection;
+using QRCoderConsole.DataObjects;
 using QRCoder;
 using System.Text;
 using System.Windows.Markup;
@@ -35,7 +34,7 @@ public static void Main (string[] args)
                     value => eccLevel = setter.GetECCLevel(value)
                 },
                 {   "f|output-format=",
-                    "Image format for outputfile. Possible values: png, jpg, gif, bmp, tiff, svg, xaml, ps, eps (default: png)",
+                    $"Image format for outputfile. Possible values: {string.Join(", ", Enum.GetNames(typeof(SupportedImageFormat)))} (default: png)",
                     value => { Enum.TryParse(value, true, out imageFormat); }
                 },
                 {
@@ -164,9 +163,9 @@ private static void GenerateQRCode(string payloadString, QRCodeGenerator.ECCLeve
                                 }
                             }
                             break;
-#if !NET5_0 && !NET5_0_WINDOWS
+#if NETFRAMEWORK || NET5_0_WINDOWS || NET6_0_WINDOWS
                         case SupportedImageFormat.Xaml:
-                            using (var code = new XamlQRCode(data))
+                            using (var code = new QRCoder.Xaml.XamlQRCode(data))
                             {
                                 var test = XamlWriter.Save(code.GetGraphic(pixelsPerModule, foreground, background, true));
                                 using (var f = File.CreateText(outputFileName))

QRCoderConsole/QRCoderConsole.csproj

@@ -25,13 +25,12 @@
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NDesk.Options" Version="0.2.1" />
+    <PackageReference Include="NDesk.Options.Core" Version="1.2.5" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net5.0'">
+	 <ProjectReference Include="..\QRCoder.Xaml\QRCoder.Xaml.csproj" />
   </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\QRCoder\QRCoder.csproj">
-      <Project>{aa6be23a-7813-4d2a-835e-b673631ae9f1}</Project>
-      <Name>QRCoder</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\QRCoder\QRCoder.csproj" />	
   </ItemGroup>
 </Project>