Merge remote-tracking branch 'origin/master' into textEvents

Source/Basic Shapes/SvgPolyline.cs

@@ -13,13 +13,14 @@ namespace Svg
     [SvgElement("polyline")]
     public class SvgPolyline : SvgPolygon
     {
+        private GraphicsPath _Path;
         public override GraphicsPath Path
         {
             get
             {
-                if (Path == null || this.IsPathDirty)
+                if (_Path == null || this.IsPathDirty)
                 {
-                    Path = new GraphicsPath();
+                    _Path = new GraphicsPath();
 
                     try
                     {
@@ -28,13 +29,13 @@ namespace Svg
                             PointF endPoint = new PointF(Points[i].ToDeviceValue(this), Points[i + 1].ToDeviceValue(this));
 
                             // TODO: Remove unrequired first line
-                            if (Path.PointCount == 0)
+                            if (_Path.PointCount == 0)
                             {
-                                Path.AddLine(endPoint, endPoint);
+                                _Path.AddLine(endPoint, endPoint);
                             }
                             else
                             {
-                                Path.AddLine(Path.GetLastPoint(), endPoint);
+                                _Path.AddLine(_Path.GetLastPoint(), endPoint);
                             }
                         }
                     }
@@ -44,7 +45,7 @@ namespace Svg
                     }
                     this.IsPathDirty = false;
                 }
-                return Path;
+                return _Path;
             }
         }
     }

Source/Properties/AssemblyInfo.cs

@@ -32,7 +32,7 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.5.1.*")]
+[assembly: AssemblyVersion("1.5.2.*")]
 //[assembly: AssemblyFileVersion("1.0.1.*")]
 
 [assembly: CLSCompliant(true)]

Source/Svg.csproj

@@ -16,7 +16,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <SccProjectName>
     </SccProjectName>

Source/SvgElement.cs

@@ -459,7 +459,7 @@ namespace Svg
 	                var evt = attr.Event.GetValue(this);
 	                
 	                //if someone has registered publish the attribute
-	                if (evt != null && !string.IsNullOrWhiteSpace(this.ID))
+	                if (evt != null && !string.IsNullOrEmpty(this.ID))
 	                {
 	                    writer.WriteAttributeString(attr.Attribute.Name, this.ID + "/" + attr.Attribute.Name);
 	                }
@@ -729,7 +729,7 @@ namespace Svg
         /// <param name="caller"></param>
         public void RegisterEvents(ISvgEventCaller caller)
         {
-            if (caller != null && !string.IsNullOrWhiteSpace(this.ID))
+            if (caller != null && !string.IsNullOrEmpty(this.ID))
             {
                 var rpcID = this.ID + "/";
 
@@ -750,7 +750,7 @@ namespace Svg
         /// <param name="caller"></param>
         public void UnregisterEvents(ISvgEventCaller caller)
         {
-        	if (caller != null && !string.IsNullOrWhiteSpace(this.ID))
+        	if (caller != null && !string.IsNullOrEmpty(this.ID))
         	{
         		var rpcID = this.ID + "/";