Skip to content

Commit

Permalink
bindings: updated package references
Browse files Browse the repository at this point in the history
  • Loading branch information
micjahn committed Feb 23, 2023
1 parent b7cd3cd commit 99e12fb
Show file tree
Hide file tree
Showing 35 changed files with 204 additions and 165 deletions.
14 changes: 8 additions & 6 deletions Source/Bindings/Tests/ZXing.EmguCV/ZXing.EmguCV.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Emgu.CV.Platform.NetStandard, Version=4.5.5.4823, Culture=neutral, PublicKeyToken=7281126722ab4438, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Emgu.CV.4.5.5.4823\lib\netstandard2.0\Emgu.CV.Platform.NetStandard.dll</HintPath>
<Reference Include="Emgu.CV, Version=4.6.0.5131, Culture=neutral, PublicKeyToken=7281126722ab4438, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\Emgu.CV.4.6.0.5131\lib\netstandard2.0\Emgu.CV.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -72,6 +72,12 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="zxing, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\ZXing.Net.0.16.9\lib\net47\zxing.dll</HintPath>
</Reference>
<Reference Include="zxing.presentation, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\ZXing.Net.0.16.9\lib\net47\zxing.presentation.dll</HintPath>
</Reference>
<Reference Include="ZXing.Windows.Compatibility, Version=0.16.10.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\..\packages\ZXing.Net.Bindings.Windows.Compatibility.0.16.10\lib\netstandard2.0\ZXing.Windows.Compatibility.dll</HintPath>
</Reference>
Expand All @@ -88,10 +94,6 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\lib\netstandard\ZXing.Net.csproj">
<Project>{832c3ef1-56b8-4164-b140-4a2d01db3ca2}</Project>
<Name>ZXing.Net</Name>
</ProjectReference>
<ProjectReference Include="..\..\ZXing.EmguCV\ZXing.EmguCV.csproj">
<Project>{60862869-e3fb-47b4-9769-d5570b8bab36}</Project>
<Name>ZXing.EmguCV</Name>
Expand Down
2 changes: 1 addition & 1 deletion Source/Bindings/Tests/ZXing.EmguCV/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="zxing" publicKeyToken="4e88037ac681fe60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.16.8.0" newVersion="0.16.8.0" />
<bindingRedirect oldVersion="0.0.0.0-0.16.9.0" newVersion="0.16.9.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
4 changes: 2 additions & 2 deletions Source/Bindings/Tests/ZXing.EmguCV/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Emgu.CV" version="4.5.5.4823" targetFramework="net472" />
<package id="Emgu.CV" version="4.6.0.5131" targetFramework="net472" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net472" />
<package id="NETStandard.Library" version="2.0.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
Expand All @@ -11,6 +11,6 @@
<package id="System.Runtime" version="4.3.1" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
<package id="ZXing.Net" version="0.16.7" targetFramework="net472" />
<package id="ZXing.Net" version="0.16.9" targetFramework="net472" />
<package id="ZXing.Net.Bindings.Windows.Compatibility" version="0.16.10" targetFramework="net472" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp">
<Version>2.80.3</Version>
<Version>2.88.3</Version>
</PackageReference>
<PackageReference Include="System.Buffers">
<Version>4.5.1</Version>
Expand All @@ -80,7 +80,7 @@
<Version>4.7.1</Version>
</PackageReference>
<PackageReference Include="ZXing.Net">
<Version>0.16.7</Version>
<Version>0.16.9</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
Expand Down
4 changes: 2 additions & 2 deletions Source/Bindings/ZXing.Android/ZXing.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="zxing, Version=0.16.8.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\ZXing.Net.0.16.8\lib\netstandard2.0\zxing.dll</HintPath>
<Reference Include="zxing, Version=0.16.9.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\ZXing.Net.0.16.9\lib\netstandard2.1\zxing.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
Expand Down
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.8" targetFramework="monoandroid23" />
<package id="ZXing.Net" version="0.16.9" targetFramework="monoandroid23" />
</packages>
4 changes: 2 additions & 2 deletions Source/Bindings/ZXing.Android/project.nuspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<version>0.16.8</version>
<version>0.16.9</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
Expand All @@ -18,7 +18,7 @@
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
<dependencies>
<group targetFramework="MonoAndroid">
<dependency id="ZXing.Net" version="0.16.8" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.7-beta</VersionPrefix>
<VersionPrefix>0.16.8-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.7" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</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.7</VersionPrefix>
<VersionPrefix>0.16.8</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.7" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>

</Project>
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.7-beta</version>
<version>0.16.8-beta</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
Expand All @@ -17,12 +17,12 @@
<tags>ZXing CoreCompat.System.Drawing</tags>
<dependencies>
<group targetFramework="netstandard1.3">
<dependency id="ZXing.Net" version="0.16.7" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9" 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.7" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9" 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>
Expand Down
6 changes: 3 additions & 3 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.3</VersionPrefix>
<VersionPrefix>0.16.4</VersionPrefix>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<PlatformTarget>anycpu</PlatformTarget>
Expand All @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Emgu.CV" Version="4.5.5.4823" />
<PackageReference Include="ZXing.Net" Version="0.16.8" />
<PackageReference Include="Emgu.CV" Version="4.6.0.5131" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
6 changes: 3 additions & 3 deletions Source/Bindings/ZXing.EmguCV/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.3</version>
<version>0.16.4</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
Expand All @@ -18,8 +18,8 @@
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="ZXing.Net" version="0.16.8.0" exclude="Build,Analyzers" />
<dependency id="Emgu.CV" version="4.5.5.4823" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
<dependency id="Emgu.CV" version="4.6.0.5131" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions Source/Bindings/ZXing.Eto.Forms/ZXing.Eto.Forms.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.3</VersionPrefix>
<TargetFrameworks>netstandard1.0;netstandard2.0</TargetFrameworks>
<VersionPrefix>0.16.4</VersionPrefix>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<PackageId>ZXing.Net.Bindings.Eto.Forms</PackageId>
<PlatformTarget>anycpu</PlatformTarget>
<SignAssembly>false</SignAssembly>
Expand Down Expand Up @@ -37,8 +37,8 @@
</ItemGroup>

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

</Project>
14 changes: 3 additions & 11 deletions Source/Bindings/ZXing.Eto.Forms/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.3</version>
<version>0.16.4</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
Expand All @@ -16,23 +16,15 @@
<releaseNotes></releaseNotes>
<tags>ZXing Eto</tags>
<dependencies>
<group targetFramework="netstandard1.0">
<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.7" exclude="Build,Analyzers" />
<dependency id="Eto.Forms" version="2.5.11" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9" exclude="Build,Analyzers" />
<dependency id="Eto.Forms" version="2.7.3" 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" />
<file src="bin\Release\netstandard2.0\ZXing.Eto.Forms.dll" target="lib\netstandard2.0\ZXing.Eto.Forms.dll" />
<file src="bin\Release\netstandard2.0\ZXing.Eto.Forms.pdb" target="lib\netstandard2.0\ZXing.Eto.Forms.pdb" />
<file src="bin\Release\netstandard2.0\ZXing.Eto.Forms.xml" target="lib\netstandard2.0\ZXing.Eto.Forms.xml" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<VersionPrefix>0.16.14</VersionPrefix>
<VersionPrefix>0.16.15</VersionPrefix>
<TargetFrameworks>netstandard2.0;netstandard2.1;net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
Expand Down Expand Up @@ -30,12 +30,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.1" />
<PackageReference Include="ZXing.Net" Version="0.16.8" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) OR '$(TargetFramework)' == 'net472'">
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Memory" Version="4.5.5" />
</ItemGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
Expand Down
28 changes: 14 additions & 14 deletions Source/Bindings/ZXing.ImageSharp.V2/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.14</version>
<version>0.16.15</version>
<authors>Michael Jahn</authors>
<owners>Michael Jahn</owners>
<license type="expression">Apache-2.0</license>
Expand All @@ -19,29 +19,29 @@
<repository type="git" url="https://github.com/micjahn/ZXing.Net/" />
<dependencies>
<group targetFramework=".NETFramework4.7.2">
<dependency id="ZXing.Net" version="0.16.8.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.1" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="4.5.4" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.3" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="ZXing.Net" version="0.16.8.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.1" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.3" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="4.5.4" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="ZXing.Net" version="0.16.8.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.1" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.3" exclude="Build,Analyzers" />
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="4.5.4" exclude="Build,Analyzers" />
<dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
</group>
<group targetFramework="netcoreapp2.1">
<dependency id="ZXing.Net" version="0.16.8.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.1" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.3" exclude="Build,Analyzers" />
</group>
<group targetFramework="netcoreapp3.1">
<dependency id="ZXing.Net" version="0.16.8.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.1" exclude="Build,Analyzers" />
<dependency id="ZXing.Net" version="0.16.9.0" exclude="Build,Analyzers" />
<dependency id="SixLabors.ImageSharp" version="2.1.3" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
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.13</VersionPrefix>
<VersionPrefix>0.16.14</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 @@ -31,7 +31,7 @@

<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
<PackageReference Include="ZXing.Net" Version="0.16.8" />
<PackageReference Include="ZXing.Net" Version="0.16.9" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
Expand Down
Loading

0 comments on commit 99e12fb

Please sign in to comment.