Skip to content

Commit e0947be

Browse files
micjahnmicjahn
committed
added .Net 9.0
1 parent 053916d commit e0947be

5 files changed

+28
-2
lines changed

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
55
</PropertyGroup>
66
<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
7-
<TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard1.0;netstandard1.1;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
88
</PropertyGroup>
99
<PropertyGroup>
1010
<VersionPrefix>0.17.0</VersionPrefix>
@@ -85,6 +85,10 @@
8585
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
8686
</PropertyGroup>
8787

88+
<PropertyGroup Condition="'$(TargetFramework)'=='net9.0'">
89+
<DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
90+
</PropertyGroup>
91+
8892
<ItemGroup>
8993
<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" />
9094
<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;" />
@@ -141,4 +145,8 @@
141145
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
142146
</ItemGroup>
143147

148+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
149+
<Compile Remove="..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**;..\BarcodeReader.ByteArray.cs;" />
150+
</ItemGroup>
151+
144152
</Project>

‎build_deployment_copy_operations.txt

+6
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,9 @@
2828
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.dll %BINARY_DIR%\net7.0\
2929
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.pdb %BINARY_DIR%\net7.0\
3030
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.xml %BINARY_DIR%\net7.0\
31+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net8.0\zxing.dll %BINARY_DIR%\net8.0\
32+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net8.0\zxing.pdb %BINARY_DIR%\net8.0\
33+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net8.0\zxing.xml %BINARY_DIR%\net8.0\
34+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net9.0\zxing.dll %BINARY_DIR%\net9.0\
35+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net9.0\zxing.pdb %BINARY_DIR%\net9.0\
36+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net9.0\zxing.xml %BINARY_DIR%\net9.0\

‎build_deployment_files.txt

+2
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@
2828
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net5.0\zxing.dll
2929
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.dll
3030
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.dll
31+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net8.0\zxing.dll
32+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net9.0\zxing.dll

‎build_deployment_strong_named_files.txt

+2
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@
2424
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net5.0\zxing.dll
2525
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net6.0\zxing.dll
2626
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net7.0\zxing.dll
27+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net8.0\zxing.dll
28+
%CURRENT_DIR%\Source\lib\netstandard\bin\Release\net9.0\zxing.dll

‎zxing.nuspec

+9-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
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/3.5/4.x/5.x/6.x/7.x/8.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/3.5/4.x/5.x/6.x/7.x/8.x/9.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>
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>
2020
<releaseNotes>* changes of the java version are reflected until 2023/02/21
2121
* many small bug fixes and improvements</releaseNotes>
@@ -31,6 +31,8 @@
3131
<group targetFramework="net50" />
3232
<group targetFramework="net60" />
3333
<group targetFramework="net70" />
34+
<group targetFramework="net80" />
35+
<group targetFramework="net90" />
3436
<group targetFramework="windows8-managed" />
3537
<group targetFramework="windows8" />
3638
<group targetFramework="native" />
@@ -102,6 +104,12 @@
102104
<file src="Build\Release\net7.0\zxing.dll" target="lib\net7.0\zxing.dll" />
103105
<file src="Build\Release\net7.0\zxing.pdb" target="lib\net7.0\zxing.pdb" />
104106
<file src="Build\Release\net7.0\zxing.XML" target="lib\net7.0\zxing.XML" />
107+
<file src="Build\Release\net8.0\zxing.dll" target="lib\net8.0\zxing.dll" />
108+
<file src="Build\Release\net8.0\zxing.pdb" target="lib\net8.0\zxing.pdb" />
109+
<file src="Build\Release\net8.0\zxing.XML" target="lib\net8.0\zxing.XML" />
110+
<file src="Build\Release\net9.0\zxing.dll" target="lib\net9.0\zxing.dll" />
111+
<file src="Build\Release\net9.0\zxing.pdb" target="lib\net9.0\zxing.pdb" />
112+
<file src="Build\Release\net9.0\zxing.XML" target="lib\net9.0\zxing.XML" />
105113
<file src="Build\Release\winrt\zxing.winrt.dll" target="lib\windows8-managed\zxing.winrt.dll" />
106114
<file src="Build\Release\winrt\zxing.winrt.pdb" target="lib\windows8-managed\zxing.winrt.pdb" />
107115
<file src="Build\Release\winrt\zxing.winrt.XML" target="lib\windows8-managed\zxing.winrt.XML" />

0 commit comments

Comments
 (0)