Support netstandard2.0

sweipei · Jan 4, 2019 · 31ebc44 · 31ebc44
1 parent 75323be
commit 31ebc44
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 347 deletions.
diff --git a/clients/csharp/.vs/qmqclient/v15/.suo b/clients/csharp/.vs/qmqclient/v15/.suo
diff --git a/clients/csharp/.vs/qmqclient/v15/Server/sqlite3/db.lock b/clients/csharp/.vs/qmqclient/v15/Server/sqlite3/db.lock
diff --git a/clients/csharp/.vs/qmqclient/v15/Server/sqlite3/storage.ide b/clients/csharp/.vs/qmqclient/v15/Server/sqlite3/storage.ide
diff --git a/clients/csharp/Package.nuspec b/clients/csharp/Package.nuspec
diff --git a/clients/csharp/qmqclient.sln b/clients/csharp/qmqclient.sln
@@ -1,35 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
+VisualStudioVersion = 15.0.28010.2016
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "qmqclient", "qmqclient\qmqclient.csproj", "{753A6776-57B6-4F73-920D-CDDE55307752}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "qmqclient", "qmqclient\qmqclient.csproj", "{72FD83C9-686F-4FE8-9184-3C6DDB1DF6ED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		FlightRelease|Any CPU = FlightRelease|Any CPU
-		JPRelease|Any CPU = JPRelease|Any CPU
-		Performance|Any CPU = Performance|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{753A6776-57B6-4F73-920D-CDDE55307752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.FlightRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.FlightRelease|Any CPU.Build.0 = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.JPRelease|Any CPU.ActiveCfg = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.JPRelease|Any CPU.Build.0 = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.Performance|Any CPU.ActiveCfg = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.Performance|Any CPU.Build.0 = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{753A6776-57B6-4F73-920D-CDDE55307752}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72FD83C9-686F-4FE8-9184-3C6DDB1DF6ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72FD83C9-686F-4FE8-9184-3C6DDB1DF6ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72FD83C9-686F-4FE8-9184-3C6DDB1DF6ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72FD83C9-686F-4FE8-9184-3C6DDB1DF6ED}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		EnterpriseLibraryConfigurationToolBinariesPath = packages\Unity.2.1.505.0\lib\NET35;packages\Unity.Interception.2.1.505.0\lib\NET35;packages\EnterpriseLibrary.Common.5.0.505.0\lib\NET35;packages\EnterpriseLibrary.Data.5.0.505.0\lib\NET35
-		SolutionGuid = {E3B01990-C312-45FB-A57A-6BFEB5DE1DE2}
+		SolutionGuid = {2A2491AD-B436-4D1E-90B4-30C50F8F6D32}
 	EndGlobalSection
 EndGlobal
diff --git a/clients/csharp/qmqclient.userprefs b/clients/csharp/qmqclient.userprefs
diff --git a/clients/csharp/qmqclient.v11.suo b/clients/csharp/qmqclient.v11.suo
diff --git a/clients/csharp/qmqclient/Properties/AssemblyInfo.cs b/clients/csharp/qmqclient/Properties/AssemblyInfo.cs
diff --git a/clients/csharp/qmqclient/Transport/Channel.cs b/clients/csharp/qmqclient/Transport/Channel.cs
@@ -1,6 +1,6 @@
 // yuzhaohui
 // 12/5/2016
-using System;
+
 using System.Net;
 using System.Net.Sockets;
 namespace Qunar.TC.Qmq.Client.Transport

diff --git a/clients/csharp/qmqclient/Util/ClientId.cs b/clients/csharp/qmqclient/Util/ClientId.cs
@@ -2,7 +2,6 @@
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
-using System.Web.Hosting;
 using NLog;
 
 namespace Qunar.TC.Qmq.Client.Util
@@ -34,16 +33,17 @@ private static string CreateUniqueId()
 
         private static string GetAppPoolName()
         {
-            var siteName = HostingEnvironment.SiteName;
-            var virtualPath = HostingEnvironment.ApplicationVirtualPath;
-            if (string.IsNullOrEmpty(siteName) || string.IsNullOrEmpty(virtualPath))
-            {
-                return "";
-            }
-            else
-            {
-                return $"{siteName}/{virtualPath}";
-            }
+            //var siteName = HostingEnvironment.
+            //var virtualPath = HostingEnvironment.ApplicationVirtualPath;
+            //if (string.IsNullOrEmpty(siteName) || string.IsNullOrEmpty(virtualPath))
+            //{
+            //    return "";
+            //}
+            //else
+            //{
+            //    return $"{siteName}/{virtualPath}";
+            //}
+            return "";
         }
 
         private static string GetMd5Hash(MD5 md5Hash, string input)

diff --git a/clients/csharp/qmqclient/packages.config b/clients/csharp/qmqclient/packages.config