Skip to content

Commit 51571e3

Browse files
ddrinkaddrinka
committed
Add netcoreapp3.0 build with WPF support.
1 parent 0bdf54e commit 51571e3

3 files changed

Lines changed: 83 additions & 2 deletions

File tree

‎Source/lib/netcoreapp3.0/ZXing.Netcoreapp3.0.presentation.csproj‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<VersionPrefix>0.16.4</VersionPrefix>
5+
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
6+
<UseWPF>true</UseWPF>
7+
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0;NETCOREAPP3_0;WPF</DefineConstants>
8+
<PlatformTarget>anycpu</PlatformTarget>
9+
<PublicSign>true</PublicSign>
10+
<DebugType>portable</DebugType>
11+
<AssemblyName>zxing</AssemblyName>
12+
<AssemblyOriginatorKeyFile>../../../Key/private.snk</AssemblyOriginatorKeyFile>
13+
<SignAssembly>true</SignAssembly>
14+
<PackageId>ZXing.Net</PackageId>
15+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
16+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
17+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
18+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
19+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
20+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
21+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
22+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
23+
<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
27+
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
28+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
29+
</PropertyGroup>
30+
31+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
32+
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
33+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
34+
</PropertyGroup>
35+
36+
<ItemGroup>
37+
<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" Exclude="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs" />
38+
<Compile Include="..\aztec\**;..\client\**;..\common\**;..\datamatrix\**;..\imb\**;..\maxicode\**;..\multi\**;..\oned\**;..\pdf417\**;..\qrcode\**" Exclude="..\client\result\optional\**\*;..\common\BigInteger\**\*;bin\**;obj\**;**\*.xproj;packages\**;" />
39+
<Compile Remove="..\common\BitMatrix.Drawing.cs;..\common\BitMatrix.Silverlight.cs;..\common\advanced\rowedge\**" />
40+
<Compile Include="..\presentation\BarcodeReader.cs;..\presentation\BarcodeWriter.cs;..\presentation\BarcodeWriterGeometry.cs;..\BitmapSourceLuminanceSource.cs;..\renderer\GeometryRenderer.cs;..\renderer\WriteableBitmapRenderer.Presentation.cs" />
41+
</ItemGroup>
42+
</Project>

‎Source/lib/netcoreapp3.0/global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"sdk": {
3+
"version": "3.0.100-preview6-012264"
4+
}
5+
}

‎zxing.vs2019.sln‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2024
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29102.190
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZXing.Net", "Source\lib\netstandard2.0\ZXing.Net.csproj", "{832C3EF1-56B8-4164-B140-4A2D01DB3CA2}"
77
EndProject
@@ -142,6 +142,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZXing.Eto.Forms", "Source\B
142142
EndProject
143143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZXing.Unity3D", "Source\Bindings\ZXing.Unity3D\ZXing.Unity3D.csproj", "{35EFB92B-6C72-48B4-ABFA-39CECE270FF6}"
144144
EndProject
145+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZXing.Netcoreapp3.0.presentation", "Source\lib\netcoreapp3.0\ZXing.Netcoreapp3.0.presentation.csproj", "{C15BC6D6-A6EE-46DB-8706-E7317F124126}"
146+
EndProject
145147
Global
146148
GlobalSection(SolutionConfigurationPlatforms) = preSolution
147149
Debug - Reduced|Any CPU = Debug - Reduced|Any CPU
@@ -1511,6 +1513,38 @@ Global
15111513
{35EFB92B-6C72-48B4-ABFA-39CECE270FF6}.Release|x64.Build.0 = Release|Any CPU
15121514
{35EFB92B-6C72-48B4-ABFA-39CECE270FF6}.Release|x86.ActiveCfg = Release|Any CPU
15131515
{35EFB92B-6C72-48B4-ABFA-39CECE270FF6}.Release|x86.Build.0 = Release|Any CPU
1516+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|Any CPU.ActiveCfg = Debug|Any CPU
1517+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|Any CPU.Build.0 = Debug|Any CPU
1518+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|ARM.ActiveCfg = Debug|Any CPU
1519+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|ARM.Build.0 = Debug|Any CPU
1520+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|x64.ActiveCfg = Debug|Any CPU
1521+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|x64.Build.0 = Debug|Any CPU
1522+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|x86.ActiveCfg = Debug|Any CPU
1523+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug - Reduced|x86.Build.0 = Debug|Any CPU
1524+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1525+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|Any CPU.Build.0 = Debug|Any CPU
1526+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|ARM.ActiveCfg = Debug|Any CPU
1527+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|ARM.Build.0 = Debug|Any CPU
1528+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|x64.ActiveCfg = Debug|Any CPU
1529+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|x64.Build.0 = Debug|Any CPU
1530+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|x86.ActiveCfg = Debug|Any CPU
1531+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Debug|x86.Build.0 = Debug|Any CPU
1532+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|Any CPU.ActiveCfg = Release|Any CPU
1533+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|Any CPU.Build.0 = Release|Any CPU
1534+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|ARM.ActiveCfg = Release|Any CPU
1535+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|ARM.Build.0 = Release|Any CPU
1536+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|x64.ActiveCfg = Release|Any CPU
1537+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|x64.Build.0 = Release|Any CPU
1538+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|x86.ActiveCfg = Release|Any CPU
1539+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release with Documentation|x86.Build.0 = Release|Any CPU
1540+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|Any CPU.ActiveCfg = Release|Any CPU
1541+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|Any CPU.Build.0 = Release|Any CPU
1542+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|ARM.ActiveCfg = Release|Any CPU
1543+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|ARM.Build.0 = Release|Any CPU
1544+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|x64.ActiveCfg = Release|Any CPU
1545+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|x64.Build.0 = Release|Any CPU
1546+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|x86.ActiveCfg = Release|Any CPU
1547+
{C15BC6D6-A6EE-46DB-8706-E7317F124126}.Release|x86.Build.0 = Release|Any CPU
15141548
EndGlobalSection
15151549
GlobalSection(SolutionProperties) = preSolution
15161550
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)