Skip to content

Commit

Permalink
bindings: updated version numbers and dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
micjahn committed Dec 26, 2021
1 parent cadfffe commit 6af7a8a
Show file tree
Hide file tree
Showing 38 changed files with 257 additions and 125 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<Version>4.7.1</Version>
</PackageReference>
<PackageReference Include="ZXing.Net">
<Version>0.16.6</Version>
<Version>0.16.7</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
Expand Down
2 changes: 2 additions & 0 deletions Source/Bindings/ZXing.Android/BarcodeReader.Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public static class BarcodeReaderExtensions
/// <param name="reader"></param>
/// <param name="bitmap"></param>
/// <returns></returns>
[System.CLSCompliant(false)]
public static Result Decode(this IBarcodeReaderGeneric reader, Android::Android.Graphics.Bitmap bitmap)
{
var luminanceSource = new BitmapLuminanceSource(bitmap);
Expand All @@ -41,6 +42,7 @@ public static Result Decode(this IBarcodeReaderGeneric reader, Android::Android.
/// <param name="reader"></param>
/// <param name="bitmap"></param>
/// <returns></returns>
[System.CLSCompliant(false)]
public static Result[] DecodeMultiple(this IBarcodeReaderGeneric reader, Android::Android.Graphics.Bitmap bitmap)
{
var luminanceSource = new BitmapLuminanceSource(bitmap);
Expand Down
1 change: 1 addition & 0 deletions Source/Bindings/ZXing.Android/BarcodeWriter.Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public static class BarcodeWriterExtensions
/// <param name="writer"></param>
/// <param name="content"></param>
/// <returns></returns>
[System.CLSCompliant(false)]
public static Android::Android.Graphics.Bitmap WriteAsBitmap(this IBarcodeWriterGeneric writer, string content)
{
var bitmatrix = writer.Encode(content);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace ZXing.Android
/// <summary>
/// Interface for a smart class to encode some content into a barcode
/// </summary>
[System.CLSCompliant(false)]
public interface IBarcodeWriter
{
/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions Source/Bindings/ZXing.Android/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("0.16.6.0")]
[assembly: AssemblyVersion("0.16.7.0")]
#if !WindowsCE
[assembly: AssemblyFileVersion("0.16.6.0")]
[assembly: AssemblyFileVersion("0.16.7.0")]
#endif

[assembly: CLSCompliant(true)]
6 changes: 3 additions & 3 deletions Source/Bindings/ZXing.Android/ZXing.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<AssemblyName>zxing.monoandroid</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Key\private.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -56,8 +56,8 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="zxing, Version=0.16.6.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\ZXing.Net.0.16.6\lib\netstandard2.0\zxing.dll</HintPath>
<Reference Include="zxing, Version=0.16.7.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\ZXing.Net.0.16.7\lib\netstandard2.0\zxing.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
Expand Down
6 changes: 6 additions & 0 deletions Source/Bindings/ZXing.Android/nuget-pack.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@ECHO OFF

SET OUTDIR=..\..\..\Build\Deployment
mkdir %OUTDIR%

..\..\..\3rdParty\nuget\nuget pack project.nuspec -outputdirectory %OUTDIR%
2 changes: 1 addition & 1 deletion Source/Bindings/ZXing.Android/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="Microsoft.NETCore.Platforms" version="2.0.2" targetFramework="monoandroid23" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid23" />
<package id="ZXing.Net" version="0.16.6" targetFramework="monoandroid23" />
<package id="ZXing.Net" version="0.16.7" targetFramework="monoandroid23" />
</packages>
31 changes: 31 additions & 0 deletions Source/Bindings/ZXing.Android/project.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<version>0.16.7</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<projectUrl>https://github.com/micjahn/ZXing.Net/</projectUrl>
<icon>logo.jpg</icon>
<id>ZXing.Net.Bindings.Android</id>
<title>ZXing.Net.Bindings.Android</title>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>ZXing.Net Bindings for Android targets</description>
<summary>ZXing.Net Bindings for Android targets</summary>
<releaseNotes></releaseNotes>
<tags>ZXing Android</tags>
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
<dependencies>
<group targetFramework="MonoAndroid">
<dependency id="ZXing.Net" version="0.16.7" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\..\Icons\logo.jpg" target="." />
<file src="..\..\..\Build\Release\Bindings\Android\zxing.monoandroid.dll" target="MonoAndroid\zxing.monoandroid.dll" />
<file src="..\..\..\Build\Release\Bindings\Android\zxing.monoandroid.pdb" target="MonoAndroid\zxing.monoandroid.pdb" />
<file src="..\..\..\Build\Release\Bindings\Android\zxing.monoandroid.xml" target="MonoAndroid\zxing.monoandroid.xml" />
</files>
</package>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.6-beta</VersionPrefix>
<VersionPrefix>0.16.7-beta</VersionPrefix>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<PackageId>ZXing.CoreCompat.System.Drawing.v2</PackageId>
Expand Down Expand Up @@ -38,7 +38,7 @@

<ItemGroup>
<PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" />
<PackageReference Include="ZXing.Net" Version="0.16.6" />
<PackageReference Include="ZXing.Net" Version="0.16.7" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.6</VersionPrefix>
<VersionPrefix>0.16.7</VersionPrefix>
<TargetFramework>netstandard1.3</TargetFramework>
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<PlatformTarget>anycpu</PlatformTarget>
Expand Down Expand Up @@ -32,7 +32,7 @@

<ItemGroup>
<PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
<PackageReference Include="ZXing.Net" Version="0.16.6" />
<PackageReference Include="ZXing.Net" Version="0.16.7" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<version>0.16.6-beta</version>
<version>0.16.7-beta</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<projectUrl>https://github.com/micjahn/ZXing.Net/</projectUrl>
<iconUrl>https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg</iconUrl>
<icon>logo.jpg</icon>
<id>ZXing.Net.Bindings.CoreCompat.System.Drawing</id>
<title>ZXing.Net.Bindings.CoreCompat.System.Drawing</title>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -17,18 +17,19 @@
<tags>ZXing CoreCompat.System.Drawing</tags>
<dependencies>
<group targetFramework="netstandard1.3">
<dependency id="ZXing.Net" version="0.16.6" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7" exclude="Build,Analyzers" />
<dependency id="CoreCompat.System.Drawing" version="1.0.0-beta006" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="ZXing.Net" version="0.16.6" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7" exclude="Build,Analyzers" />
<dependency id="CoreCompat.System.Drawing.v2" version="5.2.0-preview1-r131" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\..\Icons\logo.jpg" target="." />
<file src="bin\Release\netstandard1.3\ZXing.CoreCompat.System.Drawing.dll" target="lib\netstandard1.3\ZXing.CoreCompat.System.Drawing.dll" />
<file src="bin\Release\netstandard1.3\ZXing.CoreCompat.System.Drawing.pdb" target="lib\netstandard1.3\ZXing.CoreCompat.System.Drawing.pdb" />
<file src="bin\Release\netstandard1.3\ZXing.CoreCompat.System.Drawing.xml" target="lib\netstandard1.3\ZXing.CoreCompat.System.Drawing.xml" />
Expand Down
4 changes: 2 additions & 2 deletions Source/Bindings/ZXing.EmguCV/ZXing.EmguCV.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.1</VersionPrefix>
<VersionPrefix>0.16.2</VersionPrefix>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<PlatformTarget>anycpu</PlatformTarget>
Expand All @@ -26,7 +26,7 @@

<ItemGroup>
<PackageReference Include="Emgu.CV" Version="4.5.4.4788" />
<PackageReference Include="ZXing.Net" Version="0.16.6" />
<PackageReference Include="ZXing.Net" Version="0.16.7" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
7 changes: 4 additions & 3 deletions Source/Bindings/ZXing.EmguCV/project.nuspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<version>0.16.1</version>
<version>0.16.2</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<projectUrl>https://github.com/micjahn/ZXing.Net/</projectUrl>
<iconUrl>https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg</iconUrl>
<icon>logo.jpg</icon>
<id>ZXing.Net.Bindings.EmguCV</id>
<title>ZXing.Net.Bindings.EmguCV</title>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -18,13 +18,14 @@
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="ZXing.Net" version="0.16.6.0" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7.0" exclude="Build,Analyzers" />
<dependency id="Emgu.CV" version="4.5.4.4788" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\..\Icons\logo.jpg" target="." />
<file src="bin\Release\netstandard2.0\ZXing.EmguCV.dll" target="lib\netstandard2.0\ZXing.EmguCV.dll" />
<file src="bin\Release\netstandard2.0\ZXing.EmguCV.pdb" target="lib\netstandard2.0\ZXing.EmguCV.pdb" />
<file src="bin\Release\netstandard2.0\ZXing.EmguCV.xml" target="lib\netstandard2.0\ZXing.EmguCV.xml" />
Expand Down
4 changes: 2 additions & 2 deletions Source/Bindings/ZXing.Eto.Forms/ZXing.Eto.Forms.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.2</VersionPrefix>
<VersionPrefix>0.16.3</VersionPrefix>
<TargetFrameworks>netstandard1.0;netstandard2.0</TargetFrameworks>
<PackageId>ZXing.Net.Bindings.Eto.Forms</PackageId>
<PlatformTarget>anycpu</PlatformTarget>
Expand Down Expand Up @@ -38,7 +38,7 @@

<ItemGroup>
<PackageReference Include="Eto.Forms" Version="2.5.11" />
<PackageReference Include="ZXing.Net" Version="0.16.6" />
<PackageReference Include="ZXing.Net" Version="0.16.7" />
</ItemGroup>

</Project>
9 changes: 5 additions & 4 deletions Source/Bindings/ZXing.Eto.Forms/project.nuspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<version>0.16.2</version>
<version>0.16.3</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<projectUrl>https://github.com/micjahn/ZXing.Net/</projectUrl>
<iconUrl>https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg</iconUrl>
<icon>logo.jpg</icon>
<id>ZXing.Net.Bindings.Eto.Forms</id>
<title>ZXing.Net.Bindings.Eto.Forms</title>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -17,18 +17,19 @@
<tags>ZXing Eto</tags>
<dependencies>
<group targetFramework="netstandard1.0">
<dependency id="ZXing.Net" version="0.16.6" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7" exclude="Build,Analyzers" />
<dependency id="Eto.Forms" version="2.5.11" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="ZXing.Net" version="0.16.6" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7" exclude="Build,Analyzers" />
<dependency id="Eto.Forms" version="2.5.11" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\..\Icons\logo.jpg" target="." />
<file src="bin\Release\netstandard1.0\ZXing.Eto.Forms.dll" target="lib\netstandard1.0\ZXing.Eto.Forms.dll" />
<file src="bin\Release\netstandard1.0\ZXing.Eto.Forms.pdb" target="lib\netstandard1.0\ZXing.Eto.Forms.pdb" />
<file src="bin\Release\netstandard1.0\ZXing.Eto.Forms.xml" target="lib\netstandard1.0\ZXing.Eto.Forms.xml" />
Expand Down
4 changes: 2 additions & 2 deletions Source/Bindings/ZXing.ImageSharp/ZXing.ImageSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.11</VersionPrefix>
<VersionPrefix>0.16.12</VersionPrefix>
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
Expand Down Expand Up @@ -29,7 +29,7 @@

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
<PackageReference Include="ZXing.Net" Version="0.16.6" />
<PackageReference Include="ZXing.Net" Version="0.16.7" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
Expand Down
10 changes: 5 additions & 5 deletions Source/Bindings/ZXing.ImageSharp/project.nuspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<version>0.16.11</version>
<version>0.16.12</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
Expand All @@ -19,21 +19,21 @@
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
<dependencies>
<group targetFramework=".NETFramework4.7.2">
<dependency id="ZXing.Net" version="0.16.6.0" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="1.0.1" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="ZXing.Net" version="0.16.6.0" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="1.0.1" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="ZXing.Net" version="0.16.6.0" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="1.0.1" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="ZXing.Net" version="0.16.6.0" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="1.0.1" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
</group>
Expand Down
7 changes: 4 additions & 3 deletions Source/Bindings/ZXing.Kinect/project.V1.nuspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<version>0.16.5</version>
<version>0.16.7</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
<projectUrl>https://github.com/micjahn/ZXing.Net/</projectUrl>
<iconUrl>https://raw.githubusercontent.com/micjahn/ZXing.Net/master/Icons/logo.jpg</iconUrl>
<icon>logo.jpg</icon>
<id>ZXing.Net.Bindings.Kinect.V1</id>
<title>ZXing.Net.Bindings.Kinect.V1</title>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -17,11 +17,12 @@
<tags>ZXing Kinect</tags>
<dependencies>
<group targetFramework="net40">
<dependency id="ZXing.Net" version="0.16.6.0" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.7.0" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\..\Icons\logo.jpg" target="." />
<file src="..\..\..\Build\Release\Bindings\kinect\V1\zxing.kinect.dll" target="lib\net40\zxing.kinect.dll" />
<file src="..\..\..\Build\Release\Bindings\kinect\V1\zxing.kinect.pdb" target="lib\net40\zxing.kinect.pdb" />
<file src="..\..\..\Build\Release\Bindings\kinect\V1\zxing.kinect.xml" target="lib\net40\zxing.kinect.xml" />
Expand Down
Loading

0 comments on commit 6af7a8a

Please sign in to comment.