Merge pull request #3 from ywjywjywj528/main

update .net
Dynamsoft · Mar 17, 2022 · 4cd3feb · 4cd3feb
2 parents 39d8ef8 + 3f383fa
commit 4cd3feb
Show file tree

Hide file tree

Showing 25 changed files with 71 additions and 143 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -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. 
diff --git a/samples/GeneralSettings/GeneralSettings.csproj b/samples/GeneralSettings/GeneralSettings.csproj
@@ -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" />
@@ -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>
diff --git a/samples/GeneralSettings/Program.cs b/samples/GeneralSettings/Program.cs
@@ -10,19 +10,10 @@ static void Main(string[] args)
         {
             try
             {
-                // 1. Initialize license
-                /*
-                // By setting organization ID as "200001", a free public trial license will be used for license verification.
-                // Note that network connection is required for this license to work.
-                //
-                // When using your own license, locate the following line and specify your Organization ID.
-                // organizationID = "200001";
-                //
-                // 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
-                */
-                DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
-                connectionInfo.OrganizationID = "200001";
-                EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
+                // 1.Initialize license.
+		// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
+	        // 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
+                EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
                 if (errorCode != EnumErrorCode.DBR_SUCCESS)
                 {
                     Console.WriteLine(errorMsg);

diff --git a/samples/GeneralSettings/packages.config b/samples/GeneralSettings/packages.config
@@ -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>
diff --git a/samples/HelloWorld/HelloWorld.csproj b/samples/HelloWorld/HelloWorld.csproj
@@ -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>
@@ -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>
diff --git a/samples/HelloWorld/Program.cs b/samples/HelloWorld/Program.cs
@@ -10,19 +10,10 @@ static void Main(string[] args)
         {
             try
             {
-                // 1. Initialize license
-                /*
-                // By setting organization ID as "200001", a free public trial license will be used for license verification.
-                // Note that network connection is required for this license to work.
-                //
-                // When using your own license, locate the following line and specify your Organization ID.
-                // organizationID = "200001";
-                //
-                // 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
-                */
-                DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
-                connectionInfo.OrganizationID = "200001";
-                EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
+                // 1.Initialize license.
+		// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
+	        // 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
+                EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
                 if (errorCode != EnumErrorCode.DBR_SUCCESS)
                 {
                     Console.WriteLine(errorMsg);

diff --git a/samples/HelloWorld/packages.config b/samples/HelloWorld/packages.config
@@ -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>
diff --git a/samples/ImageDecoding/ImageDecoding.csproj b/samples/ImageDecoding/ImageDecoding.csproj
@@ -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" />

diff --git a/samples/ImageDecoding/Program.cs b/samples/ImageDecoding/Program.cs
@@ -14,19 +14,10 @@ static void Main(string[] args)
         {
             try
             {
-                // Initialize license
-                /*
-                // By setting organization ID as "200001", a free public trial license will be used for license verification.
-                // Note that network connection is required for this license to work.
-                //
-                // When using your own license, locate the following line and specify your Organization ID.
-                // organizationID = "200001";
-                //
-                // 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
-                */
-                DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
-                connectionInfo.OrganizationID = "200001";
-                EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
+                // 1.Initialize license.
+		// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
+	        // 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
+                EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
                 if (errorCode != EnumErrorCode.DBR_SUCCESS)
                 {
                     Console.WriteLine(errorMsg);

diff --git a/samples/ImageDecoding/packages.config b/samples/ImageDecoding/packages.config
@@ -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>
diff --git a/samples/Performance/AccuracyFirstSettings/AccuracyFirstSettings.csproj b/samples/Performance/AccuracyFirstSettings/AccuracyFirstSettings.csproj
@@ -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" />

diff --git a/samples/Performance/AccuracyFirstSettings/Program.cs b/samples/Performance/AccuracyFirstSettings/Program.cs
@@ -60,19 +60,10 @@ static void Main(string[] args)
         {
             try
             {
-                // Initialize license
-                /*
-                // By setting organization ID as "200001", a free public trial license will be used for license verification.
-                // Note that network connection is required for this license to work.
-                //
-                // When using your own license, locate the following line and specify your Organization ID.
-                // organizationID = "200001";
-                //
-                // 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
-                */
-                DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
-                connectionInfo.OrganizationID = "200001";
-                EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
+                // 1.Initialize license.
+		// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
+	        // 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
+                EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
                 if (errorCode != EnumErrorCode.DBR_SUCCESS)
                 {
                     Console.WriteLine(errorMsg);

diff --git a/samples/Performance/AccuracyFirstSettings/packages.config b/samples/Performance/AccuracyFirstSettings/packages.config
@@ -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>
diff --git a/samples/Performance/ReadRateFirstSettings/Program.cs b/samples/Performance/ReadRateFirstSettings/Program.cs
@@ -97,19 +97,10 @@ static void Main(string[] args)
         {
             try
             {
-                // Initialize license
-                /*
-                // By setting organization ID as "200001", a free public trial license will be used for license verification.
-                // Note that network connection is required for this license to work.
-                //
-                // When using your own license, locate the following line and specify your Organization ID.
-                // organizationID = "200001";
-                //
-                // 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
-                */
-                DMDLSConnectionParameters connectionInfo = BarcodeReader.InitDLSConnectionParameters();
-                connectionInfo.OrganizationID = "200001";
-                EnumErrorCode errorCode = BarcodeReader.InitLicenseFromDLS(connectionInfo, out string errorMsg);
+                // 1.Initialize license.
+		// The string "DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9" here is a free public trial license. Note that network connection is required for this license to work.
+	        // 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
+                EnumErrorCode errorCode = BarcodeReader.InitLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9", out string errorMsg);
                 if (errorCode != EnumErrorCode.DBR_SUCCESS)
                 {
                     Console.WriteLine(errorMsg);

diff --git a/samples/Performance/ReadRateFirstSettings/ReadRateFirstSettings.csproj b/samples/Performance/ReadRateFirstSettings/ReadRateFirstSettings.csproj
@@ -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" />

diff --git a/samples/Performance/ReadRateFirstSettings/packages.config b/samples/Performance/ReadRateFirstSettings/packages.config
@@ -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>