Skip to content

Commit ed8bd8e

Browse files
micjahnmicjahn
committed
preparing release 0.16.7
1 parent b8f7159 commit ed8bd8e

8 files changed

+45
-49
lines changed

‎Source/interop/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@
8484
// You can specify all the values or you can default the Revision and Build Numbers
8585
// by using the '*' as shown below:
8686

87-
[assembly: AssemblyVersion("0.16.6.0")]
87+
[assembly: AssemblyVersion("0.16.7.0")]
8888
#if !WindowsCE
89-
[assembly: AssemblyFileVersion("0.16.6.0")]
89+
[assembly: AssemblyFileVersion("0.16.7.0")]
9090
#endif
9191

9292
[assembly: CLSCompliant(true)]

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

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<VersionPrefix>0.16.6</VersionPrefix>
4+
<VersionPrefix>0.16.7</VersionPrefix>
55
<TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
6+
<CheckEolTargetFramework>false</CheckEolTargetFramework>
67
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
78
<PlatformTarget>anycpu</PlatformTarget>
89
<PublicSign>true</PublicSign>
@@ -63,6 +64,14 @@
6364
<UseWPF>true</UseWPF>
6465
</PropertyGroup>
6566

67+
<PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
68+
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
69+
</PropertyGroup>
70+
71+
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0'">
72+
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
73+
</PropertyGroup>
74+
6675
<ItemGroup>
6776
<Compile Include="..\Properties\AssemblyInfo.cs;..\renderer\IBarcodeRenderer.cs;..\renderer\PixelData.cs;..\renderer\PixelDataRenderer.cs;..\renderer\SVGRenderer.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" />
6877
<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;" />
@@ -101,6 +110,14 @@
101110
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
102111
<Compile Include="..\BarcodeReader.Bitmap.cs;..\BitmapLuminanceSource.cs;..\BarcodeWriter.Bitmap.cs;..\renderer\BitmapRenderer.cs" />
103112
<Compile Include="..\presentation\BarcodeReader.cs;..\presentation\BarcodeReader.Extensions.cs;..\presentation\BarcodeWriter.cs;..\presentation\BarcodeWriter.Extensions.cs;..\presentation\BarcodeWriterGeometry.cs;..\presentation\BarcodeWriterGeometry.Extensions.cs;..\BitmapSourceLuminanceSource.cs;..\renderer\GeometryRenderer.cs;..\renderer\WriteableBitmapRenderer.Presentation.cs" />
104-
</ItemGroup>
113+
</ItemGroup>
114+
115+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
116+
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
117+
</ItemGroup>
118+
119+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
120+
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
121+
</ItemGroup>
105122

106123
</Project>

‎Source/lib/uwp/project.json

-16
This file was deleted.

‎Source/lib/uwp/zxing.uwp.csproj

+8-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
<AssemblyName>zxing</AssemblyName>
1212
<DefaultLanguage>de-DE</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
19+
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -113,7 +114,6 @@
113114
<None Include="..\..\..\Key\private.snk">
114115
<Link>Properties\private.snk</Link>
115116
</None>
116-
<None Include="project.json" />
117117
</ItemGroup>
118118
<ItemGroup>
119119
<Compile Include="..\aztec\AztecDetectorResult.cs">
@@ -985,6 +985,11 @@
985985
</Compile>
986986
<EmbeddedResource Include="Properties\zxing.uwp.rd.xml" />
987987
</ItemGroup>
988+
<ItemGroup>
989+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
990+
<Version>5.1.0</Version>
991+
</PackageReference>
992+
</ItemGroup>
988993
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
989994
<VisualStudioVersion>14.0</VisualStudioVersion>
990995
</PropertyGroup>

‎build_deployment.bindings.cmd

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

33
SETLOCAL EnableDelayedExpansion EnableExtensions
44

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

77
SET CURRENT_DIR=%CD%
88
SET BUILD_DIR=%CD%\Build

‎build_deployment.cmd

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

33
SETLOCAL EnableDelayedExpansion EnableExtensions
44

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

77
SET CURRENT_DIR=%CD%
88
SET BUILD_DIR=%CD%\Build

‎zxing.nuspec

+14-5
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.6</version>
4+
<version>0.16.7</version>
55
<authors>Michael Jahn</authors>
66
<owners>Michael Jahn</owners>
77
<license type="expression">Apache-2.0</license>
@@ -11,12 +11,13 @@
1111
<id>ZXing.Net</id>
1212
<title>ZXing.Net</title>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
14-
<description>ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.
15-
It has been ported by hand with a lot of optimizations and improvements.
14+
<description>
15+
ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.
16+
It has been ported by hand with a lot of optimizations and improvements.
1617

17-
It is compatible with .Net 2.0, .Net 3.5, .Net 4.x, Windows RT Class Library and Components, UWP, .Net Standard 1.x and 2.0x, .Net Core App 3.x, Silverlight 4, Silverlight 5, Windows Phone 7.x and Windows Phone 8.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, Windows RT Class Library and Components, UWP, .Net Standard 1.x and 2.0x, .Net Core App 3.x, Silverlight 4, Silverlight 5, Windows Phone 7.x and Windows Phone 8.x and Xamarin.Android</description>
1819
<summary>ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.</summary>
19-
<releaseNotes>* changes of the java version are reflected until 2020/10/08
20+
<releaseNotes>* changes of the java version are reflected until 2021/12/08
2021
* many small bug fixes and improvements</releaseNotes>
2122
<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>
2223
<dependencies>
@@ -27,6 +28,8 @@ It is compatible with .Net 2.0, .Net 3.5, .Net 4.x, Windows RT Class Library and
2728
<group targetFramework="net461" />
2829
<group targetFramework="net47" />
2930
<group targetFramework="net48" />
31+
<group targetFramework="net50" />
32+
<group targetFramework="net60" />
3033
<group targetFramework="sl4" />
3134
<group targetFramework="sl5" />
3235
<group targetFramework="sl3-wp" />
@@ -95,6 +98,12 @@ It is compatible with .Net 2.0, .Net 3.5, .Net 4.x, Windows RT Class Library and
9598
<file src="Build\Release\net4.8\zxing.presentation.dll" target="lib\net48\zxing.presentation.dll" />
9699
<file src="Build\Release\net4.8\zxing.presentation.pdb" target="lib\net48\zxing.presentation.pdb" />
97100
<file src="Build\Release\net4.8\zxing.presentation.XML" target="lib\net48\zxing.presentation.XML" />
101+
<file src="Build\Release\net5.0\zxing.dll" target="lib\net50\zxing.dll" />
102+
<file src="Build\Release\net5.0\zxing.pdb" target="lib\net50\zxing.pdb" />
103+
<file src="Build\Release\net5.0\zxing.XML" target="lib\net50\zxing.XML" />
104+
<file src="Build\Release\net6.0\zxing.dll" target="lib\net60\zxing.dll" />
105+
<file src="Build\Release\net6.0\zxing.pdb" target="lib\net60\zxing.pdb" />
106+
<file src="Build\Release\net6.0\zxing.XML" target="lib\net60\zxing.XML" />
98107
<file src="Build\Release\sl4\zxing.sl4.dll" target="lib\sl4\zxing.sl4.dll" />
99108
<file src="Build\Release\sl4\zxing.sl4.pdb" target="lib\sl4\zxing.sl4.pdb" />
100109
<file src="Build\Release\sl4\zxing.sl4.XML" target="lib\sl4\zxing.sl4.XML" />

‎zxing.vs2015.sln

-19
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "zxing.winrt", "Source\lib\z
3737
EndProject
3838
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsRTDemo", "Clients\WindowsRTDemo\WindowsRTDemo.csproj", "{6409E0A7-6B09-4928-B03A-2257A391FCBD}"
3939
EndProject
40-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ASP.NetCoreDemo", "Clients\ASP.NetCoreDemo\ASP.NetCoreDemo.xproj", "{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}"
41-
EndProject
4240
Global
4341
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4442
Debug|Any CPU = Debug|Any CPU
@@ -187,22 +185,6 @@ Global
187185
{6409E0A7-6B09-4928-B03A-2257A391FCBD}.Release|x86.ActiveCfg = Release|x86
188186
{6409E0A7-6B09-4928-B03A-2257A391FCBD}.Release|x86.Build.0 = Release|x86
189187
{6409E0A7-6B09-4928-B03A-2257A391FCBD}.Release|x86.Deploy.0 = Release|x86
190-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
191-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
192-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|ARM.ActiveCfg = Debug|Any CPU
193-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|ARM.Build.0 = Debug|Any CPU
194-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|x64.ActiveCfg = Debug|Any CPU
195-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|x64.Build.0 = Debug|Any CPU
196-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|x86.ActiveCfg = Debug|Any CPU
197-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Debug|x86.Build.0 = Debug|Any CPU
198-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
199-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|Any CPU.Build.0 = Release|Any CPU
200-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|ARM.ActiveCfg = Release|Any CPU
201-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|ARM.Build.0 = Release|Any CPU
202-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|x64.ActiveCfg = Release|Any CPU
203-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|x64.Build.0 = Release|Any CPU
204-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|x86.ActiveCfg = Release|Any CPU
205-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8}.Release|x86.Build.0 = Release|Any CPU
206188
EndGlobalSection
207189
GlobalSection(SolutionProperties) = preSolution
208190
HideSolutionNode = FALSE
@@ -212,6 +194,5 @@ Global
212194
{BA46155F-1B44-4DE5-A625-BB351D14AD91} = {5D107164-A3D8-44DB-B4DD-34F1C39D2C56}
213195
{A8BFFD15-10E5-42F1-A3C5-E9DC90A47D12} = {5D107164-A3D8-44DB-B4DD-34F1C39D2C56}
214196
{6409E0A7-6B09-4928-B03A-2257A391FCBD} = {5D107164-A3D8-44DB-B4DD-34F1C39D2C56}
215-
{C62D5225-75D5-47FF-8F8B-0D67E9ADBDC8} = {5D107164-A3D8-44DB-B4DD-34F1C39D2C56}
216197
EndGlobalSection
217198
EndGlobal

0 commit comments

Comments
 (0)