condition complie

Author: icattlecoder

Makefile

@@ -1,15 +1,20 @@
 # for travis ci
-all:
-
-	xbuild csharp-sdk.sln;
-	cp Qiniu.Test/bin/Debug/Qiniu.Test.dll bin
-	cp Qiniu/bin/Debug/Qiniu.dll bin
-	
 test:
 
 	cp tools/Newtonsoft.Json.dll tools/nunit.framework.dll bin
 	#for OS X
 	#export MON_PATH="/Library/Frameworks/Mono.framework/Libraries/mono/4.0/"
 	#mono --debug /Library/Frameworks/Mono.framework/Versions/3.2.0/lib/mono/4.5/nunit-console.exe bin/Qiniu.Test.dll
+
 	#for Linux
+	#3.5
+	xbuild csharp-sdk-3.5.sln;
+	cp Qiniu/bin/Debug/3.5/Qiniu.dll bin
+	cp Qiniu.Test/bin/Debug/Qiniu.Test.dll bin
+	nunit-console -framework="3.5" bin/Qiniu.Test.dll
+
+	#4.0
+	xbuild csharp-sdk-4.0.sln;
+	cp Qiniu/bin/Debug/4.0/Qiniu.dll bin
+	cp Qiniu.Test/bin/Debug/Qiniu.Test.dll bin
 	nunit-console -framework="4.0" bin/Qiniu.Test.dll

Qiniu/FileOp/ImageInfoRet.cs

@@ -1,49 +1,77 @@
-using System;
-using System.Collections.Generic;
-using Qiniu.RPC;
-using Newtonsoft.Json;
-
-namespace Qiniu.FileOp
-{
-	public class ImageInfoRet : CallRet
-	{
-		public int Width { get; private set; }
-
-		public int Height { get; private set; }
-
-		public string Format { get; private set; }
-
-		public string ColorModel { get; private set; }
-
-		public ImageInfoRet (CallRet ret)
-            : base(ret)
-		{
-			if (!String.IsNullOrEmpty (Response)) {
-				try {
-					Unmarshal (Response);
-				} catch (Exception e) {
-					Console.WriteLine (e.ToString ());
-					this.Exception = e;
-				}
-			}
-		}
-
-		private void Unmarshal (string json)
-		{
-			var dics = JsonConvert.DeserializeObject<Dictionary<string,dynamic>> (json);
-			dynamic tmp;
-			if (dics.TryGetValue ("format", out tmp)) {
-				Format = (string)tmp;
-			}
-			if (dics.TryGetValue ("width", out tmp)) {
-				Width = (int)tmp;
-			}
-			if (dics.TryGetValue ("height", out tmp)) {
-				Height = (int)tmp;
-			}
-			if (dics.TryGetValue ("colorModel", out tmp)) {
-				ColorModel = (string)tmp;
-			}
-		}
-	}
+using System;
+using System.Collections.Generic;
+using Qiniu.RPC;
+using Newtonsoft.Json;
+
+namespace Qiniu.FileOp
+{
+    /// <summary>
+    /// Image Info
+    /// </summary>
+    public class ImageInfoRet : CallRet
+    {
+        /// <summary>
+        /// Width
+        /// </summary>
+        public int Width { get; private set; }
+
+        /// <summary>
+        /// Height
+        /// </summary>
+        public int Height { get; private set; }
+
+        /// <summary>
+        /// Format
+        /// </summary>
+        public string Format { get; private set; }
+
+        /// <summary>
+        /// Color Model
+        /// </summary>
+        public string ColorModel { get; private set; }
+
+        /// <summary>
+        /// construct
+        /// </summary>
+        /// <param name="ret"></param>
+        public ImageInfoRet(CallRet ret)
+            : base(ret)
+        {
+            if (!String.IsNullOrEmpty(Response))
+            {
+                try
+                {
+                    Unmarshal(Response);
+                }
+                catch (Exception e)
+                {
+                    Console.WriteLine(e.ToString());
+                    this.Exception = e;
+                }
+            }
+        }
+
+        private void Unmarshal(string json)
+        {
+            Dictionary<string, object> dics = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+            object tmp;
+            if (dics.TryGetValue("format", out tmp))
+            {
+                this.Format = (string)tmp;
+            }
+            if (dics.TryGetValue("colorModel", out tmp))
+            {
+                this.ColorModel = (string)tmp;
+            }
+            if (dics.TryGetValue("width", out tmp))
+            {
+                this.Width = Convert.ToInt32(tmp);
+            }
+            if (dics.TryGetValue("height", out tmp))
+            {
+                this.Height = Convert.ToInt32(tmp);
+            }
+            
+        }
+    }
 }

Qiniu/IO/PutRet.cs

@@ -28,20 +28,23 @@ public PutRet (CallRet ret)
 					this.Exception = e;
 				}
 			}
-		}
-
-		private void Unmarshal (string json)
-		{
-			try {
-				var dict = JsonConvert.DeserializeObject<Dictionary<string,dynamic>> (json);
-				object tmp;
-				if (dict.TryGetValue ("hash", out tmp))
-					Hash = (string)dict ["hash"];
-				if (dict.TryGetValue ("key", out tmp))
-					key = (string)dict ["key"];
-			} catch (Exception e) {
-				throw e;
-			}
-		}
+		}
+
+        private void Unmarshal(string json)
+        {
+            try
+            {
+                Dictionary<string, object> dict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+                object tmp;
+                if (dict.TryGetValue("hash", out tmp))
+                    Hash = (string)tmp;
+                if (dict.TryGetValue("key", out tmp))
+                    key = (string)tmp;
+            }
+            catch (Exception e)
+            {
+                throw e;
+            }
+        }	
 	}
 }