diff --git a/Clients/ASP.NetCoreDemo/Helper/BarcodeTagHelper.cs b/Clients/ASP.NetCoreDemo/Helper/BarcodeTagHelper.cs index bc953c6a..31773a39 100644 --- a/Clients/ASP.NetCoreDemo/Helper/BarcodeTagHelper.cs +++ b/Clients/ASP.NetCoreDemo/Helper/BarcodeTagHelper.cs @@ -20,7 +20,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers; using ZXing; -using ZXing.QrCode; +using ZXing.Common; namespace ASP.NetCoreDemo.Helper { @@ -42,16 +42,16 @@ public override void Process(TagHelperContext context, TagHelperOutput output) var alt = context.AllAttributes["alt"]?.Value.ToString(); var width = - Convert.ToInt32(context.AllAttributes["width"] == null - ? "500" + Convert.ToInt32(String.IsNullOrEmpty(context.AllAttributes["width"]?.Value.ToString()) + ? "1" : context.AllAttributes["width"].Value.ToString()); var height = - Convert.ToInt32(context.AllAttributes["height"] == null - ? "500" + Convert.ToInt32(String.IsNullOrEmpty(context.AllAttributes["height"]?.Value.ToString()) + ? "1" : context.AllAttributes["height"].Value.ToString()); var margin = - Convert.ToInt32(context.AllAttributes["margin"] == null - ? "5" + Convert.ToInt32(String.IsNullOrEmpty(context.AllAttributes["margin"]?.Value.ToString()) + ? "0" : context.AllAttributes["margin"].Value.ToString()); var barcodeformat = BarcodeFormat.QR_CODE; var outputformat = OutputFormat.PNG; @@ -88,7 +88,7 @@ private void GeneratePng(TagHelperOutput output, string content, BarcodeFormat b var qrWriter = new ZXing.BarcodeWriterPixelData { Format = barcodeformat, - Options = new QrCodeEncodingOptions { Height = height, Width = width, Margin = margin } + Options = new EncodingOptions { Height = height, Width = width, Margin = margin } }; @@ -131,7 +131,7 @@ private void GenerateSvg(TagHelperOutput output, string content, BarcodeFormat b var qrWriter = new ZXing.BarcodeWriterSvg { Format = barcodeformat, - Options = new QrCodeEncodingOptions { Height = height, Width = width, Margin = margin } + Options = new EncodingOptions { Height = height, Width = width, Margin = margin } }; diff --git a/Clients/ASP.NetCoreDemo/Views/Home/Encode.cshtml b/Clients/ASP.NetCoreDemo/Views/Home/Encode.cshtml index e9a48049..11989cfa 100644 --- a/Clients/ASP.NetCoreDemo/Views/Home/Encode.cshtml +++ b/Clients/ASP.NetCoreDemo/Views/Home/Encode.cshtml @@ -11,7 +11,7 @@

Content:

- +

Type:

@@ -23,15 +23,15 @@

Width:

- +

Height:

- +

Margin:

- +
diff --git a/Source/Bindings/ZXing.Kinect/project.V1.nuspec b/Source/Bindings/ZXing.Kinect/project.V1.nuspec new file mode 100644 index 00000000..769661be --- /dev/null +++ b/Source/Bindings/ZXing.Kinect/project.V1.nuspec @@ -0,0 +1,28 @@ + + + + 0.16.0 + Michael Jahn + Michael Jahn + http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/micjahn/ZXing.Net/ + https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + ZXing.Net.Bindings.Kinect.V1 + ZXing.Net.Bindings.Kinect.V1 + false + ZXing.Net Bindings for Kinect V1 - use Kinect with ZXing.Net for barcode reading + ZXing.Net Bindings for Kinect V1 + + ZXing Kinect + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Bindings/ZXing.Kinect/project.V2.nuspec b/Source/Bindings/ZXing.Kinect/project.V2.nuspec new file mode 100644 index 00000000..4e053a41 --- /dev/null +++ b/Source/Bindings/ZXing.Kinect/project.V2.nuspec @@ -0,0 +1,28 @@ + + + + 0.16.0 + Michael Jahn + Michael Jahn + http://www.apache.org/licenses/LICENSE-2.0 + https://github.com/micjahn/ZXing.Net/ + https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg + ZXing.Net.Bindings.Kinect.V2 + ZXing.Net.Bindings.Kinect.V2 + false + ZXing.Net Bindings for Kinect V2 - use Kinect with ZXing.Net for barcode reading + ZXing.Net Bindings for Kinect V2 + + ZXing Kinect + + + + + + + + + + + + \ No newline at end of file diff --git a/build_deployment.cmd b/build_deployment.cmd index ab47cb30..d07f0ccf 100644 --- a/build_deployment.cmd +++ b/build_deployment.cmd @@ -40,9 +40,9 @@ IF NOT EXIST "%BINARY_DIR%\wp7.1\zxing.wp7.1.dll" GOTO BINARY_WP71_NOT_FOUND IF NOT EXIST "%BINARY_DIR%\wp8.0\zxing.wp8.0.dll" GOTO BINARY_WP80_NOT_FOUND IF NOT EXIST "%BINARY_DIR%\monodroid\zxing.monoandroid.dll" GOTO BINARY_MONODROID_NOT_FOUND IF NOT EXIST "%BINARY_DIR%\winmd\zxing.winmd" GOTO BINARY_WINRTCOMPONENTS_NOT_FOUND -IF NOT EXIST "%CURRENT_DIR%\Source\lib\netstandard\bin\Release\netstandard1.0\zxing.dll" GOTO BINARY_NETSTANDARD10_NOT_FOUND -IF NOT EXIST "%CURRENT_DIR%\Source\lib\netstandard\bin\Release\netstandard1.1\zxing.dll" GOTO BINARY_NETSTANDARD11_NOT_FOUND -IF NOT EXIST "%CURRENT_DIR%\Source\lib\netstandard\bin\Release\netstandard1.3\zxing.dll" GOTO BINARY_NETSTANDARD13_NOT_FOUND +IF NOT EXIST "%CURRENT_DIR%\Source\lib\ZXing.Net\bin\Release\netstandard1.0\zxing.dll" GOTO BINARY_NETSTANDARD10_NOT_FOUND +IF NOT EXIST "%CURRENT_DIR%\Source\lib\ZXing.Net\bin\Release\netstandard1.1\zxing.dll" GOTO BINARY_NETSTANDARD11_NOT_FOUND +IF NOT EXIST "%CURRENT_DIR%\Source\lib\ZXing.Net\bin\Release\netstandard1.3\zxing.dll" GOTO BINARY_NETSTANDARD13_NOT_FOUND IF NOT EXIST "%CURRENT_DIR%\Source\Bindings\ZXing.CoreCompat.System.Drawing\bin\Release\netstandard1.3\zxing.corecompat.system.drawing.dll" GOTO BINARY_CORECOMPAT_NOT_FOUND IF NOT EXIST "%CURRENT_DIR%\Source\Bindings\ZXing.ImageSharp\bin\Release\netstandard1.1\zxing.imagesharp.dll" GOTO BINARY_IMAGESHARP_NOT_FOUND IF NOT EXIST "%BINARY_DIR%\Bindings\kinect\V1\zxing.kinect.dll" GOTO BINARY_KINECT_V1_NOT_FOUND @@ -164,6 +164,8 @@ MKDIR "%SVN_EXPORT_DIR%\WinMD\Source\lib" >NUL: 2>&1 MKDIR "%SVN_EXPORT_DIR%\WinMD\Clients" >NUL: 2>&1 "%SVN_TOOL%" export --force "%SVN_URL%/Source/lib" "%SVN_EXPORT_DIR%\Base\Source\lib" +"%SVN_TOOL%" export --force "%SVN_URL%/Source/Bindings" "%SVN_EXPORT_DIR%\Base\Source\Bindings" +"%SVN_TOOL%" export --force "%SVN_URL%/Source/interop" "%SVN_EXPORT_DIR%\Base\Source\interop" "%SVN_TOOL%" export --force "%SVN_URL%/Source/test/src" "%SVN_EXPORT_DIR%\Base\Source\test\src" "%SVN_TOOL%" export --force "%SVN_URL%/Clients" "%SVN_EXPORT_DIR%\Base\Clients" "%SVN_TOOL%" export --force "%SVN_URL%/3rdparty/AForge" "%SVN_EXPORT_DIR%\Base\3rdparty\AForge" @@ -190,7 +192,7 @@ MKDIR "%SVN_EXPORT_DIR%\WinMD\Clients" >NUL: 2>&1 "%SVN_TOOL%" export --force "%SVN_URL_WINMD%/zxing.vs2012.sln" "%SVN_EXPORT_DIR%\WinMD" CD "%SVN_EXPORT_DIR%" -"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_SOURCE%" Base\Source\lib\*.* Base\Source\test\src\*.* Base\Clients\*.* Base\3rdparty\*.* Base\Key\*.* Base\zxing.sln Base\zxing.ce.sln Base\zxing.vs2012.sln Base\zxing.vs2015.sln Base\zxing.monoandroid.sln Base\zxing.monotouch.sln Base\zxing.nunit Base\THANKS Base\COPYING WinMD\Source\lib\*.* WinMD\Clients\*.* WinMD\Key\*.* WinMD\zxing.vs2012.sln +"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_SOURCE%" Base\Source\lib\*.* Base\Source\Bindings\*.* Base\Source\interop\*.* Base\Source\test\src\*.* Base\Clients\*.* Base\3rdparty\*.* Base\Key\*.* Base\zxing.sln Base\zxing.ce.sln Base\zxing.vs2012.sln Base\zxing.vs2015.sln Base\zxing.monoandroid.sln Base\zxing.monotouch.sln Base\zxing.nunit Base\THANKS Base\COPYING WinMD\Source\lib\*.* WinMD\Clients\*.* WinMD\Key\*.* WinMD\zxing.vs2012.sln CD "%CURRENT_DIR%" RMDIR /S /Q "%SVN_EXPORT_DIR%" >NUL: 2>&1 @@ -396,21 +398,21 @@ GOTO END :BINARY_NETSTANDARD10_NOT_FOUND ECHO The .Net Standard 1.0 binaries -ECHO %CURRENT_DIR%\Source\lib\netstandard\bin\Release\netstandard1.0\... +ECHO %CURRENT_DIR%\Source\lib\ZXing.Net\bin\Release\netstandard1.0\... ECHO weren't found. ECHO. GOTO END :BINARY_NETSTANDARD11_NOT_FOUND ECHO The .Net Standard 1.1 binaries -ECHO %CURRENT_DIR%\Source\lib\netstandard\bin\Release\netstandard1.1\... +ECHO %CURRENT_DIR%\Source\lib\ZXing.Net\bin\Release\netstandard1.1\... ECHO weren't found. ECHO. GOTO END :BINARY_NETSTANDARD13_NOT_FOUND ECHO The .Net Standard 1.3 binaries -ECHO %CURRENT_DIR%\Source\lib\netstandard\bin\Release\netstandard1.3\... +ECHO %CURRENT_DIR%\Source\lib\ZXing.Net\bin\Release\netstandard1.3\... ECHO weren't found. ECHO. GOTO END diff --git a/nuget-pack.cmd b/nuget-pack.cmd index d0705a0b..ed6b5861 100644 --- a/nuget-pack.cmd +++ b/nuget-pack.cmd @@ -4,10 +4,10 @@ SET OUTDIR=Build\Deployment mkdir %OUTDIR% 3rdParty\nuget\nuget pack zxing.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.CoreCompat.System.Drawing\project.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.ImageSharp\project.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.Magick\project.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.OpenCV\project.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.SkiaSharp\project.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.Kinect\project.V1.nuspec -outputdirectory %OUTDIR% -3rdParty\nuget\nuget pack Source\adapters\ZXing.Kinect\project.V2.nuspec -outputdirectory %OUTDIR% \ No newline at end of file +3rdParty\nuget\nuget pack Source\Bindings\ZXing.CoreCompat.System.Drawing\project.nuspec -outputdirectory %OUTDIR% +3rdParty\nuget\nuget pack Source\Bindings\ZXing.ImageSharp\project.nuspec -outputdirectory %OUTDIR% +3rdParty\nuget\nuget pack Source\Bindings\ZXing.Magick\project.nuspec -outputdirectory %OUTDIR% +3rdParty\nuget\nuget pack Source\Bindings\ZXing.OpenCV\project.nuspec -outputdirectory %OUTDIR% +3rdParty\nuget\nuget pack Source\Bindings\ZXing.SkiaSharp\project.nuspec -outputdirectory %OUTDIR% +3rdParty\nuget\nuget pack Source\Bindings\ZXing.Kinect\project.V1.nuspec -outputdirectory %OUTDIR% +3rdParty\nuget\nuget pack Source\Bindings\ZXing.Kinect\project.V2.nuspec -outputdirectory %OUTDIR% \ No newline at end of file diff --git a/nuget-push.cmd b/nuget-push.cmd index bcc74d0e..0099a9aa 100644 --- a/nuget-push.cmd +++ b/nuget-push.cmd @@ -6,11 +6,11 @@ SET VERSION=0.16.0 echo Next step - uploading all nuget packages to nuget.org... pause -3rdParty\nuget\nuget push Build\Deployment\%ID%.%VERSION%.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.CoreCompat.System.Drawing.%VERSION%-beta.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.ImageSharp.%VERSION%-beta.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.Kinect.V1.%VERSION%.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.Kinect.V2.%VERSION%.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.Magick.%VERSION%.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.OpenCV.%VERSION%.nupkg -3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.SkiaSharp.%VERSION%.nupkg \ No newline at end of file +3rdParty\nuget\nuget push Build\Deployment\%ID%.%VERSION%.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.CoreCompat.System.Drawing.%VERSION%-beta.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.ImageSharp.%VERSION%-beta.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.Kinect.V1.%VERSION%.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.Kinect.V2.%VERSION%.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.Magick.%VERSION%.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.OpenCV.%VERSION%.nupkg -Source https://www.nuget.org/api/v2/package +3rdParty\nuget\nuget push Build\Deployment\%ID%.Bindings.SkiaSharp.%VERSION%.nupkg -Source https://www.nuget.org/api/v2/package \ No newline at end of file diff --git a/zxing.nuspec b/zxing.nuspec index f6309cb0..39479240 100644 --- a/zxing.nuspec +++ b/zxing.nuspec @@ -122,14 +122,14 @@ It is now compatible with .Net 2.0, .Net 3.5, .Net 4.0, .Net 4.5, .Net 4.6, .Net - - - - - - - - - + + + + + + + + + \ No newline at end of file