Skip to content

Commit

Permalink
fix .net
Browse files Browse the repository at this point in the history
  • Loading branch information
ywjywjywj528 authored Mar 16, 2022
1 parent db849f9 commit 3f383fa
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
License Notice

This folder contains code samples ("Sample Code") for use with Dynamsoft Barcode Reader, a commercial software development kit licensed by Dynamsoft. The Sample Code may be modified and included in your end user software under the terms of the Dynamsoft Software License Agreement  https://www.dynamsoft.com/Products/barcode-reader-license-agreement.aspx ("Commercial License"). Except as expressly stated in the Commercial License, no other rights are granted in the Sample Code. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Copyright © 2003–2021 Dynamsoft. All rights reserved.
Copyright © 2003–2022 Dynamsoft. All rights reserved.
14 changes: 7 additions & 7 deletions samples/GeneralSettings/GeneralSettings.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader, Version=8.8.0.831, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<Reference Include="Dynamsoft.BarcodeReader, Version=9.0.0.303, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="DynamsoftCommon, Version=1.1.0.0, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand All @@ -55,13 +55,13 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Import Project="..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
<Error Condition="!Exists('..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
<Error Condition="!Exists('..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
<Error Condition="!Exists('..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
</Target>
<Import Project="..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Import Project="..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" />
</Project>
2 changes: 1 addition & 1 deletion samples/GeneralSettings/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
</packages>
10 changes: 5 additions & 5 deletions samples/HelloWorld/HelloWorld.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader, Version=8.8.0.831, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<Reference Include="Dynamsoft.BarcodeReader, Version=9.0.0.303, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon, Version=1.1.0.0, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
Expand All @@ -53,11 +53,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Import Project="..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
<Error Condition="!Exists('..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion samples/HelloWorld/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
</packages>
4 changes: 2 additions & 2 deletions samples/ImageDecoding/ImageDecoding.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon">
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion samples/ImageDecoding/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Performance/AccuracyFirstSettings/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Performance/ReadRateFirstSettings/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Performance/SpeedFirstSettings/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader, Version=8.8.0.831, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<Reference Include="Dynamsoft.BarcodeReader, Version=9.0.0.303, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="Dynamsoft.Camera, Version=8.3.3.726, Culture=neutral, PublicKeyToken=298ad97013b423eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.TWAIN.8.3.3\lib\net40\Dynamsoft.Camera.dll</HintPath>
Expand All @@ -107,7 +107,7 @@
<HintPath>..\..\packages\Dynamsoft.DotNet.TWAIN.8.3.3\lib\net40\Dynamsoft.Twain.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon, Version=1.1.0.0, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down Expand Up @@ -373,12 +373,12 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Import Project="..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
<Error Condition="!Exists('..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net40" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net40" />
<package id="Dynamsoft.DotNet.TWAIN" version="8.3.3" targetFramework="net40" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dynamsoft.BarcodeReader, Version=8.8.0.831, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
<Reference Include="Dynamsoft.BarcodeReader, Version=9.0.0.303, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
</Reference>
<Reference Include="DynamsoftCommon, Version=1.1.0.0, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
<HintPath>..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -176,12 +176,12 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Import Project="..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets" Condition="Exists('..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Dynamsoft.DotNet.Barcode.8.8.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
<Error Condition="!Exists('..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Dynamsoft.DotNet.Barcode.9.0.0\build\Dynamsoft.DotNet.Barcode.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net40" />
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net40" />
</packages>

0 comments on commit 3f383fa

Please sign in to comment.