Feature/single project

QRCoder/Base64QRCode.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NETSTANDARD1_1
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
@@ -104,3 +105,5 @@ public static string GetQRCode(string plainText, int pixelsPerModule, string dar
         }
     }
 }
+
+#endif

QRCoder/PostscriptQRCode.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NETSTANDARD1_1
+using System;
 using System.Drawing;
 using static QRCoder.QRCodeGenerator;
 
@@ -149,3 +150,5 @@ public static string GetQRCode(string plainText, int pointsPerModule, string dar
         }
     }
 }
+
+#endif

QRCoder/Properties/AssemblyInfo.cs

@@ -6,11 +6,11 @@
 // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
 // die mit einer Assembly verknüpft sind.
 [assembly: AssemblyTitle("QRCoder")]
-[assembly: AssemblyDescription("A free-to-use QR code library")]
+[assembly: AssemblyDescription("QRCoder is a simple library, written in C#.NET, which enables you to create QR Codes. It's licensed under the MIT-license.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("www.code-bude.net")]
 [assembly: AssemblyProduct("QRCoder")]
-[assembly: AssemblyCopyright("Free to use (MIT license)")]
+[assembly: AssemblyCopyright("Copyright © www.code-bude.net / Raffael Herrmann.  All rights reserved.")]
 [assembly: AssemblyTrademark("written by Raffael Herrmann")]
 [assembly: AssemblyCulture("")]
 

QRCoder/QRCode.cs

@@ -1,3 +1,4 @@
+#if !NETSTANDARD1_1
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
@@ -155,3 +156,5 @@ public static Bitmap GetQRCode(string plainText, int pixelsPerModule, Color dark
         }
     }
 }
+
+#endif

QRCoder/QRCodeData.cs

@@ -21,7 +21,7 @@ public QRCodeData(int version)
             for (var i = 0; i < size; i++)
                 this.ModuleMatrix.Add(new BitArray(size));
         }
-#if !PCL
+#if !NETSTANDARD1_1
         public QRCodeData(string pathToRawData, Compression compressMode) : this(File.ReadAllBytes(pathToRawData), compressMode)
         {
         }
@@ -154,7 +154,7 @@ public byte[] GetRawData(Compression compressMode)
             return rawData;
         }
 
-#if !PCL
+#if !NETSTANDARD1_1
         public void SaveRawData(string filePath, Compression compressMode)
         {
             File.WriteAllBytes(filePath, GetRawData(compressMode));

QRCoder/QRCodeGenerator.cs

@@ -402,7 +402,7 @@ public static int MaskCode(ref QRCodeData qrCode, int version, ref List<Rectangl
                 var size = qrCode.ModuleMatrix.Count;
 
 
-                #if NET40
+                #if NET35 || NET40
                     var methods = typeof (MaskPattern).GetMethods();
                 #else
                     var methods = typeof (MaskPattern).GetTypeInfo().DeclaredMethods;
@@ -453,7 +453,7 @@ public static int MaskCode(ref QRCodeData qrCode, int version, ref List<Rectangl
 
 
 
-                #if NET40
+                #if NET35 || NET40
                     var patterMethod = typeof(MaskPattern).GetMethods().First(x => x.Name == patternName);
                 #else
                     var patterMethod = typeof(MaskPattern).GetTypeInfo().GetDeclaredMethod(patternName);
@@ -1088,7 +1088,7 @@ private static string ConvertToIso8859(string value, string Iso = "ISO-8859-2")
             Encoding utf8 = Encoding.UTF8;
             byte[] utfBytes = utf8.GetBytes(value);
             byte[] isoBytes = Encoding.Convert(utf8, iso, utfBytes);
-#if !PCL
+#if !NETSTANDARD1_1
             return iso.GetString(isoBytes);
 #else
             return iso.GetString(isoBytes, 0, isoBytes.Length);

QRCoder/QRCoder.NETCore20.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net35;net40;netstandard1.1;netstandard2.0</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
@@ -11,25 +11,26 @@
   </PropertyGroup>
 
   <PropertyGroup>
-	<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-	<PackageId>QRCoder.NET</PackageId>
-	<Authors>QRCoder.NET</Authors>
-	<AssemblyName>QRCoder</AssemblyName>
-	<RootNamespace>QRCoder</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <PackageId>QRCoder</PackageId>
+    <Authors>Raffael Herrmann</Authors>
+    <AssemblyName>QRCoder</AssemblyName>
+    <RootNamespace>QRCoder</RootNamespace>
+    <PackageLicenseUrl>https://github.com/codebude/QRCoder/blob/master/LICENSE.txt</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/codebude/QRCoder/</PackageProjectUrl>
+    <PackageIconUrl>http://code-bude.net/downloads/qrcoder-logo.png</PackageIconUrl>
+    <PackageTags>c# csharp qr qrcoder qrcode qr-generator qr-code-generator</PackageTags>
+    <RepositoryUrl>https://github.com/codebude/QRCoder.git</RepositoryUrl>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="XamlQRCode.cs" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net35' or '$(TargetFramework)' == 'net40' ">
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
-
-  <ItemGroup>
+  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Drawing.Common" Version="4.5.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="UnityEngine">
-      <HintPath>UnityEngine.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>

QRCoder/SvgQRCode.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NETSTANDARD1_1
+using System;
 using System.Drawing;
 using System.Text;
 using static QRCoder.QRCodeGenerator;
@@ -90,3 +91,5 @@ public static string GetQRCode(string plainText, int pixelsPerModule, string dar
         }
     }
 }
+
+#endif

QRCoder/XamlQRCode.cs

@@ -1,4 +1,5 @@
-using System;
+#if NET35 || NET40
+using System;
 using System.Windows;
 using System.Windows.Media;
 using static QRCoder.QRCodeGenerator;
@@ -92,3 +93,5 @@ public static DrawingImage GetQRCode(string plainText, int pixelsPerModule, stri
         }
     }
 }
+
+#endif