Skip to content

Commit 165d207

Browse files
micjahnmicjahn
committed
preparing release of the bindings
1 parent 434fcf0 commit 165d207

40 files changed

+213
-173
lines changed

‎Source/Bindings/Tests/ZXing.EmguCV/ZXing.EmguCV.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@
100100
<HintPath>..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
101101
</Reference>
102102
<Reference Include="System.Xml" />
103-
<Reference Include="zxing, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
104-
<HintPath>..\..\..\..\packages\ZXing.Net.0.16.9\lib\net47\zxing.dll</HintPath>
103+
<Reference Include="zxing, Version=0.16.10.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
104+
<HintPath>..\..\..\..\packages\ZXing.Net.0.16.10\lib\net47\zxing.dll</HintPath>
105105
</Reference>
106-
<Reference Include="zxing.presentation, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
107-
<HintPath>..\..\..\..\packages\ZXing.Net.0.16.9\lib\net47\zxing.presentation.dll</HintPath>
106+
<Reference Include="zxing.presentation, Version=0.16.10.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
107+
<HintPath>..\..\..\..\packages\ZXing.Net.0.16.10\lib\net47\zxing.presentation.dll</HintPath>
108108
</Reference>
109109
<Reference Include="ZXing.Windows.Compatibility, Version=0.16.12.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
110110
<HintPath>..\..\..\..\packages\ZXing.Net.Bindings.Windows.Compatibility.0.16.12\lib\netstandard2.0\ZXing.Windows.Compatibility.dll</HintPath>

‎Source/Bindings/Tests/ZXing.EmguCV/app.config‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,35 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="zxing" publicKeyToken="4e88037ac681fe60" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-0.16.9.0" newVersion="0.16.9.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-0.16.10.0" newVersion="0.16.10.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
23+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.1" newVersion="9.0.0.1" />
2424
</dependentAssembly>
2525
<dependentAssembly>
2626
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
27-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
27+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
2836
</dependentAssembly>
2937
</assemblyBinding>
3038
</runtime>

‎Source/Bindings/Tests/ZXing.EmguCV/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<package id="System.Text.Json" version="9.0.1" targetFramework="net472" />
1818
<package id="System.Threading.Tasks.Extensions" version="4.6.0" targetFramework="net472" />
1919
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
20-
<package id="ZXing.Net" version="0.16.9" targetFramework="net472" />
20+
<package id="ZXing.Net" version="0.16.10" targetFramework="net472" />
2121
<package id="ZXing.Net.Bindings.Windows.Compatibility" version="0.16.12" targetFramework="net472" />
2222
</packages>

‎Source/Bindings/Tests/ZXing.SkiaSharp/ZXing.SkiaSharp.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<Version>6.1.0</Version>
8181
</PackageReference>
8282
<PackageReference Include="ZXing.Net">
83-
<Version>0.16.9</Version>
83+
<Version>0.16.10</Version>
8484
</PackageReference>
8585
</ItemGroup>
8686
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />

‎Source/Bindings/ZXing.Android/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// You can specify all the values or you can default the Revision and Build Numbers
2727
// by using the '*' as shown below:
2828

29-
[assembly: AssemblyVersion("0.16.8.0")]
30-
[assembly: AssemblyFileVersion("0.16.8.0")]
29+
[assembly: AssemblyVersion("0.16.10.0")]
30+
[assembly: AssemblyFileVersion("0.16.10.0")]
3131

3232
[assembly: CLSCompliant(true)]

‎Source/Bindings/ZXing.Android/ZXing.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<Reference Include="System.Xml" />
5757
<Reference Include="System.Core" />
5858
<Reference Include="System.Numerics" />
59-
<Reference Include="zxing, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
60-
<HintPath>..\..\..\packages\ZXing.Net.0.16.9\lib\netstandard2.1\zxing.dll</HintPath>
59+
<Reference Include="zxing, Version=0.16.10.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
60+
<HintPath>..\..\..\packages\ZXing.Net.0.16.10\lib\netstandard2.1\zxing.dll</HintPath>
6161
</Reference>
6262
</ItemGroup>
6363
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />

‎Source/Bindings/ZXing.Android/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Microsoft.NETCore.Platforms" version="2.0.2" targetFramework="monoandroid23" />
44
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid23" />
5-
<package id="ZXing.Net" version="0.16.9" targetFramework="monoandroid23" />
5+
<package id="ZXing.Net" version="0.16.10" targetFramework="monoandroid23" />
66
</packages>

‎Source/Bindings/ZXing.Android/project.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
4-
<version>0.16.9</version>
4+
<version>0.16.10</version>
55
<authors>Michael Jahn</authors>
66
<owners>Michael Jahn</owners>
77
<license type="expression">Apache-2.0</license>
@@ -19,7 +19,7 @@
1919
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
2020
<dependencies>
2121
<group targetFramework="MonoAndroid">
22-
<dependency id="ZXing.Net" version="0.16.9" exclude="Build,Analyzers" />
22+
<dependency id="ZXing.Net" version="0.16.10" exclude="Build,Analyzers" />
2323
</group>
2424
</dependencies>
2525
</metadata>

‎Source/Bindings/ZXing.CoreCompat.System.Drawing.V2/ZXing.CoreCompat.System.Drawing.V2.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>0.16.8-beta</VersionPrefix>
4+
<VersionPrefix>0.16.9-beta</VersionPrefix>
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<TargetFrameworks>netstandard2.0</TargetFrameworks>
77
<PackageId>ZXing.CoreCompat.System.Drawing.v2</PackageId>
@@ -38,7 +38,7 @@
3838

3939
<ItemGroup>
4040
<PackageReference Include="CoreCompat.System.Drawing.v2" Version="5.2.0-preview1-r131" />
41-
<PackageReference Include="ZXing.Net" Version="0.16.9" />
41+
<PackageReference Include="ZXing.Net" Version="0.16.10" />
4242
</ItemGroup>
4343

4444
</Project>

‎Source/Bindings/ZXing.CoreCompat.System.Drawing/ZXing.CoreCompat.System.Drawing.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>0.16.8</VersionPrefix>
4+
<VersionPrefix>0.16.9</VersionPrefix>
55
<TargetFramework>netstandard1.3</TargetFramework>
66
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
77
<PlatformTarget>anycpu</PlatformTarget>
@@ -20,6 +20,14 @@
2020
<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
2121
</PropertyGroup>
2222

23+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
24+
<NoWarn>1701;1702;NETSDK1215</NoWarn>
25+
</PropertyGroup>
26+
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
28+
<NoWarn>1701;1702;NETSDK1215</NoWarn>
29+
</PropertyGroup>
30+
2331
<ItemGroup>
2432
<Compile Include="Properties\AssemblyInfo.cs" />
2533
<Compile Include="Rendering\BitmapRenderer.cs" />
@@ -32,7 +40,7 @@
3240

3341
<ItemGroup>
3442
<PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
35-
<PackageReference Include="ZXing.Net" Version="0.16.9" />
43+
<PackageReference Include="ZXing.Net" Version="0.16.10" />
3644
</ItemGroup>
3745

3846
</Project>

0 commit comments

Comments
 (0)