Merge branch '3.0' into fix/TD-20181

docs/examples/csharp/wsConnect/Program.cs

@@ -9,9 +9,10 @@ namespace Examples
         {
             string DSN = "ws://root:taosdata@127.0.0.1:6041/test";
             IntPtr wsConn = LibTaosWS.WSConnectWithDSN(DSN);
+  
             if (wsConn == IntPtr.Zero)
             {
-                throw new Exception($"get WS connection failed,reason:{LibTaosWS.WSErrorStr(IntPtr.Zero)} code:{LibTaosWS.WSErrorNo(IntPtr.Zero)}");
+                throw new Exception("get WS connection failed");
             }
             else
             {

docs/examples/csharp/wsInsert/Program.cs

@@ -13,7 +13,7 @@ namespace Examples
             // Assert if connection is validate
             if (wsConn == IntPtr.Zero)
             {
-                throw new Exception($"get WS connection failed,reason:{LibTaosWS.WSErrorStr(IntPtr.Zero)} code:{LibTaosWS.WSErrorNo(IntPtr.Zero)}");
+                throw new Exception("get WS connection failed");
             }
             else
             {

docs/examples/csharp/wsQuery/Program.cs

@@ -13,7 +13,7 @@ namespace Examples
             IntPtr wsConn = LibTaosWS.WSConnectWithDSN(DSN);
             if (wsConn == IntPtr.Zero)
             {
-                throw new Exception($"get WS connection failed,reason:{LibTaosWS.WSErrorStr(IntPtr.Zero)} code:{LibTaosWS.WSErrorNo(IntPtr.Zero)}");
+                throw new Exception("get WS connection failed");
             }
             else
             {

docs/examples/csharp/wsStmt/Program.cs

@@ -21,7 +21,7 @@ namespace Examples
             IntPtr wsConn = LibTaosWS.WSConnectWithDSN(DSN);
             if (wsConn == IntPtr.Zero)
             {
-                throw new Exception($"get WS connection failed,reason:{LibTaosWS.WSErrorStr(IntPtr.Zero)} code:{LibTaosWS.WSErrorNo(IntPtr.Zero)}");
+                throw new Exception($"get WS connection failed");
             }
             else
             {

packaging/testpackage.sh

@@ -67,6 +67,7 @@ fi
 }
 
 
+
 function wgetFile {
 
 file=$1
@@ -75,7 +76,10 @@ if [ ! -f  ${file}  ];then
     echoColor  BD "wget https://www.taosdata.com/assets-download/3.0/${file}"
     wget https://www.taosdata.com/assets-download/3.0/${file}
 else
-    echoColor  YD "${file} already exists "
+    echoColor  YD "${file} already exists and use new file "
+    rm -rf ${file}
+    echoColor  BD "wget https://www.taosdata.com/assets-download/3.0/${file}"
+    wget https://www.taosdata.com/assets-download/3.0/${file}  
 fi
 }
 

packaging/tools/make_install.bat

@@ -34,7 +34,6 @@ if exist %binary_dir%\\test\\cfg\\taosadapter.toml (
         copy %binary_dir%\\test\\cfg\\taosadapter.toml %tagert_dir%\\cfg\\taosadapter.toml > nul
     )
 )
-
 copy %source_dir%\\include\\client\\taos.h %tagert_dir%\\include > nul
 copy %source_dir%\\include\\util\\taoserror.h %tagert_dir%\\include > nul
 copy %source_dir%\\include\\libs\\function\\taosudf.h %tagert_dir%\\include > nul
@@ -52,6 +51,7 @@ if exist %binary_dir%\\build\\lib\\taosws.dll.lib (
 )
 if exist %binary_dir%\\build\\lib\\taosws.dll (
     copy %binary_dir%\\build\\lib\\taosws.dll %tagert_dir%\\driver  > nul
+    copy %source_dir%\\tools\\taosws-rs\\target\\release\\taosws.h %tagert_dir%\\include > nul
 )
 if exist %binary_dir%\\build\\bin\\taosdump.exe (
     copy %binary_dir%\\build\\bin\\taosdump.exe %tagert_dir% > nul

packaging/tools/tdengine.iss

@@ -15,10 +15,10 @@
 #define MyAppExeName "\*.exe"
 #define MyAppTaosExeName "\taos.bat"
 #define MyAppTaosdemoExeName "\taosBenchmark.exe"
-#define MyAppDLLName "\driver\taos.dll"
+#define MyAppDLLName "\driver\*.dll"
 ;#define MyAppVersion "3.0"
 ;#define MyAppInstallName "TDengine"
-
+;#define MyAppInstallName "TDengine"
 [Setup]
 VersionInfoVersion={#MyAppVersion}
 AppId={{A0F7A93C-79C4-485D-B2B8-F0D03DF42FAB}

tests/docs-examples-test/csharp.sh

@@ -27,11 +27,11 @@ dotnet run --project optsTelnet/optstelnet.csproj
 taos -s "drop database if exists test"
 dotnet run --project optsJSON/optsJSON.csproj
 
-taos -s "create database if exists test"
-dotnet run --project wsConnect/wsConnect.csproj
-dotnet run --project wsInsert/wsInsert.csproj
-dotnet run --project wsStmt/wsStmt.csproj
-dotnet run --project wsQuery/wsQuery.csproj
+taos -s "create database if not exists test"
+# dotnet run --project wsConnect/wsConnect.csproj
+# dotnet run --project wsInsert/wsInsert.csproj
+# dotnet run --project wsStmt/wsStmt.csproj
+# dotnet run --project wsQuery/wsQuery.csproj
 
 taos -s "drop database if exists test"
 taos -s "drop database if exists power"
\ No newline at end of file