Skip to content

Commit 4cd3feb

Browse files
DMGithubPublisherDMGithubPublisher
authored
Merge pull request #3 from ywjywjywj528/main
update .net
2 parents 39d8ef8 + 3f383fa commit 4cd3feb

File tree

25 files changed

+71
-143
lines changed

25 files changed

+71
-143
lines changed

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
License Notice
22

33
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.
4-
Copyright © 2003–2021 Dynamsoft. All rights reserved.
4+
Copyright © 2003–2022 Dynamsoft. All rights reserved.

‎samples/GeneralSettings/GeneralSettings.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Dynamsoft.BarcodeReader, Version=8.8.0.831, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
38+
<Reference Include="Dynamsoft.BarcodeReader, Version=9.0.0.303, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="DynamsoftCommon, Version=1.1.0.0, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
43+
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="System" />
@@ -55,13 +55,13 @@
5555
<None Include="packages.config" />
5656
</ItemGroup>
5757
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58-
<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')" />
58+
<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')" />
5959
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
6060
<PropertyGroup>
6161
<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>
6262
</PropertyGroup>
63-
<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'))" />
64-
<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'))" />
63+
<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'))" />
64+
<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'))" />
6565
</Target>
66-
<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')" />
66+
<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')" />
6767
</Project>

‎samples/GeneralSettings/Program.cs‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,10 @@ static void Main(string[] args)
1010
{
1111
try
1212
{
13-
// 1. Initialize license
14-
/*
15-
// By setting organization ID as "200001", a free public trial license will be used for license verification.
16-
// Note that network connection is required for this license to work.
17-
//
18-
// When using your own license, locate the following line and specify your Organization ID.
19-
// organizationID = "200001";
20-
//
21-
// If you don't have a license yet, you can request a trial from https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=samples&package=dotnet
22-
*/
23-
DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
24-
connectionInfo.OrganizationID = "200001";
25-
EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
13+
// 1.Initialize license.
14+
// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
15+
// You can also request a 30-day trial license in the customer portal: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github&package=dotnet
16+
EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
2617
if (errorCode != EnumErrorCode.DBR_SUCCESS)
2718
{
2819
Console.WriteLine(errorMsg);

‎samples/GeneralSettings/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
3+
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
44
</packages>

‎samples/HelloWorld/HelloWorld.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Dynamsoft.BarcodeReader, Version=8.8.0.831, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
39+
<Reference Include="Dynamsoft.BarcodeReader, Version=9.0.0.303, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
4141
</Reference>
4242
<Reference Include="DynamsoftCommon, Version=1.1.0.0, Culture=neutral, PublicKeyToken=ad0967c36e09320a, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
43+
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
</ItemGroup>
@@ -53,11 +53,11 @@
5353
<None Include="packages.config" />
5454
</ItemGroup>
5555
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
56-
<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')" />
56+
<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')" />
5757
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
5858
<PropertyGroup>
5959
<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>
6060
</PropertyGroup>
61-
<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'))" />
61+
<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'))" />
6262
</Target>
6363
</Project>

‎samples/HelloWorld/Program.cs‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,10 @@ static void Main(string[] args)
1010
{
1111
try
1212
{
13-
// 1. Initialize license
14-
/*
15-
// By setting organization ID as "200001", a free public trial license will be used for license verification.
16-
// Note that network connection is required for this license to work.
17-
//
18-
// When using your own license, locate the following line and specify your Organization ID.
19-
// organizationID = "200001";
20-
//
21-
// If you don't have a license yet, you can request a trial from https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=samples&package=dotnet
22-
*/
23-
DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
24-
connectionInfo.OrganizationID = "200001";
25-
EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
13+
// 1.Initialize license.
14+
// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
15+
// You can also request a 30-day trial license in the customer portal: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github&package=dotnet
16+
EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
2617
if (errorCode != EnumErrorCode.DBR_SUCCESS)
2718
{
2819
Console.WriteLine(errorMsg);

‎samples/HelloWorld/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
3+
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
44
</packages>

‎samples/ImageDecoding/ImageDecoding.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="Dynamsoft.BarcodeReader">
37-
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
37+
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\Dynamsoft.BarcodeReader.dll</HintPath>
3838
</Reference>
3939
<Reference Include="DynamsoftCommon">
40-
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.8.8.0\lib\net40\DynamsoftCommon.dll</HintPath>
40+
<HintPath>..\packages\Dynamsoft.DotNet.Barcode.9.0.0\lib\net40\DynamsoftCommon.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Core" />

‎samples/ImageDecoding/Program.cs‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,10 @@ static void Main(string[] args)
1414
{
1515
try
1616
{
17-
// Initialize license
18-
/*
19-
// By setting organization ID as "200001", a free public trial license will be used for license verification.
20-
// Note that network connection is required for this license to work.
21-
//
22-
// When using your own license, locate the following line and specify your Organization ID.
23-
// organizationID = "200001";
24-
//
25-
// If you don't have a license yet, you can request a trial from https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=samples&package=dotnet
26-
*/
27-
DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
28-
connectionInfo.OrganizationID = "200001";
29-
EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
17+
// 1.Initialize license.
18+
// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
19+
// You can also request a 30-day trial license in the customer portal: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&utm_source=github&package=dotnet
20+
EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
3021
if (errorCode != EnumErrorCode.DBR_SUCCESS)
3122
{
3223
Console.WriteLine(errorMsg);

‎samples/ImageDecoding/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Dynamsoft.DotNet.Barcode" version="8.8.0" targetFramework="net472" />
3+
<package id="Dynamsoft.DotNet.Barcode" version="9.0.0" targetFramework="net472" />
44
</packages>

0 commit comments

Comments
 (0)