diff --git a/Source/Bindings/Tests/ZXing.SkiaSharp/ZXing.SkiaSharp.Test.csproj b/Source/Bindings/Tests/ZXing.SkiaSharp/ZXing.SkiaSharp.Test.csproj index c977d2b3..fc26be77 100644 --- a/Source/Bindings/Tests/ZXing.SkiaSharp/ZXing.SkiaSharp.Test.csproj +++ b/Source/Bindings/Tests/ZXing.SkiaSharp/ZXing.SkiaSharp.Test.csproj @@ -80,7 +80,7 @@ 4.7.1 - 0.16.6 + 0.16.7 diff --git a/Source/Bindings/ZXing.Android/BarcodeReader.Extensions.cs b/Source/Bindings/ZXing.Android/BarcodeReader.Extensions.cs index 2216de26..ed9b52af 100644 --- a/Source/Bindings/ZXing.Android/BarcodeReader.Extensions.cs +++ b/Source/Bindings/ZXing.Android/BarcodeReader.Extensions.cs @@ -29,6 +29,7 @@ public static class BarcodeReaderExtensions /// /// /// + [System.CLSCompliant(false)] public static Result Decode(this IBarcodeReaderGeneric reader, Android::Android.Graphics.Bitmap bitmap) { var luminanceSource = new BitmapLuminanceSource(bitmap); @@ -41,6 +42,7 @@ public static Result Decode(this IBarcodeReaderGeneric reader, Android::Android. /// /// /// + [System.CLSCompliant(false)] public static Result[] DecodeMultiple(this IBarcodeReaderGeneric reader, Android::Android.Graphics.Bitmap bitmap) { var luminanceSource = new BitmapLuminanceSource(bitmap); diff --git a/Source/Bindings/ZXing.Android/BarcodeWriter.Extensions.cs b/Source/Bindings/ZXing.Android/BarcodeWriter.Extensions.cs index b02e9867..6170bbe6 100644 --- a/Source/Bindings/ZXing.Android/BarcodeWriter.Extensions.cs +++ b/Source/Bindings/ZXing.Android/BarcodeWriter.Extensions.cs @@ -31,6 +31,7 @@ public static class BarcodeWriterExtensions /// /// /// + [System.CLSCompliant(false)] public static Android::Android.Graphics.Bitmap WriteAsBitmap(this IBarcodeWriterGeneric writer, string content) { var bitmatrix = writer.Encode(content); diff --git a/Source/Bindings/ZXing.Android/IBarcodeWriter.AndroidBitmap.cs b/Source/Bindings/ZXing.Android/IBarcodeWriter.AndroidBitmap.cs index 7688df2f..a96b24d3 100644 --- a/Source/Bindings/ZXing.Android/IBarcodeWriter.AndroidBitmap.cs +++ b/Source/Bindings/ZXing.Android/IBarcodeWriter.AndroidBitmap.cs @@ -23,6 +23,7 @@ namespace ZXing.Android /// /// Interface for a smart class to encode some content into a barcode /// + [System.CLSCompliant(false)] public interface IBarcodeWriter { /// diff --git a/Source/Bindings/ZXing.Android/Properties/AssemblyInfo.cs b/Source/Bindings/ZXing.Android/Properties/AssemblyInfo.cs index abf21d13..9d35cf56 100644 --- a/Source/Bindings/ZXing.Android/Properties/AssemblyInfo.cs +++ b/Source/Bindings/ZXing.Android/Properties/AssemblyInfo.cs @@ -26,9 +26,9 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.16.6.0")] +[assembly: AssemblyVersion("0.16.7.0")] #if !WindowsCE -[assembly: AssemblyFileVersion("0.16.6.0")] +[assembly: AssemblyFileVersion("0.16.7.0")] #endif [assembly: CLSCompliant(true)] diff --git a/Source/Bindings/ZXing.Android/ZXing.Android.csproj b/Source/Bindings/ZXing.Android/ZXing.Android.csproj index 6f2c4c58..d92035ce 100644 --- a/Source/Bindings/ZXing.Android/ZXing.Android.csproj +++ b/Source/Bindings/ZXing.Android/ZXing.Android.csproj @@ -14,7 +14,7 @@ zxing.monoandroid true ..\..\..\Key\private.snk - v2.3 + v5.0 false @@ -56,8 +56,8 @@ - - ..\..\..\packages\ZXing.Net.0.16.6\lib\netstandard2.0\zxing.dll + + ..\..\..\packages\ZXing.Net.0.16.7\lib\netstandard2.0\zxing.dll diff --git a/Source/Bindings/ZXing.Android/nuget-pack.cmd b/Source/Bindings/ZXing.Android/nuget-pack.cmd new file mode 100644 index 00000000..67074cb2 --- /dev/null +++ b/Source/Bindings/ZXing.Android/nuget-pack.cmd @@ -0,0 +1,6 @@ +@ECHO OFF + +SET OUTDIR=..\..\..\Build\Deployment +mkdir %OUTDIR% + +..\..\..\3rdParty\nuget\nuget pack project.nuspec -outputdirectory %OUTDIR% \ No newline at end of file diff --git a/Source/Bindings/ZXing.Android/packages.config b/Source/Bindings/ZXing.Android/packages.config index 1b115298..563d9f4f 100644 --- a/Source/Bindings/ZXing.Android/packages.config +++ b/Source/Bindings/ZXing.Android/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Source/Bindings/ZXing.Android/project.nuspec b/Source/Bindings/ZXing.Android/project.nuspec new file mode 100644 index 00000000..a7342d3d --- /dev/null +++ b/Source/Bindings/ZXing.Android/project.nuspec @@ -0,0 +1,31 @@ + + + + 0.16.7 + Michael Jahn + Michael Jahn + Apache-2.0 + https://licenses.nuget.org/Apache-2.0 + https://github.com/micjahn/ZXing.Net/ + logo.jpg + ZXing.Net.Bindings.Android + ZXing.Net.Bindings.Android + false + ZXing.Net Bindings for Android targets + ZXing.Net Bindings for Android targets + + ZXing Android + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Bindings/ZXing.CoreCompat.System.Drawing.V2/ZXing.CoreCompat.System.Drawing.V2.csproj b/Source/Bindings/ZXing.CoreCompat.System.Drawing.V2/ZXing.CoreCompat.System.Drawing.V2.csproj index 85384cf8..3017f4d3 100644 --- a/Source/Bindings/ZXing.CoreCompat.System.Drawing.V2/ZXing.CoreCompat.System.Drawing.V2.csproj +++ b/Source/Bindings/ZXing.CoreCompat.System.Drawing.V2/ZXing.CoreCompat.System.Drawing.V2.csproj @@ -1,7 +1,7 @@ - 0.16.6-beta + 0.16.7-beta netstandard2.0 netstandard2.0 ZXing.CoreCompat.System.Drawing.v2 @@ -38,7 +38,7 @@ - + diff --git a/Source/Bindings/ZXing.CoreCompat.System.Drawing/ZXing.CoreCompat.System.Drawing.csproj b/Source/Bindings/ZXing.CoreCompat.System.Drawing/ZXing.CoreCompat.System.Drawing.csproj index f7a846aa..ac3d97bc 100644 --- a/Source/Bindings/ZXing.CoreCompat.System.Drawing/ZXing.CoreCompat.System.Drawing.csproj +++ b/Source/Bindings/ZXing.CoreCompat.System.Drawing/ZXing.CoreCompat.System.Drawing.csproj @@ -1,7 +1,7 @@ - 0.16.6 + 0.16.7 netstandard1.3 $(DefineConstants);NETSTANDARD anycpu @@ -32,7 +32,7 @@ - + diff --git a/Source/Bindings/ZXing.CoreCompat.System.Drawing/project.nuspec b/Source/Bindings/ZXing.CoreCompat.System.Drawing/project.nuspec index 4041a1be..b1e342d1 100644 --- a/Source/Bindings/ZXing.CoreCompat.System.Drawing/project.nuspec +++ b/Source/Bindings/ZXing.CoreCompat.System.Drawing/project.nuspec @@ -1,13 +1,13 @@ - 0.16.6-beta + 0.16.7-beta Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.CoreCompat.System.Drawing ZXing.Net.Bindings.CoreCompat.System.Drawing false @@ -17,18 +17,19 @@ ZXing CoreCompat.System.Drawing - + - + + diff --git a/Source/Bindings/ZXing.EmguCV/ZXing.EmguCV.csproj b/Source/Bindings/ZXing.EmguCV/ZXing.EmguCV.csproj index 487123be..03689c63 100644 --- a/Source/Bindings/ZXing.EmguCV/ZXing.EmguCV.csproj +++ b/Source/Bindings/ZXing.EmguCV/ZXing.EmguCV.csproj @@ -1,7 +1,7 @@ - 0.16.1 + 0.16.2 netstandard2.0 $(DefineConstants);NETSTANDARD anycpu @@ -26,7 +26,7 @@ - + diff --git a/Source/Bindings/ZXing.EmguCV/project.nuspec b/Source/Bindings/ZXing.EmguCV/project.nuspec index ca09344c..f064c540 100644 --- a/Source/Bindings/ZXing.EmguCV/project.nuspec +++ b/Source/Bindings/ZXing.EmguCV/project.nuspec @@ -1,13 +1,13 @@ - 0.16.1 + 0.16.2 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.EmguCV ZXing.Net.Bindings.EmguCV false @@ -18,13 +18,14 @@ - + + diff --git a/Source/Bindings/ZXing.Eto.Forms/ZXing.Eto.Forms.csproj b/Source/Bindings/ZXing.Eto.Forms/ZXing.Eto.Forms.csproj index c584a7d8..2eccef32 100644 --- a/Source/Bindings/ZXing.Eto.Forms/ZXing.Eto.Forms.csproj +++ b/Source/Bindings/ZXing.Eto.Forms/ZXing.Eto.Forms.csproj @@ -1,7 +1,7 @@ - 0.16.2 + 0.16.3 netstandard1.0;netstandard2.0 ZXing.Net.Bindings.Eto.Forms anycpu @@ -38,7 +38,7 @@ - + diff --git a/Source/Bindings/ZXing.Eto.Forms/project.nuspec b/Source/Bindings/ZXing.Eto.Forms/project.nuspec index caf87ca7..66d1f921 100644 --- a/Source/Bindings/ZXing.Eto.Forms/project.nuspec +++ b/Source/Bindings/ZXing.Eto.Forms/project.nuspec @@ -1,13 +1,13 @@ - 0.16.2 + 0.16.3 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.Eto.Forms ZXing.Net.Bindings.Eto.Forms false @@ -17,18 +17,19 @@ ZXing Eto - + - + + diff --git a/Source/Bindings/ZXing.ImageSharp/ZXing.ImageSharp.csproj b/Source/Bindings/ZXing.ImageSharp/ZXing.ImageSharp.csproj index e186474d..c5cfd778 100644 --- a/Source/Bindings/ZXing.ImageSharp/ZXing.ImageSharp.csproj +++ b/Source/Bindings/ZXing.ImageSharp/ZXing.ImageSharp.csproj @@ -1,7 +1,7 @@  - 0.16.11 + 0.16.12 netstandard1.3;netstandard2.0;netstandard2.1;net472;netcoreapp2.1;netcoreapp3.1 false $(DefineConstants);NETSTANDARD @@ -29,7 +29,7 @@ - + diff --git a/Source/Bindings/ZXing.ImageSharp/project.nuspec b/Source/Bindings/ZXing.ImageSharp/project.nuspec index 4d46c35b..3e7e448e 100644 --- a/Source/Bindings/ZXing.ImageSharp/project.nuspec +++ b/Source/Bindings/ZXing.ImageSharp/project.nuspec @@ -1,7 +1,7 @@ - 0.16.11 + 0.16.12 Michael Jahn Michael Jahn Apache-2.0 @@ -19,21 +19,21 @@ - + - + - + - + diff --git a/Source/Bindings/ZXing.Kinect/project.V1.nuspec b/Source/Bindings/ZXing.Kinect/project.V1.nuspec index faf5dbc4..dc54eee2 100644 --- a/Source/Bindings/ZXing.Kinect/project.V1.nuspec +++ b/Source/Bindings/ZXing.Kinect/project.V1.nuspec @@ -1,13 +1,13 @@ - 0.16.5 + 0.16.7 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.Kinect.V1 ZXing.Net.Bindings.Kinect.V1 false @@ -17,11 +17,12 @@ ZXing Kinect - + + diff --git a/Source/Bindings/ZXing.Kinect/project.V2.nuspec b/Source/Bindings/ZXing.Kinect/project.V2.nuspec index 167ffbd2..4fb0e579 100644 --- a/Source/Bindings/ZXing.Kinect/project.V2.nuspec +++ b/Source/Bindings/ZXing.Kinect/project.V2.nuspec @@ -1,13 +1,13 @@ - 0.16.5 + 0.16.7 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.Kinect.V2 ZXing.Net.Bindings.Kinect.V2 false @@ -17,11 +17,12 @@ ZXing Kinect - + + diff --git a/Source/Bindings/ZXing.Magick/ZXing.Magick.csproj b/Source/Bindings/ZXing.Magick/ZXing.Magick.csproj index c1ce22ce..d782adaf 100644 --- a/Source/Bindings/ZXing.Magick/ZXing.Magick.csproj +++ b/Source/Bindings/ZXing.Magick/ZXing.Magick.csproj @@ -1,7 +1,7 @@  - 0.16.8 + 0.16.9 net20;net40;netstandard1.3;netstandard2.0 true anycpu @@ -26,8 +26,8 @@ - - + + diff --git a/Source/Bindings/ZXing.Magick/project.nuspec b/Source/Bindings/ZXing.Magick/project.nuspec index 7e5093c7..f1eeb91e 100644 --- a/Source/Bindings/ZXing.Magick/project.nuspec +++ b/Source/Bindings/ZXing.Magick/project.nuspec @@ -1,13 +1,13 @@ - 0.16.8 + 0.16.9 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.Magick ZXing.Net.Bindings.Magick false @@ -17,26 +17,27 @@ ZXing Magick - - + + - - + + - - + + - - + + + diff --git a/Source/Bindings/ZXing.OpenCVSharp.V2/ZXing.OpenCVSharp.V2.csproj b/Source/Bindings/ZXing.OpenCVSharp.V2/ZXing.OpenCVSharp.V2.csproj index bb248917..76d1ada6 100644 --- a/Source/Bindings/ZXing.OpenCVSharp.V2/ZXing.OpenCVSharp.V2.csproj +++ b/Source/Bindings/ZXing.OpenCVSharp.V2/ZXing.OpenCVSharp.V2.csproj @@ -1,7 +1,7 @@ - 0.16.5 + 0.16.6 net20;net35;net40;net45 true anycpu @@ -28,7 +28,7 @@ - + diff --git a/Source/Bindings/ZXing.OpenCVSharp.V2/project.nuspec b/Source/Bindings/ZXing.OpenCVSharp.V2/project.nuspec index 4e73d1f1..c02a375a 100644 --- a/Source/Bindings/ZXing.OpenCVSharp.V2/project.nuspec +++ b/Source/Bindings/ZXing.OpenCVSharp.V2/project.nuspec @@ -1,13 +1,13 @@ - 0.16.5 + 0.16.6 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.OpenCVSharp.V2 ZXing.Net.Bindings.OpenCVSharp.V2 false @@ -17,24 +17,25 @@ ZXing OpenCV - + - + - + - + + diff --git a/Source/Bindings/ZXing.OpenCVSharp.V3/ZXing.OpenCVSharp.V3.csproj b/Source/Bindings/ZXing.OpenCVSharp.V3/ZXing.OpenCVSharp.V3.csproj index ae612fe8..a955e7cb 100644 --- a/Source/Bindings/ZXing.OpenCVSharp.V3/ZXing.OpenCVSharp.V3.csproj +++ b/Source/Bindings/ZXing.OpenCVSharp.V3/ZXing.OpenCVSharp.V3.csproj @@ -1,7 +1,7 @@  - 0.16.6 + 0.16.7 net20;net40;net46;netstandard2.0 true anycpu @@ -27,7 +27,7 @@ - + diff --git a/Source/Bindings/ZXing.OpenCVSharp.V3/project.nuspec b/Source/Bindings/ZXing.OpenCVSharp.V3/project.nuspec index 41b8efee..23c83909 100644 --- a/Source/Bindings/ZXing.OpenCVSharp.V3/project.nuspec +++ b/Source/Bindings/ZXing.OpenCVSharp.V3/project.nuspec @@ -1,13 +1,13 @@ - 0.16.6 + 0.16.7 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.OpenCV ZXing.Net.Bindings.OpenCVSharp.V3 false @@ -17,25 +17,26 @@ ZXing OpenCV - + - + - + - + + diff --git a/Source/Bindings/ZXing.OpenCVSharp.V4/ZXing.OpenCVSharp.V4.csproj b/Source/Bindings/ZXing.OpenCVSharp.V4/ZXing.OpenCVSharp.V4.csproj index 3d5349de..7079402c 100644 --- a/Source/Bindings/ZXing.OpenCVSharp.V4/ZXing.OpenCVSharp.V4.csproj +++ b/Source/Bindings/ZXing.OpenCVSharp.V4/ZXing.OpenCVSharp.V4.csproj @@ -1,8 +1,8 @@  - 0.16.7 - net461;net48;netstandard2.0;netstandard2.1 + 0.16.8 + net461;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0 true anycpu true @@ -16,8 +16,8 @@ false false false - False - ZXing.OpenCV + False + ZXing.OpenCV @@ -28,8 +28,8 @@ - - + + @@ -37,21 +37,11 @@ - - - - - $(DefineConstants);NET46 full - - $(DefineConstants);NET46 - full - - $(DefineConstants);NETSTANDARD portable @@ -62,4 +52,14 @@ portable + + $(DefineConstants);NETSTANDARD + portable + + + + $(DefineConstants);NETSTANDARD + portable + + diff --git a/Source/Bindings/ZXing.OpenCVSharp.V4/project.nuspec b/Source/Bindings/ZXing.OpenCVSharp.V4/project.nuspec index f242e2e3..1006960c 100644 --- a/Source/Bindings/ZXing.OpenCVSharp.V4/project.nuspec +++ b/Source/Bindings/ZXing.OpenCVSharp.V4/project.nuspec @@ -1,13 +1,13 @@ - 0.16.7 + 0.16.8 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.OpenCV.V4 ZXing.Net.Bindings.OpenCVSharp.V4 false @@ -17,37 +17,45 @@ ZXing OpenCV - - - - - - + + - - + + - - + + + + + + + + + + + - - - + + + + + + \ No newline at end of file diff --git a/Source/Bindings/ZXing.SkiaSharp/ZXing.SkiaSharp.csproj b/Source/Bindings/ZXing.SkiaSharp/ZXing.SkiaSharp.csproj index 9d886870..612d50ee 100644 --- a/Source/Bindings/ZXing.SkiaSharp/ZXing.SkiaSharp.csproj +++ b/Source/Bindings/ZXing.SkiaSharp/ZXing.SkiaSharp.csproj @@ -1,7 +1,7 @@  - 0.16.11 + 0.16.12 net462;netstandard1.3;netstandard2.0 true anycpu @@ -28,7 +28,7 @@ - + diff --git a/Source/Bindings/ZXing.SkiaSharp/project.nuspec b/Source/Bindings/ZXing.SkiaSharp/project.nuspec index 28036303..5ec4f41c 100644 --- a/Source/Bindings/ZXing.SkiaSharp/project.nuspec +++ b/Source/Bindings/ZXing.SkiaSharp/project.nuspec @@ -1,13 +1,13 @@ - 0.16.11 + 0.16.12 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.SkiaSharp ZXing.Net.Bindings.SkiaSharp false @@ -18,22 +18,23 @@ - + - + - + + diff --git a/Source/Bindings/ZXing.Unity3D/ZXing.Unity3D.csproj b/Source/Bindings/ZXing.Unity3D/ZXing.Unity3D.csproj index ea9844b7..d7442090 100644 --- a/Source/Bindings/ZXing.Unity3D/ZXing.Unity3D.csproj +++ b/Source/Bindings/ZXing.Unity3D/ZXing.Unity3D.csproj @@ -1,6 +1,6 @@  - 0.16.5 + 0.16.6 netstandard2.0;net35 ZXing.Unity ZXing.Unity @@ -17,7 +17,7 @@ False - + diff --git a/Source/Bindings/ZXing.Windows.Compatibility/ZXing.Windows.Compatibility.csproj b/Source/Bindings/ZXing.Windows.Compatibility/ZXing.Windows.Compatibility.csproj index e55cca6e..2c285ff7 100644 --- a/Source/Bindings/ZXing.Windows.Compatibility/ZXing.Windows.Compatibility.csproj +++ b/Source/Bindings/ZXing.Windows.Compatibility/ZXing.Windows.Compatibility.csproj @@ -1,8 +1,8 @@  - 0.16.8 - netstandard2.0;netcoreapp3.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0 + 0.16.9 + netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0 false ZXing.Net.Bindings.Windows.Compatibility anycpu @@ -43,7 +43,7 @@ - + diff --git a/Source/Bindings/ZXing.Windows.Compatibility/project.nuspec b/Source/Bindings/ZXing.Windows.Compatibility/project.nuspec index 779edc73..55e0778f 100644 --- a/Source/Bindings/ZXing.Windows.Compatibility/project.nuspec +++ b/Source/Bindings/ZXing.Windows.Compatibility/project.nuspec @@ -1,13 +1,13 @@ - 0.16.8 + 0.16.9 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.Windows.Compatibility ZXing.Net.Bindings.Windows.Compatibility false @@ -17,36 +17,37 @@ ZXing Windows Compatibility Pack - + - + - + - + - + - + + diff --git a/Source/Bindings/ZXing.ZKWeb.System.Drawing/ZXing.ZKWeb.System.Drawing.csproj b/Source/Bindings/ZXing.ZKWeb.System.Drawing/ZXing.ZKWeb.System.Drawing.csproj index 54050f83..fda71e34 100644 --- a/Source/Bindings/ZXing.ZKWeb.System.Drawing/ZXing.ZKWeb.System.Drawing.csproj +++ b/Source/Bindings/ZXing.ZKWeb.System.Drawing/ZXing.ZKWeb.System.Drawing.csproj @@ -1,6 +1,6 @@ - 0.16.5 + 0.16.6 netstandard2.0;net45 ZXing.Net.Bindings.ZKWeb.System.Drawing anycpu @@ -36,7 +36,7 @@ - + diff --git a/Source/Bindings/ZXing.ZKWeb.System.Drawing/project.nuspec b/Source/Bindings/ZXing.ZKWeb.System.Drawing/project.nuspec index e2940f4a..504e5ce9 100644 --- a/Source/Bindings/ZXing.ZKWeb.System.Drawing/project.nuspec +++ b/Source/Bindings/ZXing.ZKWeb.System.Drawing/project.nuspec @@ -1,13 +1,13 @@ - 0.16.5 + 0.16.6 Michael Jahn Michael Jahn Apache-2.0 https://licenses.nuget.org/Apache-2.0 https://github.com/micjahn/ZXing.Net/ - https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + logo.jpg ZXing.Net.Bindings.ZKWeb.System.Drawing ZXing.Net.Bindings.ZKWeb.System.Drawing false @@ -17,17 +17,18 @@ ZXing ZKWeb.System.Drawing - + - + + diff --git a/nuget-pack.bindings.cmd b/nuget-pack.bindings.cmd index ddee9dd8..962b3916 100644 --- a/nuget-pack.bindings.cmd +++ b/nuget-pack.bindings.cmd @@ -6,6 +6,8 @@ CD "%CURRENT_DIR%\Source\Bindings\ZXing.Android\" CALL nuget-pack.cmd CD "%CURRENT_DIR%\Source\Bindings\ZXing.CoreCompat.System.Drawing\" CALL nuget-pack.cmd +CD "%CURRENT_DIR%\Source\Bindings\ZXing.EmguCV\" +CALL nuget-pack.cmd CD "%CURRENT_DIR%\Source\Bindings\ZXing.Eto.Forms\" CALL nuget-pack.cmd CD "%CURRENT_DIR%\Source\Bindings\ZXing.ImageSharp\" diff --git a/zxing.vs2019.sln b/zxing.vs2019.sln index a62728c6..ec2a66b1 100644 --- a/zxing.vs2019.sln +++ b/zxing.vs2019.sln @@ -160,6 +160,8 @@ Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "zxing.net4.7.doc", "Source\ EndProject Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "zxing.net4.8.doc", "Source\lib\documentation\zxing.net4.8.doc.shfbproj", "{2C6DE13F-8129-453A-9BB5-997077EAE269}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Android", "Source\Bindings\ZXing.Android\ZXing.Android.csproj", "{8080C792-EB9B-4CE8-B52E-740ABB68AE50}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - Reduced|Any CPU = Debug - Reduced|Any CPU @@ -1809,6 +1811,38 @@ Global {2C6DE13F-8129-453A-9BB5-997077EAE269}.Release|x64.Build.0 = Release|Any CPU {2C6DE13F-8129-453A-9BB5-997077EAE269}.Release|x86.ActiveCfg = Release|Any CPU {2C6DE13F-8129-453A-9BB5-997077EAE269}.Release|x86.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|Any CPU.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|Any CPU.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|ARM.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|ARM.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x64.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x64.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x86.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x86.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|ARM.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x64.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x64.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x86.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x86.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|Any CPU.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|Any CPU.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|ARM.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|ARM.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x64.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x64.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x86.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x86.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|Any CPU.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|ARM.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|ARM.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x64.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x64.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x86.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1857,6 +1891,7 @@ Global {861AD178-2F4D-4E95-B37B-ACCF768C82D9} = {369FB285-4E6C-428A-9CC3-45FC75ECDFC1} {4782824C-DD85-427B-8102-70A87C1A7DE0} = {7D5D173D-0A00-4F57-9F02-0739E4C70555} {2C6DE13F-8129-453A-9BB5-997077EAE269} = {7D5D173D-0A00-4F57-9F02-0739E4C70555} + {8080C792-EB9B-4CE8-B52E-740ABB68AE50} = {E3647B3A-B903-402A-B7F7-711A4A1512B9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73A9B453-AE71-4A98-B68A-2389573CD311} diff --git a/zxing.vs2022.sln b/zxing.vs2022.sln index 413630ca..d9129066 100644 --- a/zxing.vs2022.sln +++ b/zxing.vs2022.sln @@ -160,6 +160,8 @@ Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "zxing.net4.7.doc", "Source\ EndProject Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "zxing.net4.8.doc", "Source\lib\documentation\zxing.net4.8.doc.shfbproj", "{2C6DE13F-8129-453A-9BB5-997077EAE269}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Android", "Source\Bindings\ZXing.Android\ZXing.Android.csproj", "{8080C792-EB9B-4CE8-B52E-740ABB68AE50}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug - Reduced|Any CPU = Debug - Reduced|Any CPU @@ -1782,6 +1784,38 @@ Global {2C6DE13F-8129-453A-9BB5-997077EAE269}.Release|x64.Build.0 = Release|Any CPU {2C6DE13F-8129-453A-9BB5-997077EAE269}.Release|x86.ActiveCfg = Release|Any CPU {2C6DE13F-8129-453A-9BB5-997077EAE269}.Release|x86.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|Any CPU.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|Any CPU.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|ARM.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|ARM.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x64.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x64.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x86.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug - Reduced|x86.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|ARM.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x64.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x64.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x86.ActiveCfg = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Debug|x86.Build.0 = Debug|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|Any CPU.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|Any CPU.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|ARM.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|ARM.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x64.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x64.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x86.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release with Documentation|x86.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|Any CPU.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|ARM.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|ARM.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x64.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x64.Build.0 = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x86.ActiveCfg = Release|Any CPU + {8080C792-EB9B-4CE8-B52E-740ABB68AE50}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1830,6 +1864,7 @@ Global {861AD178-2F4D-4E95-B37B-ACCF768C82D9} = {369FB285-4E6C-428A-9CC3-45FC75ECDFC1} {4782824C-DD85-427B-8102-70A87C1A7DE0} = {7D5D173D-0A00-4F57-9F02-0739E4C70555} {2C6DE13F-8129-453A-9BB5-997077EAE269} = {7D5D173D-0A00-4F57-9F02-0739E4C70555} + {8080C792-EB9B-4CE8-B52E-740ABB68AE50} = {E3647B3A-B903-402A-B7F7-711A4A1512B9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {73A9B453-AE71-4A98-B68A-2389573CD311}