Skip to content

Commit 6527d6b

Browse files
micjahnmicjahn
committed
switching to 0.17
1 parent 99443e9 commit 6527d6b

9 files changed

+62
-10
lines changed

‎Source/interop/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
// You can specify all the values or you can default the Revision and Build Numbers
7676
// by using the '*' as shown below:
7777

78-
[assembly: AssemblyVersion("0.16.7.0")]
79-
[assembly: AssemblyFileVersion("0.16.7.0")]
78+
[assembly: AssemblyVersion("0.17.0.0")]
79+
[assembly: AssemblyFileVersion("0.17.0.0")]
8080

8181
[assembly: CLSCompliant(true)]
8282
[assembly: ComVisible(false)]

‎Source/lib/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
// You can specify all the values or you can default the Revision and Build Numbers
7373
// by using the '*' as shown below:
7474

75-
[assembly: AssemblyVersion("0.16.7.0")]
76-
[assembly: AssemblyFileVersion("0.16.7.0")]
75+
[assembly: AssemblyVersion("0.17.0.0")]
76+
[assembly: AssemblyFileVersion("0.17.0.0")]
7777

7878
[assembly: CLSCompliant(true)]
7979

‎Source/lib/netstandard/ZXing.Net.csproj

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
88
</PropertyGroup>
99
<PropertyGroup>
10-
<VersionPrefix>0.16.7</VersionPrefix>
10+
<VersionPrefix>0.17.0</VersionPrefix>
1111
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1212
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
1313
<PlatformTarget>anycpu</PlatformTarget>
@@ -77,6 +77,10 @@
7777
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
7878
</PropertyGroup>
7979

80+
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
81+
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
82+
</PropertyGroup>
83+
8084
<ItemGroup>
8185
<Compile Include="..\Properties\AssemblyInfo.cs;..\renderer\IBarcodeRenderer.cs;..\renderer\PixelData.cs;..\renderer\PixelDataRenderer.cs;..\renderer\SVGRenderer.cs;..\renderer\StringRenderer.cs;..\BarcodeFormat.cs;..\BarcodeReader.ByteArray.cs;..\BarcodeReaderCustom.cs;..\BarcodeReaderGeneric.cs;..\BarcodeWriter.PixelData.cs;..\BarcodeWriter.SvgImage.cs;..\BarcodeWriterCustom.cs;..\BarcodeWriterGeneric.cs;..\BaseLuminanceSource.cs;..\Binarizer.cs;..\BinaryBitmap.cs;..\DecodeHintType.cs;..\Dimension.cs;..\EncodeHintType.cs;..\FormatException.cs;..\IBarcodeReader.cs;..\IBarcodeReader.Multiple.cs;..\IBarcodeReaderCustom.cs;..\IBarcodeReaderCustom.Multiple.cs;..\IBarcodeReaderGeneric.cs;..\IBarcodeReaderGeneric.Multiple.cs;..\IBarcodeWriter.cs;..\IBarcodeWriter.PixelData.cs;..\IBarcodeWriter.SvgImage.cs;..\IBarcodeWriterCustom.cs;..\IBarcodeWriterGeneric.cs;..\InvertedLuminanceSource.cs;..\LuminanceSource.cs;..\MultiFormatReader.cs;..\MultiFormatWriter.cs;..\PlanarYUVLuminanceSource.cs;..\Reader.cs;..\ReaderException.cs;..\Result.cs;..\ResultMetadataType.cs;..\ResultPoint.cs;..\ResultPointCallback.cs;..\RGBLuminanceSource.cs;..\SupportClass.cs;..\Writer.cs;..\WriterException.cs" />
8286
<Compile Include="..\aztec\**;..\client\**;..\common\**;..\datamatrix\**;..\imb\**;..\maxicode\**;..\multi\**;..\oned\**;..\pdf417\**;..\qrcode\**" Exclude="..\client\result\optional\**\*;..\common\BigInteger\**\*;bin\**;obj\**;**\*.xproj;packages\**;..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;" />
@@ -125,4 +129,8 @@
125129
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
126130
</ItemGroup>
127131

132+
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
133+
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
134+
</ItemGroup>
135+
128136
</Project>

‎build_deployment.cmd

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
SETLOCAL EnableDelayedExpansion EnableExtensions
44

5-
SET VERSION=0.16.7.0
5+
SET VERSION=0.17.0.0
66

77
SET CURRENT_DIR=%CD%
88
SET BUILD_DIR=%CD%\Build
@@ -141,7 +141,7 @@ CD "%BINARY_DIR%"
141141
echo Build assembly archive...
142142
echo.
143143

144-
"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" ce2.0 ce3.5 net2.0 net2.0.unsigned net3.5 net4.0 net4.0.unsigned net4.5 net4.6 net4.7 net4.8 net5.0 net6.0 winrt uwp netcoreapp netstandard unity wp7.0 wp7.1 wp8.0 winmd portable interop ..\..\THANKS ..\..\COPYING -xr^^!Documentation >> %LOGFILE% 2>&1
144+
"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" ce2.0 ce3.5 net2.0 net2.0.unsigned net3.5 net4.0 net4.0.unsigned net4.5 net4.6 net4.7 net4.8 net5.0 net6.0 net7.0 winrt uwp netcoreapp netstandard unity wp7.0 wp7.1 wp8.0 winmd portable interop ..\..\THANKS ..\..\COPYING -xr^^!Documentation >> %LOGFILE% 2>&1
145145
if ERRORLEVEL 1 GOTO ERROR_OPERATION
146146

147147
echo Build assembly archive - demo clients...

‎build_deployment_copy_operations.txt

+3
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@
2525
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.dll %BINARY_DIR%\net6.0\
2626
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.pdb %BINARY_DIR%\net6.0\
2727
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.xml %BINARY_DIR%\net6.0\
28+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.dll %BINARY_DIR%\net7.0\
29+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.pdb %BINARY_DIR%\net7.0\
30+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.xml %BINARY_DIR%\net7.0\

‎build_deployment_files.txt

+1
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\netcoreapp3.1\zxing.dll
2828
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net5.0\zxing.dll
2929
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.dll
30+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.dll

‎build_deployment_strong_named_files.txt

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\netcoreapp3.1\zxing.dll
2424
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net5.0\zxing.dll
2525
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.dll
26+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.dll

‎zxing.nuspec

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
4-
<version>0.16.7</version>
4+
<version>0.17.0</version>
55
<authors>Michael Jahn</authors>
66
<owners>Michael Jahn</owners>
77
<license type="expression">Apache-2.0</license>
@@ -15,9 +15,9 @@
1515
ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.
1616
It has been ported by hand with a lot of optimizations and improvements.
1717

18-
It is compatible with .Net 2.0, .Net 3.5, .Net 4.x, .Net 5.x, .Net 6.x, Windows RT Class Library and Components, UWP, .Net Standard 1.x and 2.0x, .Net Core App 3.x, Silverlight 4 (only up to 0.16.x), Silverlight 5 (only up to 0.16.x), Windows Phone 7.x (only up to 0.16.x) and Windows Phone 8.x (only up to 0.16.x) and Xamarin.Android</description>
18+
It is compatible with .Net 2.0, .Net 3.5, .Net 4.x, .Net 5.x, .Net 6.x, .Net 7.x, Windows RT Class Library and Components, UWP, .Net Standard 1.x and 2.0x, .Net Core App 3.x, Silverlight 4 (only up to 0.16.x), Silverlight 5 (only up to 0.16.x), Windows Phone 7.x (only up to 0.16.x) and Windows Phone 8.x (only up to 0.16.x) and Xamarin.Android</description>
1919
<summary>ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.</summary>
20-
<releaseNotes>* changes of the java version are reflected until 2021/12/08
20+
<releaseNotes>* changes of the java version are reflected until 2023/02/21
2121
* many small bug fixes and improvements</releaseNotes>
2222
<tags>ZXing barcode scanning 1D 2D UPC-A UPC-E EAN-8 EAN-13 QR ITF Codabar RSS-14 Data Matrix PDF 417 PDF417 Aztec</tags>
2323
<dependencies>
@@ -30,6 +30,7 @@
3030
<group targetFramework="net48" />
3131
<group targetFramework="net50" />
3232
<group targetFramework="net60" />
33+
<group targetFramework="net70" />
3334
<group targetFramework="windows8-managed" />
3435
<group targetFramework="windows8" />
3536
<group targetFramework="native" />
@@ -98,6 +99,9 @@
9899
<file src="Build\Release\net6.0\zxing.dll" target="lib\net6.0\zxing.dll" />
99100
<file src="Build\Release\net6.0\zxing.pdb" target="lib\net6.0\zxing.pdb" />
100101
<file src="Build\Release\net6.0\zxing.XML" target="lib\net6.0\zxing.XML" />
102+
<file src="Build\Release\net7.0\zxing.dll" target="lib\net7.0\zxing.dll" />
103+
<file src="Build\Release\net7.0\zxing.pdb" target="lib\net7.0\zxing.pdb" />
104+
<file src="Build\Release\net7.0\zxing.XML" target="lib\net7.0\zxing.XML" />
101105
<file src="Build\Release\winrt\zxing.winrt.dll" target="lib\windows8-managed\zxing.winrt.dll" />
102106
<file src="Build\Release\winrt\zxing.winrt.pdb" target="lib\windows8-managed\zxing.winrt.pdb" />
103107
<file src="Build\Release\winrt\zxing.winrt.XML" target="lib\windows8-managed\zxing.winrt.XML" />

‎zxing.vs2022.sln

+35
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.Android", "Source\Bin
150150
EndProject
151151
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZXing.EmguCV.Test", "Source\Bindings\Tests\ZXing.EmguCV\ZXing.EmguCV.Test.csproj", "{3E1FFA98-B3E1-47F6-AB50-3EC4FB7E710C}"
152152
EndProject
153+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZXing.ImageSharp.V2", "Source\Bindings\ZXing.ImageSharp.V2\ZXing.ImageSharp.V2.csproj", "{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}"
154+
EndProject
153155
Global
154156
GlobalSection(SolutionConfigurationPlatforms) = preSolution
155157
Debug - Reduced|Any CPU = Debug - Reduced|Any CPU
@@ -1666,6 +1668,38 @@ Global
16661668
{3E1FFA98-B3E1-47F6-AB50-3EC4FB7E710C}.Release|x64.Build.0 = Release|Any CPU
16671669
{3E1FFA98-B3E1-47F6-AB50-3EC4FB7E710C}.Release|x86.ActiveCfg = Release|Any CPU
16681670
{3E1FFA98-B3E1-47F6-AB50-3EC4FB7E710C}.Release|x86.Build.0 = Release|Any CPU
1671+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|Any CPU.ActiveCfg = Debug|Any CPU
1672+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|Any CPU.Build.0 = Debug|Any CPU
1673+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|ARM.ActiveCfg = Debug|Any CPU
1674+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|ARM.Build.0 = Debug|Any CPU
1675+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|x64.ActiveCfg = Debug|Any CPU
1676+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|x64.Build.0 = Debug|Any CPU
1677+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|x86.ActiveCfg = Debug|Any CPU
1678+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug - Reduced|x86.Build.0 = Debug|Any CPU
1679+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1680+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1681+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|ARM.ActiveCfg = Debug|Any CPU
1682+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|ARM.Build.0 = Debug|Any CPU
1683+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|x64.ActiveCfg = Debug|Any CPU
1684+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|x64.Build.0 = Debug|Any CPU
1685+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|x86.ActiveCfg = Debug|Any CPU
1686+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Debug|x86.Build.0 = Debug|Any CPU
1687+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|Any CPU.ActiveCfg = Release|Any CPU
1688+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|Any CPU.Build.0 = Release|Any CPU
1689+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|ARM.ActiveCfg = Release|Any CPU
1690+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|ARM.Build.0 = Release|Any CPU
1691+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|x64.ActiveCfg = Release|Any CPU
1692+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|x64.Build.0 = Release|Any CPU
1693+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|x86.ActiveCfg = Release|Any CPU
1694+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release with Documentation|x86.Build.0 = Release|Any CPU
1695+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
1696+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|Any CPU.Build.0 = Release|Any CPU
1697+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|ARM.ActiveCfg = Release|Any CPU
1698+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|ARM.Build.0 = Release|Any CPU
1699+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|x64.ActiveCfg = Release|Any CPU
1700+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|x64.Build.0 = Release|Any CPU
1701+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|x86.ActiveCfg = Release|Any CPU
1702+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A}.Release|x86.Build.0 = Release|Any CPU
16691703
EndGlobalSection
16701704
GlobalSection(SolutionProperties) = preSolution
16711705
HideSolutionNode = FALSE
@@ -1709,6 +1743,7 @@ Global
17091743
{2C6DE13F-8129-453A-9BB5-997077EAE269} = {7D5D173D-0A00-4F57-9F02-0739E4C70555}
17101744
{8080C792-EB9B-4CE8-B52E-740ABB68AE50} = {E3647B3A-B903-402A-B7F7-711A4A1512B9}
17111745
{3E1FFA98-B3E1-47F6-AB50-3EC4FB7E710C} = {369FB285-4E6C-428A-9CC3-45FC75ECDFC1}
1746+
{CED0DDBB-E431-476A-BFED-F6AFF0D2CC8A} = {E3647B3A-B903-402A-B7F7-711A4A1512B9}
17121747
EndGlobalSection
17131748
GlobalSection(ExtensibilityGlobals) = postSolution
17141749
SolutionGuid = {73A9B453-AE71-4A98-B68A-2389573CD311}

0 commit comments

Comments
 (0)